release 10.03

xml/event/tricker.ev

@@ -205,8 +205,6 @@ EndIf
 
 
 If BoxID = 201714 Then
-	Var Catalog20BahtEnable = 1
-	Var AppleFarmFestivalPro = 1
 EndIf
 
 If BoxID = 201729 Then
@@ -214,8 +212,27 @@ If BoxID = 201729 Then
 EndIf
 
 If BoxID = 123456 Then
+	Var AppleFarmFestivalPro = 0
+	Var HappyTriosPro = 0
+	Var TaiwaneseTeaPro = 1
+	Var SchoolOvaltinePro = 1
 EndIf
 
+If BoxID = 173149 Then
+	Var AppleFarmFestivalPro = 0
+	Var HappyTriosPro = 0
+	Var TaiwaneseTeaPro = 1
+	Var SchoolOvaltinePro = 1
+EndIf
+
+If BoxID = 200435 Then
+	Var AppleFarmFestivalPro = 0
+	Var HappyTriosPro = 0
+	Var TaiwaneseTeaPro = 1
+	Var SchoolOvaltinePro = 1
+EndIf
+
+
 DEBUGVAR ConfigNumer
 If ConfigNumer >= 1762 Then
 	Var ToppingNewUINewSystem = 1
@@ -327,6 +344,8 @@ EndIf
 
 Var CurrentMainVideoTemp = 0
 
+DEBUGVAR TaiwanesePowderEnable
+DEBUGVAR TaiwaneseTeaPro
 
 
 ; Check reward out of stock

xml/page_NewBrewing3.xml

@@ -643,6 +643,12 @@
 	__CMD "SetErrorCodeHandleByXML" 1030 "-" "-"
 	__CMD "SetErrorCodeHandleByXML" 1031 "-" "-"
 
+	Var IndexCharWhenTImeZero = 0
+	
+	Var ArrayCharWhenTImeZero[0] = "- "
+	Var ArrayCharWhenTImeZero[1] = "\ "
+	Var ArrayCharWhenTImeZero[2] = "| "
+	Var ArrayCharWhenTImeZero[3] = "/ "
 </EventOpen>
 <EventLanguageOnChange>
 	Var XPosiShowCountDownBrew = 768
@@ -790,7 +796,6 @@
 		Var MOVE_CUP_TO_DOOR = "false"
 	EndIf
 
-	Var CountDownBrewing = BREW_CNT
 
 
 
@@ -825,8 +830,6 @@
 	EndIf
 
 
-	Var ShowCountDownBrewing = CountDownBrewing
-
 
 	; TODO
 	DEBUGVAR EnableDoubleCupNoError
@@ -844,6 +847,10 @@
 	EndIf
 
 
+
+	Var CountDownBrewing = BREW_CNT
+	Var ShowCountDownBrewing = CountDownBrewing
+
 	If BREW_CNT = 0 Then
 		If CountUpWhenBREW_CNT > 56 Then
 			Var CountUpWhenBREW_CNT = 0
@@ -858,6 +865,14 @@
 
 		Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1
 
+		
+		Var ShowCountDownBrewing = ArrayCharWhenTImeZero[IndexCharWhenTImeZero]
+		
+		Var IndexCharWhenTImeZero = IndexCharWhenTImeZero + 1
+		If IndexCharWhenTImeZero > 3 Then
+			Var IndexCharWhenTImeZero = 0
+		EndIf
+
 	EndIf
 
 	If Timeout > 480 Then

xml/page_NewBrewing3Conti.xml

@@ -308,7 +308,15 @@
 
 
 	Var ShowCountDownBrewing = CountDownBrewing
+	If CountDownBrewing = 0 Then
 
+		Var ShowCountDownBrewing = ArrayCharWhenTImeZero[IndexCharWhenTImeZero]
+	
+		Var IndexCharWhenTImeZero = IndexCharWhenTImeZero + 1
+		If IndexCharWhenTImeZero > 3 Then
+			Var IndexCharWhenTImeZero = 0
+		EndIf
+	EndIf
 
 	If Timeout > 540 Then
 		SAVELOG "back_to_main from line  > 217."

xml/page_board.xml

@@ -1356,13 +1356,6 @@
 		EndIf
 	EndIf
 
-
-	If BoxID = 173372 Then
-		Var SpiralOnline = "true"
-
-		Var InternationalShow = 1
-	EndIf
-
 	If EnableMultiInstanceFromBoxID = 1 Then
 		If CountryName = "Thailand" Then
 
@@ -1414,7 +1407,7 @@
 				Var InternationalShow = 0
 			EndIf
 
-			If BoxID = 201193 Then
+			If BoxID = 201729 Then
 				Var InternationalShow = 1
 			EndIf
 
@@ -1517,6 +1510,10 @@
 		DEBUGVAR OpenFileXML
 		TRY OpenFileXML
 
+		If CountryName = "Thailand" Then
+			TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
+		EndIf
+
 	Else
 		Var LanguageObjectShow = "Invisible"
 		Var NoLangObjectShow = "Enable"

xml/page_drinkok.xml

@@ -16,6 +16,7 @@
 
 	DEBUGVAR DrinkOKStringVersion
 
+	Var CountDownDrinkOK = 4
 
 	WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"
 

xml/page_topping_select8.xml

@@ -978,6 +978,22 @@
 				Var MenuReady = "WaitSpiral"
 			EndIf
 		EndIf
+		
+		If UserSelectProductCode = "-" Then
+			Var MenuReady = "error-pd"
+		EndIf
+		
+		If UserSelectProductCode = "" Then
+			Var MenuReady = "error-pd2"
+		Else
+			Strlen UserSelectProductCode UserSelectProductCodeLen
+			If UserSelectProductCodeLen = 13 Then
+
+			Else
+				Var MenuReady = "error-pd3"	
+			EndIf
+		EndIf
+		DEBUGVAR MenuReady
 
         If MenuReady = "YES" Then
             DEBUGVAR ToppingDetail

xml/vending_info.xml

@@ -457,8 +457,15 @@
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
 	Var StartUpExt = "-"
-	ReloadAll
-	; FINISH
+	If ReloadAllPressButton = "" Then
+		Var ReloadAllPressButton = 0
+	EndIf
+	If ReloadAllPressButton = 2 Then
+		ReloadAll
+	EndIf
+	Var ReloadAllPressButton = ReloadAllPressButton + 1
+	
+	
 </EventClick>
 </Image>
 
@@ -467,7 +474,13 @@
 <Y> info_3Y </Y>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
-	FINISH
+	If FinishPressButton = "" Then
+		Var FinishPressButton = 0
+	EndIf
+	If FinishPressButton = 2 Then
+		FINISH
+	EndIf
+	Var FinishPressButton = FinishPressButton + 1
 </EventClick>
 </Image>