diff --git a/image/img_menu_err.png b/image/img_menu_err.png
new file mode 100644
index 00000000..e274556d
Binary files /dev/null and b/image/img_menu_err.png differ
diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml
index cef63cb3..e868a340 100644
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@@ -1,4 +1,14 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
;DEBUGVAR ICE_PROCESS_STATUS
@@ -78,14 +88,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_advert.xml b/xml/page_advert.xml
index ded817b1..c8c3600c 100644
--- a/xml/page_advert.xml
+++ b/xml/page_advert.xml
@@ -1,4 +1,15 @@
- HeadScreenWidth
- HeadScreenHeight
+ 1080
+ 380
+
+
+
diff --git a/xml/page_advert2.xml b/xml/page_advert2.xml
new file mode 100644
index 00000000..4de4c761
--- /dev/null
+++ b/xml/page_advert2.xml
@@ -0,0 +1,15 @@
+
+ 1080
+ 380
+
+
+
+
diff --git a/xml/page_blank.xml b/xml/page_blank.xml
new file mode 100644
index 00000000..f117f6fa
--- /dev/null
+++ b/xml/page_blank.xml
@@ -0,0 +1,5 @@
+
+ 1080
+ 380
+
+
diff --git a/xml/page_board.xml b/xml/page_board.xml
index a0157247..746cbdd0 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -346,27 +346,27 @@
EndIf
If VideoAdvIndex = 0 Then
- Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile7
+ Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile7
Var video_menu_1 = video_menu_1 + ".mp4"
EndIf
If VideoAdvIndex = 1 Then
- Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile8
+ Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile8
Var video_menu_1 = video_menu_1 + ".mp4"
EndIf
If VideoAdvIndex = 2 Then
- Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile9
+ Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile9
Var video_menu_1 = video_menu_1 + ".mp4"
EndIf
If VideoAdvIndex = 3 Then
- Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile10
+ Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile10
Var video_menu_1 = video_menu_1 + ".mp4"
EndIf
If VideoAdvIndex = 4 Then
- Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile11
+ Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile11
Var video_menu_1 = video_menu_1 + ".mp4"
EndIf
If VideoAdvIndex = 5 Then
- Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile12
+ Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile12
Var video_menu_1 = video_menu_1 + ".mp4"
EndIf
@@ -388,22 +388,8 @@
Machine CancelWepApp
- ;StrLen AdvertiseProfile AdvertiseProfileLen
- ;
- ;If AdvertiseProfileLen = 0 Then
- ; CacheVarStr "get" AdvertiseProfile
- ;Else
- ;
- ; STRCONTAIN "00/00" AdvertiseProfile advPro
- ;
- ; If advPro = "true" Then
- ; CacheVarStr "get" AdvertiseProfile
- ; Else
- ; CacheVarStr "put" AdvertiseProfile
- ; EndIf
- ;EndIf
-
- DEBUGVAR AdvertiseProfile
+ StrLen AdvertiseProfile AdvertiseProfileLen
+
If XMLProfile = "taobin_notopup" Then
Var ButtontoTopupMenu = "Disable"
@@ -442,6 +428,22 @@
If NetworkStatus = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
EndIf
+
+ If AdvertiseProfileLen = 0 Then
+ CacheVarStr "get" AdvertiseProfile
+ Else
+
+ STRCONTAIN "00/00" AdvertiseProfile advPro
+
+ If advPro = "true" Then
+ CacheVarStr "get" AdvertiseProfile
+ Else
+ CacheVarStr "put" AdvertiseProfile
+ EndIf
+ EndIf
+
+ DEBUGVAR AdvertiseProfile
+
1000
@@ -693,7 +695,7 @@
; "/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+ ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
If CocktailShow = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
Else
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index 43122869..a6138254 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -2,9 +2,11 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+
TopView "show"
; On open
@@ -212,16 +214,25 @@
-
-
+
+
+;
@@ -280,6 +291,8 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+
; eng
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
@@ -297,6 +310,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
@@ -314,6 +328,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
@@ -330,6 +345,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
@@ -362,6 +378,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
@@ -379,6 +396,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
@@ -396,6 +414,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml
index 2e04f5a0..0cff983d 100644
--- a/xml/page_catalog_choose_drink.xml
+++ b/xml/page_catalog_choose_drink.xml
@@ -71,10 +71,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -142,14 +160,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink1.pml b/xml/page_catalog_choose_drink1.pml
index 5b3569ee..6c65be1f 100644
--- a/xml/page_catalog_choose_drink1.pml
+++ b/xml/page_catalog_choose_drink1.pml
@@ -30,7 +30,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index f02c603e..558f6161 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -6,11 +6,15 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -19,6 +23,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -26,8 +32,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -140,10 +156,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -211,14 +245,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink11.pml b/xml/page_catalog_choose_drink11.pml
index 2264bde2..6a3f0333 100644
--- a/xml/page_catalog_choose_drink11.pml
+++ b/xml/page_catalog_choose_drink11.pml
@@ -21,7 +21,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink11.xml b/xml/page_catalog_choose_drink11.xml
index fcb2fd8e..518fae0d 100644
--- a/xml/page_catalog_choose_drink11.xml
+++ b/xml/page_catalog_choose_drink11.xml
@@ -5,7 +5,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
@@ -13,6 +13,10 @@
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -21,6 +25,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -28,8 +34,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -128,10 +144,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -199,14 +233,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 5a714ea0..85ccf2b4 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -93,7 +93,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index 3d53490f..bd7de5c6 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -6,12 +6,16 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -20,6 +24,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -27,8 +33,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -116,10 +132,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -187,14 +221,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml
index 821d9e4a..4b352681 100644
--- a/xml/page_catalog_choose_drink3.pml
+++ b/xml/page_catalog_choose_drink3.pml
@@ -76,7 +76,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index f08890f2..2da4f928 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -5,13 +5,17 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -20,6 +24,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -27,8 +33,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -115,10 +131,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -186,14 +220,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink4.pml b/xml/page_catalog_choose_drink4.pml
index c729fe4f..3d364b43 100644
--- a/xml/page_catalog_choose_drink4.pml
+++ b/xml/page_catalog_choose_drink4.pml
@@ -34,7 +34,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index dc058a30..14ff87be 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -5,11 +5,15 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -18,6 +22,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -25,8 +31,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -113,10 +129,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -184,14 +218,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink5.pml b/xml/page_catalog_choose_drink5.pml
index edd4979a..7ca33ac2 100644
--- a/xml/page_catalog_choose_drink5.pml
+++ b/xml/page_catalog_choose_drink5.pml
@@ -23,7 +23,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index 77454729..53316890 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -5,12 +5,16 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -19,6 +23,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -26,8 +32,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -106,10 +122,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -177,14 +211,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml
index 3b014802..3edd0727 100644
--- a/xml/page_catalog_choose_drink6.pml
+++ b/xml/page_catalog_choose_drink6.pml
@@ -69,7 +69,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index 405ef5ed..a82af1b4 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -5,12 +5,16 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -19,6 +23,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -26,8 +32,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -112,10 +128,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -183,14 +217,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink7.pml b/xml/page_catalog_choose_drink7.pml
index b0fa058a..ef6db777 100644
--- a/xml/page_catalog_choose_drink7.pml
+++ b/xml/page_catalog_choose_drink7.pml
@@ -30,7 +30,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
index 4e0f5a10..24b03749 100644
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@@ -5,12 +5,16 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -19,6 +23,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -26,8 +32,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -128,10 +144,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -199,14 +233,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_choose_drink8.pml b/xml/page_catalog_choose_drink8.pml
index aba7d42f..802f17a2 100644
--- a/xml/page_catalog_choose_drink8.pml
+++ b/xml/page_catalog_choose_drink8.pml
@@ -27,7 +27,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml
index 39256a57..e9e72b73 100644
--- a/xml/page_catalog_choose_drink8.xml
+++ b/xml/page_catalog_choose_drink8.xml
@@ -5,12 +5,16 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
If show_eng = "true" Then
Var showthaiText = "Invisible"
@@ -19,6 +23,8 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var ice_tab_text = "Ice will be ready at "
+
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
@@ -26,8 +32,18 @@
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
EndIf
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
; SpiralOnline
If SpiralOnline = "true" Then
Var Menu1Selected2 = "Enable"
@@ -108,10 +124,28 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
- DEBUGVAR NextPage
+ ;DEBUGVAR ICE_PROCESS_STATUS
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
If NextPage = "-" Then
Else
@@ -179,14 +213,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_group_appfast.skt b/xml/page_catalog_group_appfast.skt
index ff9777b1..24ea7269 100644
--- a/xml/page_catalog_group_appfast.skt
+++ b/xml/page_catalog_group_appfast.skt
@@ -6,7 +6,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_group_coffee.skt b/xml/page_catalog_group_coffee.skt
index 987d4c8f..eb338444 100644
--- a/xml/page_catalog_group_coffee.skt
+++ b/xml/page_catalog_group_coffee.skt
@@ -6,7 +6,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml
index 4afc2821..b8e022d1 100644
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@@ -4,7 +4,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
@@ -140,6 +140,16 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
;DEBUGVAR ICE_PROCESS_STATUS
@@ -219,14 +229,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_group_milk.skt b/xml/page_catalog_group_milk.skt
index 35c37764..9b0b4de7 100644
--- a/xml/page_catalog_group_milk.skt
+++ b/xml/page_catalog_group_milk.skt
@@ -6,7 +6,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml
index a8185f22..7772a7fc 100644
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
@@ -4,7 +4,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
@@ -140,6 +140,16 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
;DEBUGVAR ICE_PROCESS_STATUS
@@ -219,14 +229,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_group_other.skt b/xml/page_catalog_group_other.skt
index 8470dd67..e4925a19 100644
--- a/xml/page_catalog_group_other.skt
+++ b/xml/page_catalog_group_other.skt
@@ -6,7 +6,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml
index 0ba5b2ce..56c87a4a 100644
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@@ -4,7 +4,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
@@ -138,6 +138,16 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
;DEBUGVAR ICE_PROCESS_STATUS
@@ -217,14 +227,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt
index ef0a93dd..6968f154 100644
--- a/xml/page_catalog_group_recommend.skt
+++ b/xml/page_catalog_group_recommend.skt
@@ -6,7 +6,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 84481f1b..7d884971 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -4,7 +4,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
@@ -140,6 +140,16 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
;DEBUGVAR ICE_PROCESS_STATUS
@@ -219,14 +229,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
@@ -872,10 +882,10 @@ PLANT PROTEIN"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "TAIWANESE TEA"
- Var NameDrinkTH = "ชาไต้หวัน"
- Var DrinkDescriptionTH = "ชาไต้หวัน น้ำ มะนาว "
- Var DrinkDescription = "Taiwan tea, Water, and Ice"
+ Var NameDrink = "OOLONG TEA"
+ Var NameDrinkTH = "ชาอู่หลง "
+ Var DrinkDescriptionTH = "ชาอู่หลงไต้หวัน น้ำ มะนาว "
+ Var DrinkDescription = "Taiwan oolong tea, Water, and Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_oolong_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0031.Price
@@ -932,7 +942,7 @@ PLANT PROTEIN"
KanitMediumTTF
0x322B26
showthaiText
- "ชาไต้หวัน"
+ "ชาอู่หลง "
16
@@ -942,7 +952,7 @@ PLANT PROTEIN"
KanitMediumTTF
0x6F5F51
showthaiText
- "ชาไต้หวัน น้ำ มะนาว
+ "ชาอู่หลงไต้หวัน น้ำ มะนาว
"
@@ -954,7 +964,7 @@ PLANT PROTEIN"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE TEA"
+ "OOLONG TEA"
16
@@ -964,7 +974,7 @@ PLANT PROTEIN"
KanitMediumTTF
0x6F5F51
showengText
- "Taiwan tea, Water, and Ice"
+ "Taiwan oolong tea, Water, and Ice"
16
@@ -1073,10 +1083,10 @@ PLANT PROTEIN"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "TAIWANESE LIMENADE TEA"
- Var NameDrinkTH = "ชาไต้หวันมะนาว"
- Var DrinkDescriptionTH = "ชาไต้หวัน น้ำ มะนาว "
- Var DrinkDescription = "Taiwan tea, Limenade, Water, and Ice"
+ Var NameDrink = "OOLONG LIMENADE"
+ Var NameDrinkTH = "ชาอู่หลงมะนาว"
+ Var DrinkDescriptionTH = "ชาอู่หลงไต้หวัน น้ำ มะนาว "
+ Var DrinkDescription = "Taiwan oolong tea, Limenade, Water, and Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Oolong_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0032.Price
@@ -1133,7 +1143,7 @@ PLANT PROTEIN"
KanitMediumTTF
0x322B26
showthaiText
- "ชาไต้หวันมะนาว"
+ "ชาอู่หลงมะนาว"
16
@@ -1143,7 +1153,7 @@ PLANT PROTEIN"
KanitMediumTTF
0x6F5F51
showthaiText
- "ชาไต้หวัน น้ำ มะนาว
+ "ชาอู่หลงไต้หวัน น้ำ มะนาว
"
@@ -1155,8 +1165,8 @@ PLANT PROTEIN"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE
-LIMENADE TEA"
+ "OOLONG
+LIMENADE"
16
@@ -1166,7 +1176,7 @@ LIMENADE TEA"
KanitMediumTTF
0x6F5F51
showengText
- "Taiwan tea, Limenade,
+ "Taiwan oolong tea, Limenade,
Water, and Ice"
diff --git a/xml/page_catalog_group_tea.skt b/xml/page_catalog_group_tea.skt
index 6b1d2435..cf6398ec 100644
--- a/xml/page_catalog_group_tea.skt
+++ b/xml/page_catalog_group_tea.skt
@@ -7,7 +7,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml
index e548fa05..051096cf 100644
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@@ -4,7 +4,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
@@ -140,6 +140,16 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
;DEBUGVAR ICE_PROCESS_STATUS
@@ -219,14 +229,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_group_whey.skt b/xml/page_catalog_group_whey.skt
index 530a21ec..177c9c93 100644
--- a/xml/page_catalog_group_whey.skt
+++ b/xml/page_catalog_group_whey.skt
@@ -7,7 +7,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml
index 7986ca0c..6637bacf 100644
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@@ -4,7 +4,7 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
; On open
@@ -153,6 +153,16 @@
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
1000
;DEBUGVAR ICE_PROCESS_STATUS
@@ -232,14 +242,14 @@
; "ROOT/taobin_project/image/ad_medium_2.png"
;
-
+;
; under line
diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml
index 59c16b66..38504cf7 100644
--- a/xml/page_catalog_with_vending.xml
+++ b/xml/page_catalog_with_vending.xml
@@ -258,6 +258,8 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
; eng
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
@@ -290,6 +292,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
@@ -307,6 +310,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
@@ -323,6 +327,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
@@ -343,6 +348,7 @@
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
@@ -360,6 +366,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
@@ -377,6 +384,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index 73ec026d..a9525f76 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -300,6 +300,7 @@
Else
Var buttonRemoveCup = "Enable"
+ Var txtDrinkOKState = "Enable"
EndIf
EndIf
EndIf
@@ -312,6 +313,7 @@
Else
Var buttonRemoveCup = "Enable"
+ Var txtDrinkOKState = "Enable"
EndIf
EndIf
EndIf
@@ -334,6 +336,7 @@
Else
Var buttonRemoveCup = "Enable"
+ Var txtDrinkOKState = "Enable"
EndIf
EndIf
EndIf
@@ -346,6 +349,7 @@
Else
Var buttonRemoveCup = "Enable"
+ Var txtDrinkOKState = "Enable"
EndIf
EndIf
EndIf
@@ -406,6 +410,7 @@
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
Else
Var buttonRemoveCup = "Enable"
+ Var txtDrinkOKState = "Enable"
Var Timeout2 = Timeout2 + 1
@@ -418,6 +423,7 @@
Else
Var buttonRemoveCup = "Enable"
+ Var txtDrinkOKState = "Enable"
Var Timeout2 = Timeout2 + 1
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index fed8282e..4fe39b9c 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -577,6 +577,7 @@
1000
If ReadyForBrew = "false" Then
+ SAVELOG "Back to main1"
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml
index 90802c35..1912cc57 100644
--- a/xml/page_show_error.xml
+++ b/xml/page_show_error.xml
@@ -135,6 +135,8 @@
DEBUGVAR DoorCupPosition
DEBUGVAR MachineStage
+ Var EmergencyStop = "-"
+
If EmergencyStop = "true" Then
If DoorCupPosition = "bottom" Then
; It normal
@@ -149,7 +151,9 @@
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
DEBUGVAR MachineStage
- If NETCORE_LOST_CNT = 0 Then
+ If NETCORE_LOST_CNT > 0 Then
+
+ Else
If MachineStage = "show-menu" Then
Var LEDSet = "false"
diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml
index a11f7d32..be29fc4b 100644
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@@ -2,9 +2,11 @@
"Enable"
1080
1920
- "0xeae6e1"
+; "0xeae6e1"
SoundVolume
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+
Var y_topping_bg = 912
WEB "DISABLE"
@@ -263,12 +265,13 @@
If Timeout > 40 Then
Var Timeout = 0
If Seeker = "next" Then
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
-
- ;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+
EndIf
If MultiPayEnable = "true" Then
@@ -286,7 +289,6 @@
Else
Var EmergencyStop = "true"
- ;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
@@ -370,14 +372,26 @@
-
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+;
+
; back
@@ -868,6 +887,7 @@
Topping "Select" SelectDrink
; Pack
Topping "Pack" ExtendData
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
@@ -888,12 +908,17 @@
;Var BugFlag = 1
If CartUpdate = "true" Then
Var CartUpdate = "-"
+
+
If CART_COUNT = 3 Then
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
Else
If ButtonNext = "true" Then
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
Else
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
EndIf
@@ -1875,8 +1900,10 @@
If Seeker = "next" Then
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
@@ -2062,6 +2089,7 @@
Var Seeker.showname = showname
If CART_COUNT = 0 Then
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
Else