Merge branch 'inter_show_error' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

2023-08-02 14:34:57 +07:00 · 2023-08-02 14:34:57 +07:00 · 0b56f79b4d
commit 0b56f79b4d
parent 0227166d44 bbfd901deb
9 changed files with 500 additions and 25 deletions
--- a/xml/page_back_to_error.xml
+++ b/xml/page_back_to_error.xml
@ -7,7 +7,12 @@
 	; Reset here
 	Var CheckCupStateDoorCupClose = ""
 	
-	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml"
+	If InternationalEnable = 1 Then
+		OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
+	Else
+		OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml"
+	EndIf
+
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"

 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
--- a/xml/page_back_to_main.xml
+++ b/xml/page_back_to_main.xml
@ -6,16 +6,16 @@
 		
 	; Reset here
 	Var CheckCupStateDoorCupClose = ""
+
 	
 	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
 	If TermTemOnline = "true" Then
-		OpenInst 1 "/mnt/sdcard/coffeevending/termtem_project/xml/test_video_loop.xml"
+	OpenInst 1 "/mnt/sdcard/coffeevending/termtem_project/xml/test_video_loop.xml"
 	Else
-		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
 	EndIf
-
+	
 	TopView "hide"
-
 	
 	
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -127,28 +127,44 @@
 		Var NoWaitMachineEnable = 1
 	EndIf

+	DEBUGVAR InternationalEnable

 	If NoWaitMachineEnable = 1 Then
 		If stop_now = "true" Then
-			Open "ROOT/taobin_project/xml/page_show_error.xml"
+			If InternationalEnable = 1 Then
+				Open "ROOT/taobin_project/xml/page_show_error.lxml"
+			Else
+				Open "ROOT/taobin_project/xml/page_show_error.xml"
+			EndIf
 		EndIf
-		
 	Else

 		If MachineStage = "close-maintenance" Then
-			Open "ROOT/taobin_project/xml/page_show_error.xml"
-
+			If InternationalEnable = 1 Then
+				RootLayoutVisible 3 "hide"
+				Open "ROOT/taobin_project/xml/page_show_error.lxml"
+			Else
+				Open "ROOT/taobin_project/xml/page_show_error.xml"
+			EndIf
 		EndIf

 	EndIf

 	If MachineStage = "mcu-upgrade" Then
-		Open "ROOT/taobin_project/xml/page_show_error.xml"
+		If InternationalEnable = 1 Then
+			Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		Else
+			Open "ROOT/taobin_project/xml/page_show_error.xml"
+		EndIf

 	EndIf

 	If NeedUpgrade = "true" Then
-		Open "ROOT/taobin_project/xml/page_show_error.xml"
+		If InternationalEnable = 1 Then
+			Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		Else
+			Open "ROOT/taobin_project/xml/page_show_error.xml"
+		EndIf
 	EndIf

 	
@ -918,17 +934,29 @@

 		If NoWaitMachineEnable = 1 Then
 			If stop_now = "true" Then
-				Open "ROOT/taobin_project/xml/page_show_error.xml"
-			EndIf
+				If InternationalEnable = 1 Then
+					Open "ROOT/taobin_project/xml/page_show_error.lxml"
+				Else
+					Open "ROOT/taobin_project/xml/page_show_error.xml"
+				EndIf
+					EndIf
 		Else
 			If MachineStage = "close-maintenance" Then
-				Open "ROOT/taobin_project/xml/page_show_error.xml"
+				If InternationalEnable = 1 Then
+					Open "ROOT/taobin_project/xml/page_show_error.lxml"
+				Else
+					Open "ROOT/taobin_project/xml/page_show_error.xml"
+				EndIf

 			EndIf
 		EndIf
 		
 		If MachineStage = "mcu-upgrade" Then
-			Open "ROOT/taobin_project/xml/page_show_error.xml"
+			If InternationalEnable = 1 Then
+			    Open "ROOT/taobin_project/xml/page_show_error.lxml"
+			Else
+			    Open "ROOT/taobin_project/xml/page_show_error.xml"
+			EndIf

 		EndIf

@ -938,7 +966,11 @@
 			Var stop_now = "true"
 			Var MachineErrorDetailAll = "???"
 			SAVELOG "NETCORE_LOST_CNT"
-			Open "ROOT/taobin_project/xml/page_show_error.xml"
+			If InternationalEnable = 1 Then
+			    Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		    Else
+			    Open "ROOT/taobin_project/xml/page_show_error.xml"
+		    EndIf
 		EndIf


@ -953,7 +985,11 @@
 				Var MachineErrorDetailAll = "Netcore Lost"
 				SAVELOG "Netcore Lost NCIC07_EVENT_CNT"
 				DEBUGVAR NCIC07_EVENT_CNT
-				Open "ROOT/taobin_project/xml/page_show_error.xml"
+				If InternationalEnable = 1 Then
+			    	Open "ROOT/taobin_project/xml/page_show_error.lxml"
+				Else
+					Open "ROOT/taobin_project/xml/page_show_error.xml"
+				EndIf
 			EndIf

 		Else
@ -966,7 +1002,11 @@
 	EndIf

 	If MachineStage = "drink-failed" Then
-		Open "ROOT/taobin_project/xml/page_show_error.xml"
+		If InternationalEnable = 1 Then
+			    Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		Else
+			Open "ROOT/taobin_project/xml/page_show_error.xml"
+		EndIf

 	EndIf
 	
@ -978,7 +1018,11 @@


 	If NeedUpgrade = "true" Then
-		Open "ROOT/taobin_project/xml/page_show_error.xml"
+		If InternationalEnable = 1 Then
+			    Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		Else
+			Open "ROOT/taobin_project/xml/page_show_error.xml"
+		EndIf
 	EndIf

 	If CountDownShowButton > 0 Then
@ -1318,7 +1362,7 @@
 <Y> 98 </Y>
 <Width> 150 </Width>
 <Color> "0xeae6e1" </Color>
-<QRColor> "0x000000" </Color>
+<QRColor> "0x000000" </QRColor>
 <Height> 150 </Height>
 <State> WebAppShow </State>
 <Service> testservice </Service>
--- a/xml/page_catalog.lxml
+++ b/xml/page_catalog.lxml
@ -773,4 +773,3 @@
 </EventUnitTest3>

 </Popup>
-
--- a/xml/page_show_error.lxml
+++ b/xml/page_show_error.lxml
@ -0,0 +1,427 @@
+<Page>
+<X> 0 </X>
+<Y> 608 </Y>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1312 </Height>
+<Background> "0xEAE6E1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	Var countClick = 0
+	Var countClick2 = 0
+
+
+	DEBUGVAR MachineStage
+	DEBUGVAR stop_now
+	DEBUGVAR LanguageShow
+
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+
+	Var show_error_normal = "Invisible"
+	Var show_error_sp1 = "Enable"
+
+	StopLongPlay
+
+	If LEDSet = "true" Then
+
+	Else
+		LED LedDoorCup On 255 0 0 255
+		LED LedDoorLid Off 255 255 255 255
+	EndIf
+
+	Function 2
+
+	Var TimeOut = 0
+	Var textStep = 0
+	RootLayoutVisible 3 "show"
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+	DEBUGVAR NETCORE_LOST_CNT
+	DEBUGVAR MachineStage
+	
+	Var EmergencyStop = "-"
+	
+	If EmergencyStop = "true" Then
+		If DoorCupPosition = "bottom" Then
+			; It normal 
+			Var EmergencyStop = "false"
+		Else
+			Var MachineErrorDetailAll = "Emergency stop!"
+
+		EndIf
+	Else
+
+		Var MachineErrorDetailAll = MachineErrorDetail + " / "
+		Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+
+		If textStep > 3 Then
+			Var textStep = 0
+			Var MachineErrorDetailAll = MachineErrorDetailAll +  "  [ \ ]"
+		EndIf
+		If textStep = 3 Then
+			Var MachineErrorDetailAll = MachineErrorDetailAll +  "  [ - ]"
+		EndIf
+		If textStep = 2 Then
+			Var MachineErrorDetailAll = MachineErrorDetailAll +  "  [ / ]"
+		EndIf
+		If textStep = 1 Then
+			Var MachineErrorDetailAll = MachineErrorDetailAll +  "  [ | ]"
+		EndIf
+
+		Var textStep = 	textStep + 1	
+
+		;DEBUGVAR MachineErrorDetailAll
+		;DEBUGVAR textStep
+
+		If NETCORE_LOST_CNT > 0 Then
+
+		Else
+			
+			DEBUGVAR NCIC07_EVENT_CNT
+			DEBUGVAR NETCORE_EVENT_CNT_TMP
+
+			If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then 
+
+			Else
+				If MachineStage = "" Then
+					
+					Var LEDSet = "false"
+					Open "ROOT/taobin_project/xml/page_board.xml"
+
+				EndIf
+				If MachineStage = "show-menu" Then
+					
+					Var LEDSet = "false"
+					Open "ROOT/taobin_project/xml/page_board.xml"
+
+				EndIf
+				If MachineStage = "remove-cup" Then
+				
+					Var LEDSet = "false"
+					Open "ROOT/taobin_project/xml/page_remove_cup.xml"
+
+				EndIf
+
+				If MachineStage = "drink-failed" Then
+				Var FirstOpen = 1
+					Var LEDSet = "true"
+					;Open "ROOT/taobin_project/xml/page_show_error.lxml"
+					Refresh
+				EndIf
+
+				If FirstOpen = 1 Then
+					Var FirstOpen = 0
+					If MachineStage = "close-maintenance" Then
+					
+						Var LEDSet = "true"
+						;Open "ROOT/taobin_project/xml/page_show_error.lxml"
+						Refresh
+
+					EndIf
+				EndIf
+			EndIf
+		EndIf
+
+		
+
+
+	EndIf
+
+	Var TimeOut = TimeOut + 1
+	If TimeOut > 60 Then
+		Var TimeOut = 0
+		Open "ROOT/taobin_project/xml/page_show_error.lxml"
+
+	EndIf
+
+	Refresh
+	TimerReset
+
+	Var LEDSet = "true"
+	;Open "ROOT/taobin_project/xml/page_show_error.lxml"
+</EventTimeout>
+
+<EventLanguageOnChange>
+	DEBUGVAR LanguageShow
+
+	Var LanguageButtonEnable = "Enable"
+	Var ButtonLanguageCurrentXPosition = 990
+	Var ButtonLanguageCurrentYPosition = 648
+	
+	Var ButtonLanguageListXPosition = 970
+	Var ButtonLanguageListYPosition = 640
+	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+
+	Function 2
+
+	Refresh
+</EventLanguageOnChange>
+
+<Function2>
+
+	;If EmergencyStop = "true" Then
+	;	Var stop_now = "true"
+	;	If show_eng = "true" Then 
+	;		Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
+	;	Else
+	;		Var DirImage = "ROOT/taobin_project/image/vending_error"
+	;	EndIf
+	;EndIf
+	
+	If MachineStage = "mcu-upgrade" Then
+		If LanguageShow = "THAI" Then 
+			Var DirImage = "ROOT/taobin_project/image/vending_error"
+		EndIf
+		If LanguageShow = "ENG" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "JAPAN" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "CHINA" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "MALAY" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+	EndIf
+
+	If NeedUpgrade = "true" Then
+		If LanguageShow = "THAI" Then 
+			Var DirImage = "ROOT/taobin_project/image/vending_error"
+		EndIf
+		If LanguageShow = "ENG" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "JAPAN" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "CHINA" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "MALAY" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+	EndIf
+
+	DEBUGVAR MachineStage
+	
+	If MachineStage = "close-maintenance" Then
+		DEBUGVAR stop_now
+		If stop_now = "true" Then
+			If LanguageShow = "THAI" Then 
+				Var DirImage = "ROOT/taobin_project/image/vending_error"
+			EndIf
+			If LanguageShow = "ENG" Then
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+			EndIf
+			If LanguageShow = "JAPAN" Then
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+			EndIf
+			If LanguageShow = "CHINA" Then
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+			EndIf
+			If LanguageShow = "MALAY" Then
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+			EndIf
+		Else
+			Var show_error_normal = "Enable"
+			Var show_error_sp1 = "Invisible"
+			DEBUGVAR show_error_normal
+			DEBUGVAR LanguageShow
+			
+			If LanguageShow = "THAI" Then 
+				Var DirImage = "ROOT/taobin_project/image/close_th"
+			EndIf
+			If LanguageShow = "ENG" Then
+				Var DirImage = "ROOT/taobin_project/image/close_en"
+			EndIf
+			If LanguageShow = "JAPAN" Then
+				Var DirImage = "ROOT/taobin_project/image/close_en"
+			EndIf
+			If LanguageShow = "CHINA" Then
+				Var DirImage = "ROOT/taobin_project/image/close_en"
+			EndIf
+			If LanguageShow = "MALAY" Then
+				Var DirImage = "ROOT/taobin_project/image/close_en"
+			EndIf
+		EndIf
+	EndIf
+
+
+	DEBUGVAR DirImage
+
+	If MachineStage = "drink-failed" Then
+		If stop_now = "true" Then
+			If LanguageShow = "THAI" Then 
+				Var DirImage = "ROOT/taobin_project/image/vending_error"
+			EndIf
+			If LanguageShow = "ENG" Then
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+			EndIf
+			If LanguageShow = "JAPAN" Then
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+			EndIf
+			If LanguageShow = "CHINA" Then
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+			EndIf
+			If LanguageShow = "MALAY" Then
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+			EndIf
+		Else
+			Var show_error_normal = "Enable"
+			Var show_error_sp1 = "Invisible"
+			If LanguageShow = "THAI" Then 
+				Var DirImage = "ROOT/taobin_project/image/close_th"
+			EndIf
+			If LanguageShow = "ENG" Then
+				Var DirImage = "ROOT/taobin_project/image/close_en"
+			EndIf
+			If LanguageShow = "JAPAN" Then
+				Var DirImage = "ROOT/taobin_project/image/close_en"
+			EndIf
+			If LanguageShow = "CHINA" Then
+				Var DirImage = "ROOT/taobin_project/image/close_en"
+			EndIf
+			If LanguageShow = "MALAY" Then
+				Var DirImage = "ROOT/taobin_project/image/close_en"
+			EndIf
+		EndIf
+	EndIf
+	
+	If NETCORE_LOST_CNT > 0 Then
+		If LanguageShow = "THAI" Then 
+			Var DirImage = "ROOT/taobin_project/image/vending_error"
+		EndIf
+		If LanguageShow = "ENG" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "JAPAN" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "CHINA" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "MALAY" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+	EndIf
+
+	If NETCORE_EVENT_CNT_X >= 30 Then
+		Var NETCORE_EVENT_CNT_X = 0
+		If LanguageShow = "THAI" Then 
+			Var DirImage = "ROOT/taobin_project/image/vending_error"
+		EndIf
+		If LanguageShow = "ENG" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "JAPAN" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "CHINA" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+		If LanguageShow = "MALAY" Then
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en"
+		EndIf
+	EndIf
+
+	Var MaintenanceCard = 20
+	Random MaintenanceCard
+	Var index = 1 + MaintenanceCard
+
+	Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
+	Var RandomImage =  RandomImage + ".png"
+	DEBUGVAR RandomImage
+	DEBUGVAR Seeker
+	DEBUGVAR DoorCupPosition
+	DEBUGVAR DoorLidPosition
+	DEBUGVAR EmergencyStop
+</Function2>
+
+<Image>
+<State> show_error_normal </State>
+<X> 127 </X>
+<Y> 688 </Y>
+<Filename> Var(DirImage + "/img1.png") </Filename>
+</Image>
+
+<Image>
+<State> show_error_normal </State>
+<X> 0 </X>
+<Y> 924 </Y>
+<Filename> RandomImage </Filename>
+</Image>
+
+<Image>
+<State> show_error_sp1 </State>
+<X> 0 </X>
+<Y> 897 </Y>
+<Filename> Var(DirImage + "/img1.png") </Filename>
+</Image>
+
+<Image>
+<State> show_error_sp1 </State>
+<X> 0 </X>
+<Y> 694 </Y>
+<Filename> Var(DirImage + "/text1.png") </Filename>
+</Image>
+
+<Image>
+<State> show_error_sp1 </State>
+<X> 0 </X>
+<Y> 1685 </Y>
+<Filename> Var(DirImage + "/text2.png") </Filename>
+</Image>
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+		
+	EndIf
+
+	If countClick = 10 Then
+		Var countClick = 0
+		MainMenu
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 870 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+</EventClick>
+</Button>
+
+
+<Text>
+<X> 5 </X>
+<Y> 1868 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xDE794E </Color>
+<Value> MachineErrorDetailAll </Value>
+</Text>
+
+
+</Page>
--- a/xml/page_show_error.xml
+++ b/xml/page_show_error.xml
@ -125,7 +125,6 @@
 	Var MaintenanceCard = 20
 	Random MaintenanceCard
 	Var index = 1 + MaintenanceCard
-
 	If show_eng = "true" Then 
 		Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
 		Var RandomImage =  RandomImage + ".png"
@ -305,6 +304,7 @@

 	Open "ROOT/taobin_project/xml/page_show_error.xml"
 </EventClick>
+</Button>

 <Button>
 <X> 0 </X>
--- a/xml/page_topping_select6.xml
+++ b/xml/page_topping_select6.xml
@ -4646,4 +4646,4 @@



-</Page>
+</Popup>
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@ -4730,4 +4730,4 @@



-</Page>
+</Popup>
--- a/xml/page_topping_select_35.xml
+++ b/xml/page_topping_select_35.xml
@ -4425,4 +4425,4 @@



-</Page>
+</Popup>