Add file

ui/lang.tsv

@@ -305,8 +305,8 @@
 800070		Day	วัน
 800071		Water Tank	ถังน้ำดี
 
-800072		Water Tank restart.	ถังน้ำดี เริ่มนับใหม่
+800072		Water Tank restart.	ถังน้ำดี เริ่มนับใหม่			Water Tank restart.
-800073		Restart Shot coffee count	Restart.
+800073		Restart Shot coffee count	เริ่มนับใหม่			Restart Shot coffee count
 
 
 	Soda System
@@ -735,6 +735,13 @@
 800654		Main Gate Switch	สวิทช์ประตู Main
 800655		Module Arm Switch	สวิทช์ Module แขน
 800656		Guard Bean Coffee Switch	สวิทช์ Guard Bean กาแฟ
+800657		Degree	องศา
+800658		Coarse	หยาบ
+800659		Fine	ละเอียด
+
+
+
+
 
 	Test (New UI)
 800700		Active	ทำงาน

xml/page_check_member2.xml

@@ -906,6 +906,7 @@
 
     Var text5Img = "/text5.png"
 
+    ;inter-image
     If CountryName = "Malaysia" Then
 		Var text5Img = "/text5-MYR.png"
 	EndIf

xml/page_collect_point_2.xml

@@ -180,6 +180,7 @@
 				DEBUGVAR Seeker.TNumberTaobinMember
 				If TaobinPDPA = 0 Then
 
+					;inter-xml-open
 					If CountryName = "Malaysia" Then
 						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 					EndIf
@@ -192,6 +193,10 @@
 						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 					EndIf 
 
+					If CountryName = "Singapore" Then
+						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+					EndIf 
+
 					Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 				EndIf
 

xml/page_collect_point_3.xml

@@ -648,6 +648,7 @@
 		
 	EndIf
 
+	;inter-from-consent
 	If CountryName = "Malaysia" Then
 		Var Seeker.FromConsent = 0
 	EndIf

xml/page_display_get_free.xml

@@ -57,6 +57,7 @@
 	Var img_popup2 = "/img_popup2.png"
 	Var img_popup3 = "/img_popup3.png"
 
+	;inter-image
     If CountryName = "Malaysia" Then
 		Var img_popup2 = "/img_popup2-MYR.png"
 		Var img_popup3 = "/img_popup3-MYR.png"
@@ -84,6 +85,15 @@
 		Var MemberState3 = "Invisible"
 	EndIf
 
+	 If CountryName = "Singapore" Then
+		Var img_popup2 = "/img_popup2-SGP.png"
+		Var img_popup3 = "/img_popup3-SGP.png"
+
+		Var MemberState1 = "Enable"
+		Var MemberState2 = "Invisible"
+		Var MemberState3 = "Invisible"
+	EndIf
+
 	
 
 

xml/page_drinkfail2.xml

@@ -63,13 +63,14 @@
 
 			EndIf
 
+			;inter-xml-open
 			If CountryName = "Malaysia" Then
 				Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
 			Else
 				Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" 
 			EndIf
 		Else
-
+			;inter-xml-open
 			If CountryName = "Malaysia" Then
 				Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
 			Else
@@ -163,6 +164,7 @@
 
 	Var MaxNumber = 10
 
+	;inter-max-number
 	If CountryName = "Malaysia" Then
 		Var MaxNumber = 11
 	EndIf
@@ -170,6 +172,11 @@
 	If CountryName = "Indonesia" Then
 		Var MaxNumber = 12
 	EndIf 
+
+	If CountryName = "Singapore" Then
+		Var MaxNumber = 10
+	EndIf 
+
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>

xml/page_lid_straw.xml

@@ -64,25 +64,16 @@
 		Var PictureBegin = "txt_"
 		Var PictureEnd = "_en.png"
 
-		If CountryName = "Australia" Then
+		;inter-play-list
-			Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
+		Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
-			Var VideoFileBegin = "TaoBin2_draft02_art"
+		Var VideoFileBegin = "TaoBin2_draft02_art"
-			Var VideoFileEnd = ".mp4"
+		Var VideoFileEnd = ".mp4"
 
-			Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/inter/aus/image/page_doing/"
+		Var PicturePath = CountryRootPath + "/image/page_doing/"
-			Var PictureBegin = "txt_"
+		Var PictureBegin = "txt_"
-			Var PictureEnd = "_en.png"
+		Var PictureEnd = "_en.png"
-		EndIf
+	
 
-		If CountryName = "Malaysia" Then
-			Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
-			Var VideoFileBegin = "TaoBin2_draft02_art"
-			Var VideoFileEnd = ".mp4"
-
-			Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/image/page_doing/"
-			Var PictureBegin = "txt_"
-			Var PictureEnd = "_en.png"
-		EndIf
 	Else
 		Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
 		Var VideoFileBegin = "TaoBin2_draft02_art"

xml/page_thankyou.xml

@@ -167,6 +167,7 @@
 
 	Var remainCredit = "/remainCredit.png"
 
+	;inter-image
     If CountryName = "Malaysia" Then
 		Var remainCredit = "/remainCredit-MYR.png"
 	EndIf