diff --git a/image/topping_en/bn_sugar3.png b/image/topping_en/bn_sugar3.png
index 97637c20..a76b9c53 100644
Binary files a/image/topping_en/bn_sugar3.png and b/image/topping_en/bn_sugar3.png differ
diff --git a/image/topping_en/bp_sugar3.png b/image/topping_en/bp_sugar3.png
index ab19efb6..f03aee97 100644
Binary files a/image/topping_en/bp_sugar3.png and b/image/topping_en/bp_sugar3.png differ
diff --git a/xml/page_back_to_remove_cup.xml b/xml/page_back_to_remove_cup.xml
new file mode 100644
index 00000000..4e908086
--- /dev/null
+++ b/xml/page_back_to_remove_cup.xml
@@ -0,0 +1,55 @@
+
+ 1080
+ 1920
+
+
+
+ OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
+
+ If TermTemOnline = "true" Then
+ 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"
+ EndIf
+
+ TopView "hide"
+
+ If TNumberTaobinMember = "" Then
+
+ Else
+ If PayWithQR = 1 Then
+ Var VendingTSID = VendingTSIDTmp
+ EndIf
+
+
+ Var BmiYear = PointTaobinStr
+ Var PointCrm = ""
+
+ If FromConsent = 1 Then
+ Var PointCrm = "pdpa1"
+ EndIf
+
+ Var GetScore = VendingTSID
+ If TaobinErrorNetwork = 0 Then
+ AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore
+ Else
+ Var PointCrm = ""
+ AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore
+ EndIf
+
+ Var TNumberTaobinMember = ""
+ Var VendingTSID = ""
+
+ EndIf
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+
+
+
+ 60000
+
+ ;Var menu_status = "stop"
+
+
+
+
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 62dbf072..bb1f3a8c 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -11,7 +11,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
Var FileNumber = 1
- Var taobin_version = "1.47"
+ Var taobin_version = "1.49"
; On open
Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -95,10 +95,12 @@
If TaobinOnline = "true" Then
- Var ShowButtonClickFull = "Invisible"
+ Var CountDownShowButton = 35
+ Var ShowButtonClickFull = "Invisible"
Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4"
EndIf
If TermTemOnline = "true" Then
+ Var CountDownShowButton = 28
Var ShowButtonClickFull = "Enable"
Var VideoMainPage = "ROOT/termtem_project/video/termtem01.mp4"
EndIf
@@ -124,7 +126,6 @@
;SAVELOG ShowPrice
- Var CountDownShowButton = 35
Var CountDownPauseVideo = 0
Var NextPage = "-"
@@ -253,11 +254,34 @@
If TermTemOnline = "true" Then
+ If CountDownShowButton = 31 Then
+ Var ShowButtonClickFull = "Enable"
+ Var ShowButtonClick = "Invisible"
+ Refresh
+ EndIf
+
If CountDownShowButton = 3 Then
- Var ShowButtonClickFull = "Enable"
+ Var ShowButtonClick = "Enable"
+ Var ShowButtonClickFull = "Invisible"
Refresh
EndIf
+
+ If CountDownPauseVideo > 0 Then
+ ; ignore
+ Var CountDownPauseVideo = CountDownPauseVideo - 1
+ If CountDownPauseVideo = 0 Then
+
+ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
+
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+ OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt__catalog_choose_drink1.xml"
+
+ TopView "show"
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+
+ EndIf
+ EndIf
EndIf
@@ -268,7 +292,7 @@
DEBUGVAR CountUpReloadAll
- If CountUpReloadAll > 130 Then
+ If CountUpReloadAll > 80 Then
Var StartUpExt = "-"
Var CountUpReloadAll = 0
@@ -292,7 +316,15 @@
;SAVELOG ShowButtonClick
- Var CountDownShowButton = 35
+
+ If TaobinOnline = "true" Then
+ Var CountDownShowButton = 35
+ EndIf
+
+ If TermTemOnline = "true" Then
+ Var CountDownShowButton = 28
+ EndIf
+
Var CountDownPauseVideo = 6
If TaobinOnline = "true" Then
TouchTapClose
diff --git a/xml/page_board_0.xml b/xml/page_board_0.xml
index ff119786..53ceda08 100644
--- a/xml/page_board_0.xml
+++ b/xml/page_board_0.xml
@@ -29,6 +29,7 @@
Var RoadShow = "false"
Var IgnorePoint = "true"
+ Var ResetNumber = "0899999999"
1000
@@ -110,6 +111,7 @@
If countClick = 3 Then
EndIf
+ numberPhone = ""
If countClick = 5 Then
Var countClick = 0
@@ -127,7 +129,7 @@
Center
RobotoBlack
0x513C2F
- countClick
+ numberPhone
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index e0ce0f2b..084c3bc7 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -653,18 +653,6 @@
EndIf
DEBUGVAR CountUpBrewing
-
- If CountUpBrewing = 5 Then
- If StarwState = "Press" Then
- Machine Straw
- LED LedDoorLid Blink 255 255 255 255
- EndIf
- If LidState = "Press" Then
- Machine Lid
- LED LedDoorLid Blink 255 255 255 255
- EndIf
- EndIf
-
; animation video loop
If AnimationOn = "true" Then
Var CountUpBrewing = CountUpBrewing + 1
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index a4063c76..1ab45fd6 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -74,7 +74,7 @@
EndIf
If MachineStage = "remove-cup" Then
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index ebfb95aa..97c89135 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -65,7 +65,7 @@
EndIf
If MachineStage = "remove-cup" Then
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
@@ -74,6 +74,17 @@
900
+
+ If ReadyForBrew = "false" Then
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Var ReadyForBrew = "false"
+ EndIf
+
+ If MachineStage = "remove-cup" Then
+ Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+
+ EndIf
+
Var CountStepPackPayment = CountStepPackPayment + 1
If CountStepPackPayment = 1 Then
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index f032c9a5..7dc64029 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -37,7 +37,14 @@
DEBUGVAR StarwState
DEBUGVAR LidState
-
+ If StarwState = "Press" Then
+ Machine StrawWithDelay
+ LED LedDoorLid Blink 255 255 255 255
+ EndIf
+ If LidState = "Press" Then
+ Machine LidWithDelay
+ LED LedDoorLid Blink 255 255 255 255
+ EndIf
diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml
index a6c3b581..4732a97e 100644
--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@@ -92,7 +92,11 @@
Var PriceDrinkTmp = "Free"
EndIf
- Var StateImgKeto = "Invisible"
+ STRCONTAIN "ID=1058" MaterialAvailable sugarKeto
+ DEBUGVAR sugarKeto
+ If sugarKeto = "true" Then
+ Open "ROOT/taobin_project/xml/page_topping_select2.xml"
+ EndIf
Var ToppingGotoPayment = "true"
@@ -206,13 +210,10 @@
DEBUGVAR toppingID2index3
DEBUGVAR toppingID2index4
DEBUGVAR toppingID2index5
-
- Var sugarKeto = "false"
+
-
- STRCONTAIN "ID=1058" MaterialAvailable sugarKeto
- DEBUGVAR sugarKeto
+
DEBUGVAR MenuCodeName
DEBUGVAR toppingID1Default
@@ -233,7 +234,7 @@
DEBUGVAR BrewParam
DEBUGVAR IgnoreLidStraw
- Var h_block_of_sugar = 210
+
If IgnoreLidStraw = "true" Then
Var IgnoreLidStraw = "false"
@@ -258,14 +259,7 @@
;PressForever
If TOPPING1 = "Sugar" Then
-
- If sugarKeto = "true" Then
- Var StateImgKeto = "Enable"
- Var BGSugar = "Invisible"
- Else
- Var BGSugar = "Enable"
- Endif
-
+ Var BGSugar = "Enable"
Var ShiftSugarStep = 1
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
@@ -296,15 +290,7 @@
EndIf
If TOPPING1 = "Powder Sugar" Then
-
- If sugarKeto = "true" Then
- Var StateImgKeto = "Enable"
- Var BGSugar = "Enable"
- Var h_block_of_sugar = 262
- Else
- Var BGSugar = "Enable"
- EndIf
- ;Var BGSugar = "Enable"
+ Var BGSugar = "Enable"
Var ShiftSugarStep = 1
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
@@ -633,22 +619,15 @@
;- Begin topping1
986
- h_block_of_sugar
+ 210
5
BGSugar
; sugar layout
-;
-; BGSugar
-; Var( DirImage + "/img_sugar.png" )
-;
-
- StateImgKeto
- Var( DirImage + "/img_sugar_keto.png" )
+ BGSugar
+ Var( DirImage + "/img_sugar.png" )
-;
-
; sugar1