From 220ceeedad637c0c283aba9cd97ab35f56358c9e Mon Sep 17 00:00:00 2001
From: Pakin <pakin.t@forth.co.th>
Date: Thu, 26 Sep 2024 14:33:03 +0700
Subject: [PATCH] WTC+SGP: fix page_remove_cup not in theme

---
 inter/sgp/menu/lang.tsv                       |  13 +-
 inter/sgp/xml/page_remove_cup.lxml            |   6 +
 .../collectiing_en/bn_door_open_no_txt.png    | Bin 0 -> 5010 bytes
 .../collectiing_en/bp_door_open_no_txt.png    | Bin 0 -> 3112 bytes
 .../sgp/xml/page_remove_cup-SGP_blue.lxml     | 155 ++++++++++++++++++
 5 files changed, 168 insertions(+), 6 deletions(-)
 create mode 100644 inter/whatthecup/sgp/image/collectiing_en/bn_door_open_no_txt.png
 create mode 100644 inter/whatthecup/sgp/image/collectiing_en/bp_door_open_no_txt.png
 create mode 100644 inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml

diff --git a/inter/sgp/menu/lang.tsv b/inter/sgp/menu/lang.tsv
index f28fa422..c83fbd82 100644
--- a/inter/sgp/menu/lang.tsv
+++ b/inter/sgp/menu/lang.tsv
@@ -168,11 +168,12 @@ TextID	Note	English	Thai
 000407		Order next drink	สั่งแก้วถัดไป
 		Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center	Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center
 000408		Next customer can order while waiting	ลูกค้าท่านถัดไปสั่งเครื่องดื่มรอได้เลย
-		Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90	Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
+		Font=Roboto,Type=Bold,Size=80,Color=0x0025FF,Align=Center,LineHeight=90	Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
 000409		The Previous Drink\nHas Not Been Collected	มีเครื่องดื่มค้างอยู่\nในช่องรับเครื่องดื่ม
-		Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50	Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40
-000410		Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink.	กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
-		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+		Font=Roboto,Type=Regular,Size=36,Color=0x0025FF,Align=Center,LineHeight=50	Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40
+000410		Please press the button below to open the door.\nTake the drink out.\nAnd start ordering your drink.	กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
+		Font=Kanit,Type=Regular,Size=64,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
 000411		Press Here	กดที่นี่
 
 
@@ -851,7 +852,7 @@ TextID	Note	English	Thai
 800771		Type number.	ใส่ตัวเลข
 800772
 800773		Exhaust Fan Test	ทดสอบพัดลมดูดอากาศ
-800774			ตรวจสอบลูกเบี้ยว
+800774		Check Cam powder	ตรวจสอบลูกเบี้ยว
 800775		Cam powder test pass	ทดสอบผ่าน
 800776		Cam powder test fail	ทดสอบไม่ผ่าน
 810000
@@ -892,7 +893,7 @@ TextID	Note	English	Thai
 810034		Hot Water volume	ปริมาณน้ำร้อน ml
 810035		Preheat when after make espresso ( minute )	pre-heat เมื่อหลังทำกาแฟ( นาที )
 810036
-810037
+810037		Time to Test	จำนวนครั้ง
 810038
 810039
 810040
diff --git a/inter/sgp/xml/page_remove_cup.lxml b/inter/sgp/xml/page_remove_cup.lxml
index 4ad55248..2945326d 100644
--- a/inter/sgp/xml/page_remove_cup.lxml
+++ b/inter/sgp/xml/page_remove_cup.lxml
@@ -14,6 +14,12 @@
 
 	DEBUGVAR "SGP Remove Cup"
 
+	If UsePepsiTheme = 1 Then
+		Var RemoveCupPepsiTheme = "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml"
+		Open RemoveCupPepsiTheme
+
+	EndIf
+
     Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
 		
 	LED LedDoorDoor 5 255 255 255 255
diff --git a/inter/whatthecup/sgp/image/collectiing_en/bn_door_open_no_txt.png b/inter/whatthecup/sgp/image/collectiing_en/bn_door_open_no_txt.png
new file mode 100644
index 0000000000000000000000000000000000000000..26d9b6906f8d2ee0efc1ae11a79ff1fff669f7fa
GIT binary patch
literal 5010
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

literal 0
HcmV?d00001

diff --git a/inter/whatthecup/sgp/image/collectiing_en/bp_door_open_no_txt.png b/inter/whatthecup/sgp/image/collectiing_en/bp_door_open_no_txt.png
new file mode 100644
index 0000000000000000000000000000000000000000..03f47516d27f764fa03e0040fc109ec580f06dc5
GIT binary patch
literal 3112
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

literal 0
HcmV?d00001

diff --git a/inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml b/inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml
new file mode 100644
index 00000000..8771e0a5
--- /dev/null
+++ b/inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml
@@ -0,0 +1,155 @@
+<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
+
+	Var CountryName = "Singapore"
+
+	DEBUGVAR "SGP Remove Cup"
+
+
+
+    Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
+
+	If UsePepsiTheme = 1 Then
+		Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/"
+	EndIf
+
+		
+	LED LedDoorDoor 5 255 255 255 255
+
+	Var CheckCupStateDoorCupClose = ""
+	Var CheckCupStateDoorCupCloseCnt = 0
+
+	DEBUGVAR DoorCupPosition
+	If DoorCupPosition = "bottom" Then
+		Var buttonRemoveCup = "Enable"
+	EndIf
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+	
+	;SAVELOG MachineErrorDetail
+	Var MachineErrorDetailAll = MachineErrorDetailEng
+
+
+	If MachineStage = "show-menu" Then
+		Open "ROOT/taobin_project/xml/page_board.xml"
+
+	EndIf
+	If MachineStage = "close-maintenance" Then
+		Open "ROOT/taobin_project/xml/page_show_error.lxml"
+	EndIf
+
+	Var Timeout = Timeout + 1
+	DEBUGVAR Timeout
+	If Timeout > 5 Then
+		Var Timeout = 0
+
+		DEBUGVAR DoorCupPosition
+		If DoorCupPosition = "bottom" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+	EndIf
+
+	; Logic have differrent drinkfail3.xml 
+	; protect lock 
+	; 
+
+	If CheckCupStateDoorCupCloseCnt > 0 Then
+		Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
+	EndIf
+
+	If CheckCupStateDoorCupCloseCnt = 0 Then
+		Var CheckCupStateDoorCupClose = ""
+	EndIf
+
+	DEBUGVAR HaveCup
+
+	If HaveCup = "true" Then
+
+
+	Else
+		If buttonRemoveCup = "Enable" Then
+			Var buttonRemoveCup = "Invisible"
+		EndIf
+	EndIf
+
+	DEBUGVAR buttonRemoveCup
+	DEBUGVAR CheckCupStateDoorCupClose
+
+
+	Refresh
+	TimerReset
+
+
+</EventTimeout>
+
+<Text>
+  <X> 50 </X>
+  <Y> 852 </Y>
+  <Width> 1000 </Width>
+  <Height> 300 </Height>
+  <Language>
+    <ID> 000409 </ID>
+  </Language>
+</Text>
+
+<Text>
+  <X> 50 </X>
+  <Y> 1200 </Y>
+  <Width> 1000 </Width>
+  <Height> 200 </Height>
+  <Language>
+    <ID> 000410 </ID>
+  </Language>
+</Text>
+
+<Button>
+<X> 212 </X>
+<Y> 1661 </Y>
+<Filename> Var( DirImage + "/bn_door_open_no_txt.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_door_open_no_txt.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<State> buttonRemoveCup </State>
+<EventClick> 
+
+
+	Machine RemoveCup
+	Machine DoorLidOpen
+	Var buttonRemoveCup = "Invisible"
+   Var CheckCupStateDoorCupClose = "reset"
+   Var CheckCupStateDoorCupCloseCnt = 30
+</EventClick>
+<Language>
+  <ID> 000411 </ID>
+  <X> 80 </X>
+  <Y> 40 </Y>
+  <Width> 500 </Width>
+  <Height> 50 <Height>
+</Language>
+</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>