merge

2024-08-16 14:01:34 +07:00 · 2024-08-16 14:01:34 +07:00 · 748a5179bf
commit 748a5179bf
parent 8a1778dca9 b69a0d64b8
140 changed files with 15227 additions and 112 deletions
--- a/inter/sgp/xml/page_collect_point_1.lxml
+++ b/inter/sgp/xml/page_collect_point_1.lxml
@ -499,6 +499,8 @@

 	Var ShowCountDownBrewing = CountDownBrewing

+	DEBUGVAR DebugBypassCollectPt2
+
 	; percent
 	If ShowCountDownAsPercent = 1 Then
 		Var XPercent = InitCNT - ShowCountDownBrewing
@ -1188,7 +1190,12 @@
 	EndIf
 </EventMachine>

+<EventUnitTest1>

+	Var DebugBypassCollectPt2 = 1
+	DEBUGVAR DebugBypassCollectPt2
+
+</EventUnitTest1>


 </Popup>
--- a/inter/sgp/xml/page_collect_point_2.lxml
+++ b/inter/sgp/xml/page_collect_point_2.lxml
@ -36,6 +36,18 @@

 	DEBUGVAR PayOfflineMode

+	If DebugBypassCollectPt2 = 1 Then
+		Var Seeker.TaobinErrorNetwork = 1
+		Var Seeker.PointTaobinStr = ParamCP
+		Var TelephoneNumber = TelephoneNumberX
+		Var Seeker.TNumberTaobinMember= TelephoneNumber
+
+		; reset
+		Var DebugBypassCollectPt2 = 0
+
+		Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_3.lxml"
+	EndIf
+
 	If PayOfflineMode = 1 Then
 		Var Seeker.TaobinErrorNetwork = 1
 		Var Seeker.PointTaobinStr = ParamCP
@ -55,6 +67,13 @@
 		Var ShowCountdown = "Invisible"

 		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			;Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+			;Var DirImage = DirImage + "/image/collectiing_en"
+
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_eng.png"
+		EndIf
 	EndIf
 		
 </EventOpen>
@ -391,7 +410,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> XPercent </Value>
 </Text>

--- a/inter/sgp/xml/page_collect_point_3.lxml
+++ b/inter/sgp/xml/page_collect_point_3.lxml
@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>

 <EventOpen>
@ -52,7 +52,11 @@
 	Var pImage = pImage / 55
 	Var pImageStr = "/taobinPoint55.png" 

-	Var pImageStr = "ROOT/taobin_project/inter/sgp/image/page_member" + pImageStr
+	If UsePepsiTheme = 1 Then
+		Var pImageStr = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member" + pImageStr
+	Else
+		Var pImageStr = "ROOT/taobin_project/inter/sgp/image/page_member" + pImageStr
+	EndIf

 	Var pointStr = ""
 	Var pointStr = pointStr + CoffeePointTmp
@ -919,6 +923,8 @@
 		Var Seeker.FromConsent = 0
 	EndIf 

+	Var AlphaBg = "ROOT/taobin_project/image/display_point/alpha.png"
+
 	Var InitCNT = BREW_CNT

 	Var ShowPercent = "Invisible"
@ -931,6 +937,31 @@
 		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
 	EndIf

+	Var MemberPtCard = Var MemberPtCard = "ROOT/taobin_project/inter/sgp/image/page_member/member_point_card.png"
+	Var MemberProfileFilename = "ROOT/taobin_project/inter/sgp/image/page_member/member_profile.png"
+
+	Var CloseFilename = "ROOT/taobin_project/inter/sgp/image/page_member/bn_close.png"
+	Var ClosePressFilename = "ROOT/taobin_project/inter/sgp/image/page_member/bp_close.png"
+
+	Var PointAlert = "ROOT/taobin_project/inter/sgp/image/page_member/points_alert.png"
+	Var Free1 = "ROOT/taobin_project/inter/sgp/image/page_member/free1.png"
+
+	If UsePepsiTheme = 1 Then
+		Var AlphaBg = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/alpha.png"
+		Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
+
+		Var MemberPtCard = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member/member-point-card.png"
+		Var MemberProfileFilename = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member/member-profile.png"
+
+		Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/display_point_en/"
+
+		Var CloseFilename = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member/bn_close.png"
+		Var ClosePressFilename = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member/bp_close.png"
+
+		Var PointAlert = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member/points_alert.png"
+		Var Free1 = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_member/free1.png"
+	EndIf
+
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@ -1057,7 +1088,7 @@
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
-<Filename> "ROOT/taobin_project/image/display_point/alpha.png" </Filename>
+<Filename> AlphaBg </Filename>
 </Image>


@ -1068,13 +1099,13 @@
 <Image>
 <X> 108 </X>
 <Y> 665 </Y>
-<Filename> "ROOT/taobin_project/inter/sgp/image/page_member/member_point_card.png" </Filename>
+<Filename> MemberPtCard </Filename>
 </Image>

 <Image>
 <X> 108 </X>
 <Y> 665 </Y>
-<Filename> "ROOT/taobin_project/inter/sgp/image/page_member/member_profile.png" </Filename>
+<Filename> MemberProfileFilename </Filename>
 </Image>


@ -1113,8 +1144,8 @@
 <Button>
 <X> 396 </X>
 <Y> 1720 </Y>
-<Filename> "ROOT/taobin_project/inter/sgp/image/page_member/bn_close.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_member/bp_close.png" </FilenamePress>
+<Filename> CloseFilename </Filename>
+<FilenamePress> ClosePressFilename </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@ -1526,7 +1557,7 @@
 <Button>
 <X> 747 </X>
 <Y> 1528 </Y>
-<Filename> "ROOT/taobin_project/inter/sgp/image/page_member/free1.png" </Filename>
+<Filename> Free1 </Filename>
 </Button>

 <Button>
@ -1588,7 +1619,7 @@
 <Image>
 <X> 172 </X>
 <Y> 1650 </Y>
-<Filename> "ROOT/taobin_project/inter/sgp/image/page_member/points_alert.png" </Filename>
+<Filename> PointAlert </Filename>
 </Image>

 ;<Text>
@ -1647,7 +1678,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> XPercent </Value>
 </Text>

--- a/inter/sgp/xml/page_collect_point_error.lxml
+++ b/inter/sgp/xml/page_collect_point_error.lxml
@ -14,6 +14,7 @@
 	
    If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/display_get_free_en/"
+		Var DirImageStatic = "ROOT/taobin_project/image/display_get_free_en/"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"

@ -22,6 +23,16 @@
 		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
 	EndIf
+
+	Var AlphaBg = "ROOT/taobin_project/image/collectiing/alpha.png"
+	If UsePepsiTheme = 1 Then
+		Var AlphaBg = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/alpha.png"
+		;Var NumImgDir = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/"
+
+		Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+		Var DirImage = DirImage + "/image/display_get_free_en/"
+	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@ -54,7 +65,7 @@
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+<Filename> AlphaBg </Filename>
 </Image>


--- a/inter/sgp/xml/page_drinkfail_sg.lxml
+++ b/inter/sgp/xml/page_drinkfail_sg.lxml
@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xEFEDEA" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 <Refresh> "Partial" </Refresh>
 <EventOpen>
@ -45,6 +45,11 @@

    Var StepX = 1
    Var Ext1a = ""
+
+    If UsePepsiTheme = 1 Then
+        Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing/"
+
+    EndIf
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>
@ -259,7 +264,7 @@ EndIf
 <Align> Center </Align>
 <Width> 1080 </Width>
 <Font> RobotoRegular </Font>
-<Color> 0xDE794E </Color>
+<Color> HeadlineColor </Color>
 <Value> MachineErrorDetailAll </Value>
 </Text>

--- a/inter/sgp/xml/page_show_error.lxml
+++ b/inter/sgp/xml/page_show_error.lxml
@ -0,0 +1,364 @@
+<Page>
+<X> 0 </X>
+<Y> 608 </Y>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1312 </Height>
+<Background> BackgroundColor </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>
+	
+	Var EmergencyStop = "-"
+	
+		
+	If EmergencyStop = "true" Then
+		If DoorCupPosition = "bottom" Then
+			; It normal 
+			Var EmergencyStop = "false"
+		Else
+			Var MachineErrorDetailAll = "Emergency stop!"
+
+		EndIf
+	Else
+
+		Var 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 
+				
+				Var NETCORE_LOST_COUNT_UP = NETCORE_LOST_COUNT_UP + 1
+				DEBUGVAR NETCORE_LOST_COUNT_UP
+
+				If NETCORE_LOST_COUNT_UP > 300 Then
+					If textStep > 3 Then
+						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
+				EndIf
+
+			Else
+			
+				If stop_now_from_netcore_event = 1 Then
+					Var stop_now = "false"
+					SAVELOG "stop_now_from_netcore_event is set"
+					Var stop_now_from_netcore_event = 0
+				EndIf
+
+				If stop_now_from_door_cup = 1 Then
+					Var stop_now = "false"
+					SAVELOG "stop_now_from_door_cup is set"
+					Var stop_now_from_door_cup = 0
+				EndIf
+
+				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/inter/sgp/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/inter/sgp/xml/page_show_error.lxml"
+						Refresh
+
+					EndIf
+				EndIf
+			EndIf
+		EndIf
+
+		
+
+
+	EndIf
+
+
+
+	DEBUGVAR show_error_normal
+	DEBUGVAR show_error_sp1
+	DEBUGVAR TimeOut
+	Var TimeOut = TimeOut + 1
+	If TimeOut > 30 Then
+		Var TimeOut = 0
+		Open "ROOT/taobin_project/inter/sgp/xml/page_show_error.lxml"
+
+	EndIf
+
+	Refresh
+	TimerReset
+
+	Var LEDSet = "true"
+	;Open "ROOT/taobin_project/inter/sgp/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>
+	DEBUGVAR MachineStage
+	DEBUGVAR stop_now
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/vending_error"
+	EndIf
+
+	If MachineStage = "mcu-upgrade" Then
+		;Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+
+	If NeedUpgrade = "true" Then
+		;Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+
+	DEBUGVAR MachineStage
+	
+	If MachineStage = "close-maintenance" Then
+		DEBUGVAR stop_now
+		If stop_now = "true" Then
+			;Var DirImage = CountryRootPath + "image/vending_error_en"
+		Else
+			Var show_error_normal = "Enable"
+			Var show_error_sp1 = "Invisible"
+			
+			;Var DirImage = CountryRootPath + "image/vending_error_en"
+		EndIf
+	EndIf
+
+
+
+	If MachineStage = "drink-failed" Then
+		If stop_now = "true" Then
+			;Var DirImage = CountryRootPath + "image/vending_error_en"
+		Else
+			Var show_error_normal = "Enable"
+			Var show_error_sp1 = "Invisible"
+			;Var DirImage = CountryRootPath + "image/vending_error_en"
+		EndIf
+	EndIf
+	
+	If NETCORE_LOST_CNT > 0 Then
+		
+		;Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+
+	If NETCORE_EVENT_CNT_X >= 30 Then
+		Var NETCORE_EVENT_CNT_X = 0
+		
+		;Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+
+	Var MaintenanceCard = 20
+	Random MaintenanceCard
+	Var index = 1 + MaintenanceCard
+
+	If UsePepsiTheme = 1 Then
+		Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+		Var DirImage = DirImage + "/image/vending_error_en"
+	EndIf
+
+
+	DEBUGVAR DirImage
+
+
+	Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
+	Var RandomImage =  RandomImage + ".png"
+
+	If UsePepsiTheme = 1 Then
+		Var RandomImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+		Var RandomImage = RandomImage + "/image/close_en/Frame"
+		Var RandomImage = RandomImage + index
+		Var RandomImage = RandomImage + ".png"
+	EndIf
+
+	DEBUGVAR RandomImage
+	DEBUGVAR Seeker
+	DEBUGVAR DoorCupPosition
+	DEBUGVAR DoorLidPosition
+	DEBUGVAR EmergencyStop
+</Function2>
+
+<Image>
+<State> show_error_normal </State>
+<X> 69 </X>
+<Y> 642 </Y>
+<Filename> Var(DirImage + "/img1.png") </Filename>
+</Image>
+
+;<Image>
+;<State> show_error_sp1 </State>
+;<X> 69 </X>
+;<Y> 642 </Y>
+;<Filename> Var(DirImage + "/img_error_sgp.png") </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> HeadlineColor </Color>
+<Value> MachineErrorDetailAll </Value>
+</Text>
+
+
+</Page>