diff --git a/xml/page_board.xml b/xml/page_board.xml
index d014d554..79d9a14b 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -627,7 +627,8 @@
Var countClick = 0
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
- OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_free.xml"
+ ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_collect_point_1.xml"
+ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_tel_number_mask.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 39d2b590..ae51ca32 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -1,262 +1,265 @@
-
- "Enable"
- 1080
- 1920
- "0xeae6e1"
- SoundVolume
-
- ; On open
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
- Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
-
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- 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"
- EndIf
-
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "PressForever"
- Var Menu4Selected = "Enable"
- Var Menu5Selected = "Invisible"
- Var Menu6Selected = "Enable"
- Var Menu7Selected = "Enable"
- Var Menu8Selected = "Invisible"
-
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
- Var Timeout = 0
-
-
-
-
-
- 1000
-
- If NextPage = "-" Then
-
- Else
- If CupOnArm = "true" Then
- If Timeout > 9 Then
- Open NextPage
- EndIf
- Else
- If Timeout > 30 Then
- Open NextPage
- EndIf
- EndIf
- EndIf
-
- If Timeout > 60 Then
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
- EndIf
-
- If BrewCommand = "RefreshAll" Then
- Var BrewCommand = "-"
- Open CurrentXMLFileName2
- EndIf
-
- Var Timeout = Timeout + 1
- TimerReset
-
-
-
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-; obselete
-;
-
-
-
-
-
-
+
+
+
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+
+ ; On open
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ 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"
+ EndIf
+
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "PressForever"
+ Var Menu4Selected = "Enable"
+ Var Menu5Selected = "Invisible"
+ Var Menu6Selected = "Enable"
+ Var Menu7Selected = "Enable"
+ Var Menu8Selected = "Invisible"
+
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+ Var Timeout = 0
+
+
+
+
+
+ 1000
+
+ If NextPage = "-" Then
+
+ Else
+ If CupOnArm = "true" Then
+ If Timeout > 9 Then
+ Open NextPage
+ EndIf
+ Else
+ If Timeout > 30 Then
+ Open NextPage
+ EndIf
+ EndIf
+ EndIf
+
+ If Timeout > 60 Then
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ EndIf
+
+ If BrewCommand = "RefreshAll" Then
+ Var BrewCommand = "-"
+ Open CurrentXMLFileName2
+ EndIf
+
+ Var Timeout = Timeout + 1
+ TimerReset
+
+
+
+;
+; 0
+; 0
+; "ROOT/taobin_project/image/ad_medium_2.png"
+;
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+; obselete
+;
+
+
+
+
+
+
10
497
@@ -360,12 +363,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0001.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0001.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -466,12 +469,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0002.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0002.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -572,12 +575,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0020.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0020.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -678,12 +681,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0003.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0003.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -784,12 +787,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0004.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0004.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -890,12 +893,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0006.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0006.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -996,12 +999,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0021.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0021.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1102,12 +1105,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0007.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0007.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1208,12 +1211,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0008.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0008.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1314,12 +1317,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0019.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0019.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1420,12 +1423,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0009.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0009.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1526,12 +1529,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0022.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0022.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1632,12 +1635,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0010.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0010.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1738,12 +1741,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0011.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0011.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1844,12 +1847,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0012.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0012.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -1950,12 +1953,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-01-0017.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-01-0017.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2056,12 +2059,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0020.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0020.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2162,12 +2165,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2268,12 +2271,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2374,12 +2377,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0003.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0003.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2480,12 +2483,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2586,12 +2589,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0005.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0005.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2692,12 +2695,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0006.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0006.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2798,12 +2801,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -2904,12 +2907,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -3010,12 +3013,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0019.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0019.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -3116,12 +3119,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0009.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0009.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -3222,12 +3225,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0022.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0022.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -3328,12 +3331,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0010.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0010.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -3434,12 +3437,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0011.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0011.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -3540,12 +3543,12 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-02-02-0012.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-02-02-0012.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
@@ -3646,34 +3649,21 @@
2
2
- eval( STRCONTAIN "Smoothie" $12-05-02-0027.Button SmoRet
- If SmoRet = "true" Then
- Var return = "Enable"
- Else
- Var return = "Invisible"
- EndIf
+ eval( STRCONTAIN "Smoothie" $12-05-02-0027.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
)
"ROOT/taobin_project/image/topping2/blender_icon.png"
-
-
-
-; Cart
-
-
-
-
+
+
+
+
+
+
+
diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index 651533e6..e0131f2b 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -72,9 +72,19 @@
Var Timeout = Timeout + 1
If Timeout > 20 Then
+
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
+ If Timeout = 18 Then
+ Var date_time_str = ""
+ STRDATETIME date_time_str
+ Var date_time_str = "/mnt/sdcard/scn_" + date_time_str
+ Var date_time_str = date_time_str + ".png"
+ DEBUGVAR date_time_str
+ SCREEN_CAP date_time_str
+ EndIf
+
TimerReset
Refresh
diff --git a/xml/page_tel_number_mask.xml b/xml/page_tel_number_mask.xml
index b6ac2714..7eaf81be 100644
--- a/xml/page_tel_number_mask.xml
+++ b/xml/page_tel_number_mask.xml
@@ -149,36 +149,12 @@
"ROOT/sounds/codebuttom.wav"
SoundVolume
- Var Timeout = 0
- StrLen TelephoneNumber TelNumLen
- If TelNumLen < 10 Then
- Var TelephoneNumber = TelephoneNumber + "8"
- Var ShowTextNumber = "Invisible"
- Trim TelephoneNumber 10
- TimerReset
- Refresh
- StrLen TelephoneNumber TelNumLen
- If TelNumLen >= 10 Then
- Var Tel_Confirm_State = "Enable"
- EndIf
- Var ShowErrorText = "Invisible"
-
- If TelNumLen = 7 Then
- Var number7 = "8"
- EndIf
-
- If TelNumLen = 8 Then
- Var number8 = "8"
- EndIf
-
- If TelNumLen = 9 Then
- Var number9 = "8"
- EndIf
-
- If TelNumLen = 10 Then
- Var number10 = "8"
- EndIf
- EndIf
+ Var date_time_str = ""
+ STRDATETIME date_time_str
+ Var date_time_str = "/mnt/sdcard/scn_" + date_time_str
+ Var date_time_str = date_time_str + ".png"
+ DEBUGVAR date_time_str
+ SCREEN_CAP date_time_str
diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml
index 66a0510f..b5ca691c 100644
--- a/xml/page_topping_select3.xml
+++ b/xml/page_topping_select3.xml
@@ -299,17 +299,20 @@
DEBUGVAR toppingID3price2
DEBUGVAR BrewParam
-
- Var SugarState1 = "Enable"
- Var SugarState2 = "Enable"
- Var SugarState3 = "Enable"
- Var SugarState4 = "Enable"
- Var SugarState5 = "Enable"
-
-
If BugFlag = 1 Then
Else
+
+
+ Var SugarState1 = "Enable"
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "Enable"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "Enable"
+
+
+
+
STRCONTAIN "9701" BrewParam IgnoreLidStraw
DEBUGVAR BrewParam
@@ -864,6 +867,8 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ DEBUGVAR SugarState1
+
If ShiftSugarStep = 1 Then
Var SugarState1 = "PressForever"
@@ -1321,7 +1326,11 @@
Else
Var LidState = "Press"
EndIf
+
+
+ DEBUGVAR SugarState1
Refresh
+
@@ -1597,8 +1606,8 @@
SAVELOG PriceDrinkTmp
+
Var Timeout = 0
- Refresh
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 10c08baf..1b934aab 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -95,7 +95,7 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "5.71"
+ Var XMLPageVersion = "5.73"