NewUi: add new login service (improve performance), fix test rgb gen 4 show

xml/vending_info.xml

@@ -187,7 +187,8 @@
 
 	DEBUGVAR FrontDoorVersionInt
 	
-	If FrontDoorVersionInt > 2000 Then
+	; front_more_than_20000
+	If FrontDoorVersionInt > 19999 Then
 		Var EnableTestRGB = "Enable"
 	Else
 		Var EnableTestRGB = "Invisible"

xml/vending_info2.xml

@@ -183,6 +183,21 @@
 
 	Var sleepmodeEnable = "false"
 
+	Var AlphaState = "Invisible"
+
+	If NewUiBSM = "" Then
+	    Var NewUiBSM = "Offline"
+	EndIf
+
+	If EnableBrewIPC = "" Then
+		Var EnableBrewIPC = "false"
+	EndIf
+
+
+	If EnableBrewIPC = "true" Then
+		StartBrewNewUiLoginService
+	EndIf
+
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -190,11 +205,35 @@
 
 	DEBUGVAR Timeout
 	DEBUGVAR WhileRetryCounter
+	DEBUGVAR NewUiBSM
+
+	If WaitPopup = "Enable" Then
+		Var AlphaState = "Enable"
+	Else
+		If FailPopup = "Enable" Then
+			Var AlphaState = "Enable"
+		EndIf
+	EndIf
+
+	If AlphaState = "Enable" Then
+	    If Timeout > 10 Then
+			Var AlphaState = "Invisible"
+			Var alphaPasswordPromptWithKeyboard = "Invisible"
+			Var PassPhrase = ""
+			Var HiddenPassPhrase = ""
+		EndIf
+	EndIf
 
 
 
 	If alphaPasswordPromptWithKeyboard = "Enable" Then
+
+		If AlphaState = "Enable" Then
+			SAVELOG "Wait for password v2"
+			Var Timeout = Timeout + 1
+		Else
 		    Var Timeout = 0
+		EndIf
 	Else
 		Var Timeout = Timeout + 1
 	EndIf
@@ -217,6 +256,8 @@
 		Var alphaPasswordPromptWithKeyboard = "Invisible"
 		Var alphaPasswordPrompt = "Invisible"
 
+		Var AlphaState = "Invisible"
+
 		Var tmpPassPhrase = PassPhrase
 
 		DEBUGVAR tmpPassPhrase
@@ -508,24 +549,24 @@
 <Value> SignalStrengthLevel </Value>
 </Text>
 
-<Button>
+;<Button>
-<X> 300  </X>
+;<X> 300  </X>
-<Y> 480 </Y>
+;<Y> 480 </Y>
-<Filename> "ROOT/taobin_project/image/new_vending_info/QuickTest.png" </Filename>
+;<Filename> "ROOT/taobin_project/image/new_vending_info/QuickTest.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/new_vending_info/QuickTest.png" </FilenamePress>
+;<FilenamePress> "ROOT/taobin_project/image/new_vending_info/QuickTest.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
+;<Volume> SoundVolume </Volume>
-<EventClick>
+;<EventClick>
-
+;
-	DEBUGVAR ShowVersionAll
+;	DEBUGVAR ShowVersionAll
-
+;
-	If alphaPasswordPromptWithKeyboard = "Invisible" Then
+;	If alphaPasswordPromptWithKeyboard = "Invisible" Then
-		Var alphaPasswordPromptWithKeyboard = "Enable"
+;		Var alphaPasswordPromptWithKeyboard = "Enable"
-		Var ClickOn = "QuickTest"
+;		Var ClickOn = "QuickTest"
-	EndIf
+;	EndIf
-
+;
-</EventClick>
+;</EventClick>
-</Button>
+;</Button>
 
 <Button>
 <X> 550  </X>
@@ -966,6 +1007,7 @@
 	If EnableBrewIPC = "true" Then
 	    ; Direct-call-to-brew
         LoginBrew PassPhrase
+        Var AlphaState = "Enable"
 	Else
     	; CallCMDFromXML
 	    __CMD "check-password" PassPhrase "-" "-"
@@ -1012,17 +1054,7 @@
 <Image>
 <X> 0 </X>
 <Y> 0 </Y>
-<State> eval(
+<State> AlphaState </State>
-	If WaitPopup = "Enable" Then
-		Var return = "Enable"
-	Else
-		If FailPopup = "Enable" Then
-			Var return = "Enable"
-		Else
-			Var return = "Invisible"
-		EndIf
-	EndIf
-) </State>
 <Filename> "ROOT/taobin_project/image/new_vending_info/alpha.png" </Filename>
 </Image>