jj: Revert ChoiceList Method, Add WMCC Start Check, Only use a single instance of ClassPMWindream in Application

This commit is contained in:
Jonathan Jenne
2018-10-05 11:15:30 +02:00
parent 819c340745
commit 9ed2d35d17
9 changed files with 93 additions and 70 deletions

View File

@@ -9,7 +9,7 @@ Imports DevExpress.XtraGrid.Columns
Imports DevExpress.XtraCharts
Public Class frmMain
Private _windreamPM As ClassPMWindream
'Private _windreamPM As ClassPMWindream
Private UserLoggedin As Integer = 0
Private PROFILE_COUNT As Integer = 0
Private CURR_DT_VWPM_PROFILE_ACTIVE As DataTable
@@ -34,9 +34,12 @@ Public Class frmMain
Catch ex As Exception
ClassLogger.Add("Error in Save FormLayout: " & ex.Message)
End Try
If _windreamPM.oSession.aLoggedin = True Then
_windreamPM.Stop_WMCC_andCo()
If WINDREAM.oSession.aLoggedin = True Then
WINDREAM.Stop_WMCC_andCo()
End If
'If _windreamPM.oSession.aLoggedin = True Then
' _windreamPM.Stop_WMCC_andCo()
'End If
Try
ClassAllgemeineFunktionen.LoginOut("LOGOUT")
@@ -138,9 +141,12 @@ Public Class frmMain
Check_Timer_Notification()
Restore_Form_Position()
Try
_windreamPM = New ClassPMWindream
_windreamPM.Start_WMCC_andCo()
If _windreamPM.oSession.aLoggedin = False Then
WINDREAM = New ClassPMWindream
WINDREAM.Start_WMCC_andCo()
'_windreamPM = New ClassPMWindream
'_windreamPM.Start_WMCC_andCo()
If WINDREAM.oSession.aLoggedin = False Then
MsgBox("Login on windream was not possible. Please check the log." & vbNewLine & "Application will close now!", MsgBoxStyle.Critical)
Me.Close()
End If
@@ -929,8 +935,10 @@ Public Class frmMain
Try
'_windream = New ClassWindream_allgemein
'_windream.Create_Session()
_windreamPM = New ClassPMWindream()
_windreamPM.Create_Session()
'_windreamPM = New ClassPMWindream()
'_windreamPM.Create_Session()
WINDREAM = New ClassPMWindream()
WINDREAM.Create_Session()
If LogErrorsOnly = False Then ClassLogger.Add(" >> windream initialized", False)
Return True