diff --git a/animation01/Taobin_empty.mp4 b/animation01/Taobin_empty.mp4 new file mode 100644 index 00000000..0d166889 Binary files /dev/null and b/animation01/Taobin_empty.mp4 differ diff --git a/animation01/Taobin_pause_art41.mp4 b/animation01/Taobin_pause_art41.mp4 new file mode 100644 index 00000000..6a5da2a1 Binary files /dev/null and b/animation01/Taobin_pause_art41.mp4 differ diff --git a/image/page_help_center/Group.png b/image/page_help_center/Group.png new file mode 100644 index 00000000..8aaa2ac9 Binary files /dev/null and b/image/page_help_center/Group.png differ diff --git a/image/page_help_center/bn_0.png b/image/page_help_center/bn_0.png new file mode 100644 index 00000000..1f9a01eb Binary files /dev/null and b/image/page_help_center/bn_0.png differ diff --git a/image/page_help_center/bn_1.png b/image/page_help_center/bn_1.png new file mode 100644 index 00000000..d5d5c68a Binary files /dev/null and b/image/page_help_center/bn_1.png differ diff --git a/image/page_help_center/bn_2.png b/image/page_help_center/bn_2.png new file mode 100644 index 00000000..6759f7aa Binary files /dev/null and b/image/page_help_center/bn_2.png differ diff --git a/image/page_help_center/bn_3.png b/image/page_help_center/bn_3.png new file mode 100644 index 00000000..c83aefe4 Binary files /dev/null and b/image/page_help_center/bn_3.png differ diff --git a/image/page_help_center/bn_4.png b/image/page_help_center/bn_4.png new file mode 100644 index 00000000..e905b7a7 Binary files /dev/null and b/image/page_help_center/bn_4.png differ diff --git a/image/page_help_center/bn_5.png b/image/page_help_center/bn_5.png new file mode 100644 index 00000000..c5ca4def Binary files /dev/null and b/image/page_help_center/bn_5.png differ diff --git a/image/page_help_center/bn_6.png b/image/page_help_center/bn_6.png new file mode 100644 index 00000000..fcb10901 Binary files /dev/null and b/image/page_help_center/bn_6.png differ diff --git a/image/page_help_center/bn_7.png b/image/page_help_center/bn_7.png new file mode 100644 index 00000000..729c73c7 Binary files /dev/null and b/image/page_help_center/bn_7.png differ diff --git a/image/page_help_center/bn_8.png b/image/page_help_center/bn_8.png new file mode 100644 index 00000000..5239883c Binary files /dev/null and b/image/page_help_center/bn_8.png differ diff --git a/image/page_help_center/bn_9.png b/image/page_help_center/bn_9.png new file mode 100644 index 00000000..8814ad66 Binary files /dev/null and b/image/page_help_center/bn_9.png differ diff --git a/image/page_help_center/bn_accept_help.png b/image/page_help_center/bn_accept_help.png new file mode 100644 index 00000000..6a004c58 Binary files /dev/null and b/image/page_help_center/bn_accept_help.png differ diff --git a/image/page_help_center/bn_back-1.png b/image/page_help_center/bn_back-1.png new file mode 100644 index 00000000..0807557b Binary files /dev/null and b/image/page_help_center/bn_back-1.png differ diff --git a/image/page_help_center/bn_back_to_help.png b/image/page_help_center/bn_back_to_help.png new file mode 100644 index 00000000..31626836 Binary files /dev/null and b/image/page_help_center/bn_back_to_help.png differ diff --git a/image/page_help_center/bn_next_help.png b/image/page_help_center/bn_next_help.png new file mode 100644 index 00000000..869ba52e Binary files /dev/null and b/image/page_help_center/bn_next_help.png differ diff --git a/image/page_help_center/bp_0.png b/image/page_help_center/bp_0.png new file mode 100644 index 00000000..59755e71 Binary files /dev/null and b/image/page_help_center/bp_0.png differ diff --git a/image/page_help_center/bp_1.png b/image/page_help_center/bp_1.png new file mode 100644 index 00000000..54b9f3e6 Binary files /dev/null and b/image/page_help_center/bp_1.png differ diff --git a/image/page_help_center/bp_2.png b/image/page_help_center/bp_2.png new file mode 100644 index 00000000..3c08c533 Binary files /dev/null and b/image/page_help_center/bp_2.png differ diff --git a/image/page_help_center/bp_3.png b/image/page_help_center/bp_3.png new file mode 100644 index 00000000..65e71f62 Binary files /dev/null and b/image/page_help_center/bp_3.png differ diff --git a/image/page_help_center/bp_4.png b/image/page_help_center/bp_4.png new file mode 100644 index 00000000..2a23b054 Binary files /dev/null and b/image/page_help_center/bp_4.png differ diff --git a/image/page_help_center/bp_5.png b/image/page_help_center/bp_5.png new file mode 100644 index 00000000..d2069529 Binary files /dev/null and b/image/page_help_center/bp_5.png differ diff --git a/image/page_help_center/bp_6.png b/image/page_help_center/bp_6.png new file mode 100644 index 00000000..7f2066b8 Binary files /dev/null and b/image/page_help_center/bp_6.png differ diff --git a/image/page_help_center/bp_7.png b/image/page_help_center/bp_7.png new file mode 100644 index 00000000..658d4416 Binary files /dev/null and b/image/page_help_center/bp_7.png differ diff --git a/image/page_help_center/bp_8.png b/image/page_help_center/bp_8.png new file mode 100644 index 00000000..69f93b01 Binary files /dev/null and b/image/page_help_center/bp_8.png differ diff --git a/image/page_help_center/bp_9.png b/image/page_help_center/bp_9.png new file mode 100644 index 00000000..b71fc059 Binary files /dev/null and b/image/page_help_center/bp_9.png differ diff --git a/image/page_help_center/bp_accept_help.png b/image/page_help_center/bp_accept_help.png new file mode 100644 index 00000000..31626836 Binary files /dev/null and b/image/page_help_center/bp_accept_help.png differ diff --git a/image/page_help_center/bp_back-1.png b/image/page_help_center/bp_back-1.png new file mode 100644 index 00000000..550285bc Binary files /dev/null and b/image/page_help_center/bp_back-1.png differ diff --git a/image/page_help_center/bp_back_to_help.png b/image/page_help_center/bp_back_to_help.png new file mode 100644 index 00000000..ddae1a66 Binary files /dev/null and b/image/page_help_center/bp_back_to_help.png differ diff --git a/image/page_help_center/bp_next_help.png b/image/page_help_center/bp_next_help.png new file mode 100644 index 00000000..71da6102 Binary files /dev/null and b/image/page_help_center/bp_next_help.png differ diff --git a/image/page_help_center/cb_checked_problem.png b/image/page_help_center/cb_checked_problem.png new file mode 100644 index 00000000..ade7ab5f Binary files /dev/null and b/image/page_help_center/cb_checked_problem.png differ diff --git a/image/page_help_center/cb_uncheck_problem.png b/image/page_help_center/cb_uncheck_problem.png new file mode 100644 index 00000000..cef140f5 Binary files /dev/null and b/image/page_help_center/cb_uncheck_problem.png differ diff --git a/image/page_help_center/help_lead.png b/image/page_help_center/help_lead.png new file mode 100644 index 00000000..5cc1de67 Binary files /dev/null and b/image/page_help_center/help_lead.png differ diff --git a/image/page_help_center/helper.png b/image/page_help_center/helper.png new file mode 100644 index 00000000..5e61a2da Binary files /dev/null and b/image/page_help_center/helper.png differ diff --git a/image/page_help_center/img3.png b/image/page_help_center/img3.png new file mode 100644 index 00000000..3fcbcc41 Binary files /dev/null and b/image/page_help_center/img3.png differ diff --git a/image/page_help_center/text15.png b/image/page_help_center/text15.png new file mode 100644 index 00000000..c00a9731 Binary files /dev/null and b/image/page_help_center/text15.png differ diff --git a/image/page_payment/helper.png b/image/page_payment/helper.png new file mode 100644 index 00000000..07b86b30 Binary files /dev/null and b/image/page_payment/helper.png differ diff --git a/image/smoothie/proccess/bd_get_blend.png b/image/smoothie/proccess/bd_get_blend.png new file mode 100644 index 00000000..aa1037d9 Binary files /dev/null and b/image/smoothie/proccess/bd_get_blend.png differ diff --git a/image/smoothie/proccess/bg_empty.png b/image/smoothie/proccess/bg_empty.png new file mode 100644 index 00000000..28da729f Binary files /dev/null and b/image/smoothie/proccess/bg_empty.png differ diff --git a/image/smoothie/proccess/bn_back_smoothie.png b/image/smoothie/proccess/bn_back_smoothie.png new file mode 100644 index 00000000..61d3725b Binary files /dev/null and b/image/smoothie/proccess/bn_back_smoothie.png differ diff --git a/image/smoothie/proccess/bn_cancel_smoothie.png b/image/smoothie/proccess/bn_cancel_smoothie.png new file mode 100644 index 00000000..71da6102 Binary files /dev/null and b/image/smoothie/proccess/bn_cancel_smoothie.png differ diff --git a/image/smoothie/proccess/bn_cancel_smoothie_2.png b/image/smoothie/proccess/bn_cancel_smoothie_2.png new file mode 100644 index 00000000..869ba52e Binary files /dev/null and b/image/smoothie/proccess/bn_cancel_smoothie_2.png differ diff --git a/image/smoothie/proccess/bn_get_blend.png b/image/smoothie/proccess/bn_get_blend.png new file mode 100644 index 00000000..2700e645 Binary files /dev/null and b/image/smoothie/proccess/bn_get_blend.png differ diff --git a/image/smoothie/proccess/bp_back_smoothie.png b/image/smoothie/proccess/bp_back_smoothie.png new file mode 100644 index 00000000..a2ee36b1 Binary files /dev/null and b/image/smoothie/proccess/bp_back_smoothie.png differ diff --git a/image/smoothie/proccess/bp_cancel_smoothie.png b/image/smoothie/proccess/bp_cancel_smoothie.png new file mode 100644 index 00000000..86fb9c3e Binary files /dev/null and b/image/smoothie/proccess/bp_cancel_smoothie.png differ diff --git a/image/smoothie/proccess/bp_get_blend.png b/image/smoothie/proccess/bp_get_blend.png new file mode 100644 index 00000000..f31fd8e1 Binary files /dev/null and b/image/smoothie/proccess/bp_get_blend.png differ diff --git a/image/smoothie/proccess/clock.png b/image/smoothie/proccess/clock.png new file mode 100644 index 00000000..1e918b05 Binary files /dev/null and b/image/smoothie/proccess/clock.png differ diff --git a/image/smoothie/proccess/hand_point.png b/image/smoothie/proccess/hand_point.png new file mode 100644 index 00000000..1f8f3f70 Binary files /dev/null and b/image/smoothie/proccess/hand_point.png differ diff --git a/image/smoothie/proccess/second.png b/image/smoothie/proccess/second.png new file mode 100644 index 00000000..7366ce2c Binary files /dev/null and b/image/smoothie/proccess/second.png differ diff --git a/image/smoothie/proccess/tao_sad.png b/image/smoothie/proccess/tao_sad.png new file mode 100644 index 00000000..0ce49868 Binary files /dev/null and b/image/smoothie/proccess/tao_sad.png differ diff --git a/image/topping_inter/bn_next2.png b/image/topping_inter/bn_next2.png new file mode 100644 index 00000000..92d11a0a Binary files /dev/null and b/image/topping_inter/bn_next2.png differ diff --git a/image/topping_inter/bp_next2.png b/image/topping_inter/bp_next2.png new file mode 100644 index 00000000..64f4bd39 Binary files /dev/null and b/image/topping_inter/bp_next2.png differ diff --git a/image/topping_inter/time.png b/image/topping_inter/time.png new file mode 100644 index 00000000..59cbcc36 Binary files /dev/null and b/image/topping_inter/time.png differ diff --git a/inter/tha/configure.ev b/inter/tha/configure.ev index 5398d90f..14c47088 100644 --- a/inter/tha/configure.ev +++ b/inter/tha/configure.ev @@ -30,6 +30,13 @@ Var EnableMultiInstanceFromBoxID = 1 EndIf +<<<<<<< HEAD + If BoxID = 210699 Then + Var EnableMultiInstanceFromBoxID = 1 + EndIf + + +======= If BoxID = 174565 Then Var EnableMultiInstanceFromBoxID = 1 EndIf @@ -37,4 +44,5 @@ If BoxID = 173319 Then Var EnableMultiInstanceFromBoxID = 0 - EndIf \ No newline at end of file + EndIf +>>>>>>> 6467e5f893ec61fc1c783c5b4e790ea2d74d664c diff --git a/inter/tha/video/script_thank.ev b/inter/tha/video/script_thank.ev index 08b82822..238fb196 100644 --- a/inter/tha/video/script_thank.ev +++ b/inter/tha/video/script_thank.ev @@ -14,10 +14,10 @@ Else Var video_file_name = video_file_name + ".mp4" If EventTurnOn = 1 Then - GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize + GetFileSizeK "taobin_project/inter/tha/video/taobin_thank1_event.mp4" MainfileSize DEBUGVAR MainfileSize If MainfileSize = 6749397 Then - Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4" + Var video_file_name = "ROOT/taobin_project/inter/tha/video/taobin_thank1_event.mp4" EndIf EndIf EndIf diff --git a/inter/tha/xml/helper_show_and_refresh.lxml b/inter/tha/xml/helper_show_and_refresh.lxml new file mode 100644 index 00000000..fc5ebb0d --- /dev/null +++ b/inter/tha/xml/helper_show_and_refresh.lxml @@ -0,0 +1,2 @@ +OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" +RootLayoutVisible 15 "show" \ No newline at end of file diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev index c3a65eb7..877c5118 100644 --- a/inter/tha/xml/multi/control_and_lang_swith.ev +++ b/inter/tha/xml/multi/control_and_lang_swith.ev @@ -53,7 +53,7 @@ If MenuKidButtonState = "Enable" Then EndIf -If CocktailShow = "true" Then +If CocktailShow = "true" Then OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_cocktail.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/health.ev" Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "/page_catalog_group_cocktail.lxml" @@ -78,10 +78,13 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr +Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" +Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" +Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" + Var InstanceTabOpenFile14 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" -Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" - +Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" TabMenuVisibleInst 99 @@ -89,10 +92,10 @@ TabMenuVisibleInst 99 DEBUGVAR Not#CountDownForMulti -DEBUGVAR InstanceTabOpenFile2 +DEBUGVAR InstanceTabOpenFile2 DEBUGVAR InstanceTabOpenFile3 DEBUGVAR InstanceTabOpenFile4 -DEBUGVAR InstanceTabOpenFile5 +DEBUGVAR InstanceTabOpenFile5 DEBUGVAR InstanceTabOpenFile6 DEBUGVAR InstanceTabOpenFile7 @@ -107,10 +110,10 @@ DEBUGVAR CocktailShow Var ButtonLanguageListXPosition = 990 Var ButtonLanguageListYPosition = 450 - 38 - + Var CatalogLayoutV3Loaded = 1 -LanguageShow = "ENG" \ No newline at end of file +LanguageShow = "ENG" diff --git a/inter/tha/xml/multi/menu_catalog_default_init.lxml b/inter/tha/xml/multi/menu_catalog_default_init.lxml index 19aaf6a9..b5122ff0 100644 --- a/inter/tha/xml/multi/menu_catalog_default_init.lxml +++ b/inter/tha/xml/multi/menu_catalog_default_init.lxml @@ -159,6 +159,7 @@ If SpiralModeFrozenFruit = 1 Then Var Menu0Selected = "Enable" + Var MenuVSelected2 = "Invisible" EndIf If SpiralModeGoods = 1 Then diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index 5c6780c7..ffd72c3f 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -12,6 +12,9 @@ TopView "show" ; On open + ; helper + RootLayoutVisible 15 "hide" + Machine WakeUp ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" @@ -35,6 +38,8 @@ SAVELOG "======================================= RefreshAll Languages ================================" EndIf + Var BaseOnPageBoard = 0 + Var NextPage = "-" Var Seeker.thankLidFlag = 0 @@ -257,7 +262,12 @@ ; setvar SpiralOnline true Var ButtonSpiralStage = "Invisible" If SpiralOnline = "true" Then - Var ButtonSpiralStage = "Enable" + If SpiralModeFrozenFruit = 1 Then + Var ButtonFrozenSmoothie = "Enable + Var ButtonSpiralStage = "Invisible" + Else + Var ButtonSpiralStage = "Enable" + EndIf EndIf diff --git a/inter/tha/xml/multi/tab_menu.lxml b/inter/tha/xml/multi/tab_menu.lxml index 1eadf4d8..d84f68b6 100644 --- a/inter/tha/xml/multi/tab_menu.lxml +++ b/inter/tha/xml/multi/tab_menu.lxml @@ -15,12 +15,12 @@ Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_v2/" EndIf - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var show_eng = "true" Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var DirImage2 = "ROOT/taobin_project/inter/tha/image/drink_option_msc/" Var DirImageAlter = "ROOT/taobin_project/inter/tha/image/page3_2_msc/" EndIf @@ -35,10 +35,26 @@ DEBUGVAR Menu1Selected + If SpiralOnline = "true" Then + If Seeker = "curr" Then + If SpiralModeFrozenFruit = 1 Then + If Menu0Selected = "PressForever" Then + + Else + Var Menu0Selected = "Enable" + EndIf + + Var MenuVSelected2 = "Invisible" + EndIf + + EndIf + EndIf + DEBUGVAR Menu0Selected + 10000 - + TimerReset @@ -65,7 +81,7 @@ SoundVolume Var NextPage = "-" - TabMenuVisibleInst 9 + TabMenuVisibleInst 9 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -83,11 +99,11 @@ Var NextPage = "-" Var OpenFromMulti = 1 Var OpenFromPageBoard = 1 - - - + + + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev" - + @@ -102,7 +118,7 @@ SoundVolume Var NextPage = "-" - TabMenuVisibleInst 2 + TabMenuVisibleInst 2 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -116,10 +132,10 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - TabMenuVisibleInst 3 + TabMenuVisibleInst 3 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -223,7 +239,7 @@ Var( DirImageAlter + "/bp_Pepsi_7up.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" TabMenuVisibleInst 8 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" @@ -267,4 +283,3 @@ - diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml index 48af6df2..154b4bbd 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml @@ -14,10 +14,10 @@ - ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml" - - Var Menu0Selected = "PressForever" + ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml" + Var Menu0Selected = "PressForever" + SAVELOG " Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected" Var Timeout = 0 ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml" @@ -44,15 +44,15 @@ Else Var ice_tab_process_show = "Invisible" EndIf - + GetVisible inst_show_frozen_fruit - + If inst_show_frozen_fruit = 1 Then If inst_show_frozen_fruit_counter > 0 Then DEBUGVAR inst_show_frozen_fruit_counter - + Var inst_show_frozen_fruit_counter = inst_show_frozen_fruit_counter - 1 If inst_show_frozen_fruit_counter = 0 Then @@ -61,7 +61,7 @@ EndIf EndIf EndIf - + @@ -70,7 +70,7 @@ Var RefreshFrozenFruitMenu = 0 SAVELOG "OPEN FROM 3" Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml" - EndIf + EndIf ; setvarint ScriptFrozenMenu 1 If ScriptFrozenMenu = 1 Then diff --git a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt index 939db724..b3863c19 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt @@ -1,5 +1,5 @@ - @@ -16,10 +16,10 @@ - ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml" - - Var Menu0Selected = "PressForever" + ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml" + Var Menu0Selected = "PressForever" + SAVELOG " Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected Menu0Selected" Var Timeout = 0 ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml" @@ -46,15 +46,15 @@ Else Var ice_tab_process_show = "Invisible" EndIf - + GetVisible inst_show_frozen_fruit - + If inst_show_frozen_fruit = 1 Then If inst_show_frozen_fruit_counter > 0 Then DEBUGVAR inst_show_frozen_fruit_counter - + Var inst_show_frozen_fruit_counter = inst_show_frozen_fruit_counter - 1 If inst_show_frozen_fruit_counter = 0 Then @@ -63,7 +63,7 @@ EndIf EndIf EndIf - + @@ -72,7 +72,7 @@ Var RefreshFrozenFruitMenu = 0 SAVELOG "OPEN FROM 3" Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml" - EndIf + EndIf ; setvarint ScriptFrozenMenu 1 If ScriptFrozenMenu = 1 Then @@ -96,7 +96,7 @@ - diff --git a/inter/tha/xml/page_help_center.lxml b/inter/tha/xml/page_help_center.lxml new file mode 100644 index 00000000..272d3eda --- /dev/null +++ b/inter/tha/xml/page_help_center.lxml @@ -0,0 +1,737 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= Help Center ================================" + + RootLayoutVisible 3 "show" + RootLayoutVisible 13 "hide" + + ; helper + RootLayoutVisible 15 "show" + + DEBUGVAR FromPaymentCash + DEBUGVAR FromSmoothieProcess + DEBUGVAR FromBrewingProcess + + Var show_btn_next_help = "Invisible" + + Var Problem_Cash_State[0] = "Enable" + Var Problem_Cash_State[1] = "Enable" + Var Problem_Cash_State[2] = "Enable" + + Var Problem_Brewing_State[0] = "Enable" + Var Problem_Brewing_State[1] = "Enable" + Var Problem_Brewing_State[2] = "Enable" + Var Problem_Brewing_State[3] = "Enable" + Var Problem_Brewing_State[4] = "Enable" + Var Problem_Brewing_State[5] = "Enable" + Var Problem_Brewing_State[6] = "Enable" + Var Problem_Brewing_State[7] = "Enable" + Var Problem_Brewing_State[8] = "Enable" + + Var Problem_Process_State[0] = "Enable" + Var Problem_Process_State[1] = "Enable" + + Var Timeout = 0 + + + + 1000 + + DEBUGVAR Timeout + + If Timeout > 120 Then + SAVELOG "Timeout" + + If BaseOnPageBoard = 1 Then + Var BaseOnPageBoard = 0 + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + Else + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + EndIf + + EndIf + Var Timeout = Timeout + 1 + + Refresh + TimerReset + + + + DEBUGVAR LanguageShow + + ;inter-image + If LanguageShow = "ENG" Then + + EndIf + + If LanguageShow = "THAI" Then + + EndIf + + If LanguageShow = "MYANMAR" Then + + EndIf + + + If LanguageShow = "MSC" Then + + EndIf + + Var ButtonLanguageCurrentXPosition = 1015 + Var ButtonLanguageCurrentYPosition = 458 - 38 + + Var ButtonLanguageListXPosition = 990 + Var ButtonLanguageListYPosition = 450 - 38 + If FromPaymentCash = "Enable" Then + Var LanguageButtonEnable = "Invisible" + Else + Var LanguageButtonEnable = "Enable" + EndIf + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + +;include="ROOT/taobin_project/inc/video.inc" + + +; back + + + + 300 + 420 + 500 + 72 + + 002300 + + + + + 115 + 550 + 500 + 46 + + 002299 + + + + + 110 + 620 + 1080 + 1080 + 1080 + "Vertical" + 1 + + + "Enable" + 1080 + "auto" + 20 + + + 986 + "auto" + "vertical" + "Enable" + +;for FromPaymentCash + + 986 + "auto" + FromPaymentCash + + + + + + + + + 100 + 0 + 500 + 75 + Problem_Cash_State[0] + + 002301 + + + + + 100 + 100 + 500 + 75 + Problem_Cash_State[1] + + 002302 + + + + + 100 + 200 + 500 + 75 + Problem_Cash_State[2] + + 002303 + + + + + +; for FromBrewingProcess + + 986 + "auto" + FromBrewingProcess + + + + + + + + + + + + + + + + + + + + + 100 + 0 + 500 + 75 + Problem_Brewing_State[0] + + 002304 + + + + + 100 + 100 + 500 + 75 + Problem_Brewing_State[1] + + 002305 + + + + + 100 + 200 + 500 + 75 + Problem_Brewing_State[2] + + 002306 + + + + + 100 + 300 + 500 + 75 + Problem_Brewing_State[3] + + 002307 + + + + + 100 + 400 + 500 + 75 + Problem_Brewing_State[4] + + 002308 + + + + + 100 + 500 + 500 + 75 + Problem_Brewing_State[5] + + 002309 + + + + + 100 + 600 + 500 + 75 + Problem_Brewing_State[6] + + 002310 + + + + + 100 + 700 + 500 + 75 + Problem_Brewing_State[7] + + 002311 + + + + + 100 + 800 + 500 + 75 + Problem_Brewing_State[8] + + 002303 + + + + +; FromSmoothieProcess + + 986 + "auto" + FromSmoothieProcess + + + + + + + 100 + 0 + 500 + 75 + Problem_Process_State[0] + + 002312 + + + + + 100 + 100 + 500 + 75 + Problem_Process_State[1] + + 002303 + + + + + + + + + + + +; next + + + 300 + 1715 + show_btn_next_help + 500 + 75 + + 0 + 0 + 002350 + + + + + + + + diff --git a/inter/tha/xml/page_help_center_sending.lxml b/inter/tha/xml/page_help_center_sending.lxml new file mode 100644 index 00000000..8ba46d95 --- /dev/null +++ b/inter/tha/xml/page_help_center_sending.lxml @@ -0,0 +1,558 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= Help Center ================================" + + RootLayoutVisible 3 "show" + + Var Timeout = 0 + + Var TelephoneNumber = "" + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + Var Tel_Confirm_State = "Invisible" + + + 1000 + + DEBUGVAR Timeout + SAVELOG MachineStage + + Var Timeout = Timeout + 1 + + If Timeout > 300 Then + + If MachineStage = "remove-cup" Then + Open "ROOT/taobin_project/xml/page_drinkfail3.xml" + Else + If NextOrder = "true" Then + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + EndIf + EndIf + EndIf + + TimerReset + + + + DEBUGVAR LanguageShow + + ;inter-image + If LanguageShow = "ENG" Then + + EndIf + + If LanguageShow = "THAI" Then + + EndIf + + If LanguageShow = "MYANMAR" Then + + EndIf + + + If LanguageShow = "MSC" Then + + EndIf + + + Var ButtonLanguageCurrentXPosition = 1015 + Var ButtonLanguageCurrentYPosition = 458 - 38 + + Var ButtonLanguageListXPosition = 990 + Var ButtonLanguageListYPosition = 450 - 38 + If FromPaymentCash = "Enable" Then + Var LanguageButtonEnable = "Invisible" + Else + Var LanguageButtonEnable = "Enable" + EndIf + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + +;include="ROOT/taobin_project/inc/video.inc" + +; back + + + + 300 + 420 + 500 + 72 + + 002300 + + + +; helper + + 440 + 552 + 210 + 311 + "ROOT/taobin_project/image/page_help_center/helper.png" + + + + 0 + 900 + + 002353 + + + + + 257 + 1035 + "ROOT/taobin_project/image/page_help_center/img3.png" + + + + 399 + 1080 + ShowTextNumber + "Enable" + "ROOT/taobin_project/image/page_help_center/text15.png" + + + + 298 + 1055 + ShowTextNumber + "Enable" + "ROOT/taobin_project/image/page_help_center/Group.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1060 + 1080 + Center + 48 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber + Telnum-mask-1 + + +; confirm next + + + 585 + 1765 + Tel_Confirm_State + 500 + 75 + + 0 + 0 + 002352 + + + + + + 115 + 1765 + 250 + 75 + + 0 + 0 + 002351 + + + + + + + + + diff --git a/inter/tha/xml/page_instance_empty.lxml b/inter/tha/xml/page_instance_empty.lxml new file mode 100644 index 00000000..cc89a786 --- /dev/null +++ b/inter/tha/xml/page_instance_empty.lxml @@ -0,0 +1,35 @@ + + 1080 + 1920 + + + + RootLayoutVisible 13 "hide" + + ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + Var Timeout = 0 + + + 1000 + + + DEBUGVAR Timeout + If Timeout > 66 Then + SAVELOG "Timeout" + + TabMenuVisibleInst 99 + + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + Var Timeout = Timeout + 1 + + TimerReset + + + diff --git a/inter/tha/xml/page_payment_pack_and_send.xml b/inter/tha/xml/page_payment_pack_and_send.xml index 359f0a7c..7e1ec57e 100644 --- a/inter/tha/xml/page_payment_pack_and_send.xml +++ b/inter/tha/xml/page_payment_pack_and_send.xml @@ -5,11 +5,11 @@ ; - ** topping. ; - TelephoneNumber ; - Market Code -; - +; - ; Set ; - Amount 0 baht -; +; "Enable" @@ -25,9 +25,8 @@ Var ProcessCupDebugText = "" Var TimeOutSmoothiesProcess = 1 - + Var OverrideVideoThankyou = 1 - Var IgnoreLidStrawAll = 1 Open "ROOT/taobin_project/xml/page_thankyou.xml" @@ -38,27 +37,15 @@ If TimeOutSmoothiesProcess > 0 Then Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 - + EndIf If TimeOutSmoothiesProcess = 0 Then Var OverrideVideoThankyou = 1 - Var IgnoreLidStrawAll = 1 - - Var ModeFreeEnable = 2 - Var PriceDrink = 30 - Var DiscountDrink = PriceDrink - Var StrawState = "Enable" - Var LidState = "Enable" - Var Seeker.get_a_straw = StrawState - Var Seeker.get_a_lid = LidState - Var Seeker.showname = " Smoothie " - Var Seeker.PictureDrink = "" - Var Seeker.CollectPointMain = 1 + MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf @@ -72,45 +59,46 @@ - - - 0 - 1337 - 1080 - 85 - Center - - 1201 - - +; +; 0 +; 1337 +; 1080 +; 85 +; Center +; + ; 1201 +; +; 0 - 1571 + 1451 1080 85 Center @@ -119,4 +107,23 @@ +; second time + + "Enable" + CountDown_x + 1540 + 72 + RobotoBold + 0xFFFFFF + TimeOutSmoothiesProcess + + + "Enable" + Second_x + 1560 + 52 + RobotoBold + 0xFFFFFF + "S" + diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index b8a4539e..6a7d9587 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -14,12 +14,16 @@ Machine WakeUp + RootLayoutVisible 3 "show" + ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" DEBUGVAR ToppingNewShow TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/ticket_time_blending.ev" + DEBUGVAR OpenFromPageBoard If OpenFromPageBoard = 1 Then Var OpenFromPageBoard = 0 @@ -52,26 +56,117 @@ Var ProcessCupDebugText = "" - Var TimeOutSmoothiesProcess = 120 - + + Var FromSmoothieProcess = "Enable" + Var FromPaymentCash = "Invisible" + Var FromBrewingProcess = "Invisible" + + Var TimeOutHandPoint = 0 + Var ShowHandPoint = "Invisible" + Var MotionHandPoint = 0 + + Var Show_btn_process = "Enable" + Var Showhelper = "Invisible" + Var EnableBtnLangWithHelper = 1 + + Var VideoSmoothieProcess = "ROOT/taobin_project/animation01/Taobin_empty.mp4" + + DEBUGVAR TimeOutSmoothiesProcess + + If TimeOutSmoothiesProcess < 100 Then + Var Second_x = 580 + Var CountDown_x = 475 + EndIf + If TimeOutSmoothiesProcess > 99 Then + Var Second_x = 600 + Var CountDown_x = 460 + EndIf + Var TextDoorButtonID = 001202 Var SmoothieProcessState = "idle" Var CountDownCertainConfuse = 5 + Var ArmIDForMakeOrder = 0 + + + If CH9992_Status = "READY" Then + Var ArmIDForMakeOrder = 2 + EndIf + + If CH9994_Status = "READY" Then + Var ArmIDForMakeOrder = 4 + EndIf + + DEBUGVAR ArmIDForMakeOrder + __CMD "ui-load-playlist" 0 SelectDrink "-" + + 1000 ;SAVELOG SoundPlaying + Var TimeOutHandPoint = TimeOutHandPoint + 1 + + If TextDoorButtonID = 001202 Then + If Show_btn_process = "Disable" Then + Var ShowHandPoint = "Invisible" + Else + If TimeOutHandPoint > 9 Then + If MotionHandPoint = 0 Then + Var ShowHandPoint = "Enable" + Var MotionHandPoint = 1 + Else + Var ShowHandPoint = "Invisible" + Var MotionHandPoint = 0 + EndIf + EndIf + EndIf + Else + Var ShowHandPoint = "Invisible" + EndIf + + If Show_btn_process = "Disable" Then + Var VideoSmoothieProcess = "ROOT/taobin_project/video/TaoBin_Tao_Pun_motion_proof3_pause.mp4" + Var Showhelper = "Enable" + Var Show_btn_help = "Invisible" + Else + If EnableHelperShow = 1 Then + Var Show_btn_help = "Enable" + Else + Var Show_btn_help = "Invisible" + EndIf + Var VideoSmoothieProcess = "ROOT/taobin_project/video/TaoBin_Tao_Pun_motion_proof3.mp4" + Var Showhelper = "Invisible" + EndIf + + If TimeOutSmoothiesProcess < 100 Then + If TimeOutSmoothiesProcess < 10 Then + Var Second_x = 560 + Var CountDown_x = 495 + Else + Var Second_x = 580 + Var CountDown_x = 475 + EndIf + EndIf + If TimeOutSmoothiesProcess > 99 Then + Var Second_x = 600 + Var CountDown_x = 460 + EndIf + DEBUGVAR TimeOutSmoothiesProcess If TimeOutSmoothiesProcess > 0 Then - Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 + If Show_btn_process = "Disable" Then + ; do not thing + Else + Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 + EndIf EndIf If TimeOutSmoothiesProcess = 0 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_3.xml" EndIf @@ -79,7 +174,7 @@ DEBUGVAR CH9992_Status DEBUGVAR CH9993_Status DEBUGVAR CH9994_Status - + DEBUGVAR HaveCup DEBUGVAR CupOnArm DEBUGVAR DoorCupPosition @@ -89,9 +184,21 @@ DEBUGVAR SmoothieProcessState DEBUGVAR AnyArmConfuse DEBUGVAR SensorDoorCupStatus - + DEBUGVAR ArmIDForMakeOrder - If CH9992_Status = "READY" Then + If ArmIDForMakeOrder = 2 Then + Var ChannelArmForProccessStatus = CH9992_Status + EndIf + If ArmIDForMakeOrder = 4 Then + Var ChannelArmForProccessStatus = CH9994_Status + EndIf + + + DEBUGVAR ChannelArmForProccessStatus + + + + If ChannelArmForProccessStatus = "READY" Then If DoorCupPosition = "bottom" Then If SmoothieProcessState = "idle" Then @@ -101,25 +208,28 @@ Var TextDoorButtonID = 001203 Else - + EndIf EndIf Else If DoorCupPosition = "top" Then + + + Var TextDoorButtonID = 001204 If SmoothieProcessState = "press" Then Var SmoothieProcessState = "insert" EndIf Else If SmoothieProcessState = "idle" Then - + Else If SmoothieProcessState = "press" Then Else Var TextDoorButtonID = 001205 EndIf - + EndIf EndIf EndIf @@ -130,40 +240,42 @@ Var CountDownCertainConfuse = CountDownCertainConfuse - 1 If CountDownCertainConfuse = 0 Then - Machine DoorClose + Machine DoorClose EndIf EndIf EndIf Else - If CH9992_Status = "RUNNING" Then + If ChannelArmForProccessStatus = "RUNNING" Then Var SmoothieProcessState = "blendnow" EndIf EndIf If SmoothieProcessState = "blendnow" Then - Var TextDoorButtonID = 001206 - - Var SelectDrink = "12-01-07-0001" + Var TextDoorButtonID = 001206 + + Var SelectDrink = Seeker.selected_a_drink Var SelectSugarID = "" - + + Machine StrawOrder + + Topping "Select" SelectDrink - Var SmoothieProcessState = "blending" - + Var SmoothieProcessState = "blending" + + + + EndIf If SmoothieProcessState = "blending" Then - Menu "set-name" "Smoothie " - Menu "set-image" Seeker.PictureDrink - - Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" EndIf - + DEBUGVAR TextDoorButtonID @@ -171,7 +283,9 @@ TimerReset -;DEBUGVAR Var [CH9992_Status] = RUNNING +;DEBUGVAR Var [ChannelArmForProccessStatus] = RUNNING + +;include="ROOT/taobin_project/inc/video.inc" 0 @@ -183,32 +297,25 @@ DEBUGVAR LanguageShow + Var ButtonLanguageCurrentXPosition = 1015 + Var ButtonLanguageCurrentYPosition = 458 - 38 - + Var ButtonLanguageListXPosition = 990 + Var ButtonLanguageListYPosition = 450 - 38 Var LanguageButtonEnable = "Enable" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" RefreshAll +;include="ROOT/taobin_project/inc/video.inc" + -; back - ; ; ; -; zone +; zone ; ; ; @@ -217,45 +324,95 @@ +; helper +; +; 420 +; 652 +; Showhelper +; 240 +; 341 +; "ROOT/taobin_project/image/page_help_center/helper.png" +; +; Showhelper +; + ; 0 + ; 1080 + ; Showhelper + ; + ; 002409 + ; +; - - 0 - 1337 - 1080 - 85 - Center - - 1201 - - +; helper button + + +; helper button lead + 0 - 1571 + 1451 1080 85 Center @@ -264,28 +421,63 @@ +; second time + + "Enable" + CountDown_x + 1540 + 72 + RobotoBold + 0xFFFFFF + TimeOutSmoothiesProcess + + + + "Enable" + Second_x + 1560 + 52 + RobotoBold + 0xFFFFFF + "S" + + + + 725 + 1431 + ShowHandPoint + "ROOT/taobin_project/image/smoothie/proccess/hand_point.png" + + ; cancel 0 - 1767 + 1724 1080 85 Center - 001210 + 002402 diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_2.xml b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml new file mode 100644 index 00000000..bc6dd1f6 --- /dev/null +++ b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml @@ -0,0 +1,469 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= page_smoothie_suggest_and_process_2.xml ================================" + ; On open + + TopView "show" + ; On open + + Machine WakeUp + + RootLayoutVisible 3 "show" + + ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" + + DEBUGVAR ToppingNewShow + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev" + + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/ticket_time_blending.ev" + + Var NextPage = "-" + + + If Seeker = "curr" Then + Machine DoorLidClose + EndIf + + CoinVending OFF + + + ; Clear value + Topping "clear" "-" + + + Var DirImage = "ROOT/taobin_project/image/smoothie/proccess" + + + Var ProcessCupDebugText = "" + + DEBUGVAR TimeOutSmoothiesProcess + + If TimeOutSmoothiesProcess < 101 Then + If TimeOutSmoothiesProcess < 11 Then + Var CountDown_x_1 = 515 + Var Second_x_1 = 560 + Else + Var CountDown_x_1 = 485 + Var Second_x_1 = 560 + EndIf + EndIf + If TimeOutSmoothiesProcess > 98 Then + Var CountDown_x_1 = 485 + Var Second_x_1 = 585 + EndIf + + Var TextDoorButtonID = 001202 + + Var SmoothieProcessState = "idle" + Var CountDownCertainConfuse = 5 + + + 1000 + + + ;SAVELOG SoundPlaying + + ; time moving + If TimeOutSmoothiesProcess < 101 Then + If TimeOutSmoothiesProcess < 11 Then + Var CountDown_x_1 = 515 + Var Second_x_1 = 560 + Else + Var CountDown_x_1 = 485 + Var Second_x_1 = 560 + EndIf + EndIf + If TimeOutSmoothiesProcess > 98 Then + Var CountDown_x_1 = 485 + Var Second_x_1 = 585 + EndIf + + DEBUGVAR TimeOutSmoothiesProcess + If TimeOutSmoothiesProcess > 0 Then + Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 + EndIf + + If TimeOutSmoothiesProcess = 0 Then + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_3.xml" + EndIf + + + DEBUGVAR CH9991_Status + DEBUGVAR CH9992_Status + DEBUGVAR CH9993_Status + DEBUGVAR CH9994_Status + + DEBUGVAR HaveCup + DEBUGVAR CupOnArm + DEBUGVAR DoorCupPosition + DEBUGVAR CupChecking + DEBUGVAR CupArmMove + DEBUGVAR buttonRemoveCup + DEBUGVAR SmoothieProcessState + DEBUGVAR AnyArmConfuse + DEBUGVAR SensorDoorCupStatus + + + If CH9992_Status = "READY" Then + + If DoorCupPosition = "bottom" Then + If SmoothieProcessState = "idle" Then + Var TextDoorButtonID = 001202 + Else + If SmoothieProcessState = "insert" Then + Var TextDoorButtonID = 001203 + + Else + + EndIf + EndIf + Else + If DoorCupPosition = "top" Then + Var TextDoorButtonID = 001204 + If SmoothieProcessState = "press" Then + Var SmoothieProcessState = "insert" + EndIf + Else + If SmoothieProcessState = "idle" Then + + Else + If SmoothieProcessState = "press" Then + + Else + Var TextDoorButtonID = 001205 + EndIf + + EndIf + EndIf + EndIf + + + If AnyArmConfuse = 1 Then + If CountDownCertainConfuse > 0 Then + Var CountDownCertainConfuse = CountDownCertainConfuse - 1 + + If CountDownCertainConfuse = 0 Then + Machine DoorClose + EndIf + EndIf + EndIf + Else + + If CH9992_Status = "RUNNING" Then + Var SmoothieProcessState = "blendnow" + EndIf + EndIf + + If SmoothieProcessState = "blendnow" Then + Var TextDoorButtonID = 001206 + + Var SelectDrink = Seeker.selected_a_drink + Var SelectSugarID = "" + + Topping "Select" SelectDrink + + Var SmoothieProcessState = "blending" + + EndIf + + If SmoothieProcessState = "blending" Then + + + Menu "set-name" "Smoothie " + Menu "set-image" Seeker.PictureDrink + + + Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" + + EndIf + + + DEBUGVAR TextDoorButtonID + + Refresh + TimerReset + + +;DEBUGVAR Var [CH9992_Status] = RUNNING + + + DEBUGVAR LanguageShow + + If LanguageShow = "THAI" Then + + EndIf + + If LanguageShow = "ENG" Then + + EndIf + + If LanguageShow = "MYANMAR" Then + + EndIf + + If LanguageShow = "MSC" Then + + EndIf + + + + Var LanguageButtonEnable = "Enable" + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + +;include="ROOT/taobin_project/inc/video.inc" + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + +; back + + +; +; +; +; zone +; +; +; + + + + 185 + 570 + 722 + 732 + "ROOT/taobin_project/image/smoothie/proccess/tao_sad.png" + + + + + 300 + 420 + 500 + 72 + + 002400 + + + + + 0 + 550 + + 002405 + + + + + 0 + 1290 + + 002407 + + + +; cancel + + + + 0 + 1530 + 1080 + 85 + Center + + 002402 + + + +; go back + + + + 0 + 1682 + 1080 + 85 + Center + + 002403 + + + + +; second time + + "Enable" + CountDown_x_1 + 1743 + 150 + 72 + 44 + RobotoBold + 0xFFFFFF + TimeOutSmoothiesProcess + + + + "Enable" + Second_x_1 + 1760 + 23 + 30 + "ROOT/taobin_project/image/smoothie/proccess/second.png" + + + + + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ProcessCupDebugText + + + + + + + 1 + 1 + KanitTTF + 22 + 1080 + end + 0xFF0000 + "V01 " + + + + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + + + Var StrawGetMoreState = "Invisible" + Var bg_lidProblem_ST = "Enable" + Var GetLidButtonState2 = "Invisible" + Var bg_lidProblem_ST2 ="Enable" + + Var XStraw = 376 + Var EnableGetMoreStrawFileName2 = "Invisible" + Var bg_strawProblem_ST2 ="Enable" + + + + Var MachineState_Result = 0 + Var waitAckPay = 1 + Var BREW_COUNT_DOWN_FROM_APP = "on" + Var CountDownBrewing = 122 + Var MachineStage = "testing" + Var BREW_CNT = 122 + + Var InternationalEnable = 1 + DEBUGVAR InternationalEnable + Var LanguageObjectShow = "Enable" + Var NoLangObjectShow = "Invisible" + + + Var Top2Timeout = 19 + DEBUGVAR CountDownBrewing + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml" + +; Initial for jump to page_brewing3.xml + + + Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml" + + Open "ROOT/taobin_project/xml/page_check_member2.xml" + + + + + + Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml" + + + + + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + + + + + + Open "ROOT/taobin_project/xml/page_topup_credit3-TopupSuccess.xml" + + + + + + Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" + + + diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_3.xml b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml new file mode 100644 index 00000000..ebf57a84 --- /dev/null +++ b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml @@ -0,0 +1,380 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= page_smoothie_suggest_and_process_3.xml ================================" + ; On open + + TopView "show" + ; On open + + Machine WakeUp + + RootLayoutVisible 3 "show" + + ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" + + DEBUGVAR ToppingNewShow + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev" + + Var NextPage = "-" + + + If Seeker = "curr" Then + Machine DoorLidClose + EndIf + + CoinVending OFF + + + ; Clear value + Topping "clear" "-" + + + Var DirImage = "ROOT/taobin_project/image/smoothie/proccess" + + + Var ProcessCupDebugText = "" + + Var TimeOutSmoothiesProcess = 0 + Var Timeout = 0 + + DEBUGVAR TimeOutSmoothiesProcess + + + Var SmoothieProcessState = "idle" + Var CountDownCertainConfuse = 5 + + + 1000 + + + ;SAVELOG SoundPlaying + + DEBUGVAR CH9991_Status + DEBUGVAR CH9992_Status + DEBUGVAR CH9993_Status + DEBUGVAR CH9994_Status + + DEBUGVAR HaveCup + DEBUGVAR CupOnArm + DEBUGVAR DoorCupPosition + DEBUGVAR CupChecking + DEBUGVAR CupArmMove + DEBUGVAR buttonRemoveCup + DEBUGVAR SmoothieProcessState + DEBUGVAR AnyArmConfuse + DEBUGVAR SensorDoorCupStatus + + DEBUGVAR Timeout + + If Timeout > 66 Then + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If CH9992_Status = "READY" Then + + If DoorCupPosition = "bottom" Then + If SmoothieProcessState = "idle" Then + Var TextDoorButtonID = 001202 + Else + If SmoothieProcessState = "insert" Then + Var TextDoorButtonID = 001203 + + Else + + EndIf + EndIf + Else + If DoorCupPosition = "top" Then + Var TextDoorButtonID = 001204 + If SmoothieProcessState = "press" Then + Var SmoothieProcessState = "insert" + EndIf + Else + If SmoothieProcessState = "idle" Then + + Else + If SmoothieProcessState = "press" Then + + Else + Var TextDoorButtonID = 001205 + EndIf + + EndIf + EndIf + EndIf + + + If AnyArmConfuse = 1 Then + If CountDownCertainConfuse > 0 Then + Var CountDownCertainConfuse = CountDownCertainConfuse - 1 + + If CountDownCertainConfuse = 0 Then + Machine DoorClose + EndIf + EndIf + EndIf + Else + + If CH9992_Status = "RUNNING" Then + Var SmoothieProcessState = "blendnow" + EndIf + EndIf + + If SmoothieProcessState = "blendnow" Then + Var TextDoorButtonID = 001206 + + Var SelectDrink = Seeker.selected_a_drink + Var SelectSugarID = "" + + Topping "Select" SelectDrink + + Var SmoothieProcessState = "blending" + + EndIf + + If SmoothieProcessState = "blending" Then + + + Menu "set-name" "Smoothie " + Menu "set-image" Seeker.PictureDrink + + + ;Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" + + EndIf + + Var Timeout = Timeout + 1 + + Refresh + TimerReset + + +;DEBUGVAR Var [CH9992_Status] = RUNNING + + + DEBUGVAR LanguageShow + + If LanguageShow = "THAI" Then + Var warning_time_x = 220 + Var warning_time_y = 570 + EndIf + + If LanguageShow = "ENG" Then + Var warning_time_x = 240 + Var warning_time_y = 570 + EndIf + + If LanguageShow = "MYANMAR" Then + Var warning_time_x = 110 + Var warning_time_y = 555 + EndIf + + If LanguageShow = "MSC" Then + Var warning_time_x = 350 + Var warning_time_y = 570 + EndIf + + + + Var LanguageButtonEnable = "Enable" + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + +;include="ROOT/taobin_project/inc/video.inc" + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + +; back + + +; +; +; +; zone +; +; +; + + + + + 185 + 570 + 722 + 732 + "ROOT/taobin_project/image/smoothie/proccess/tao_sad.png" + + +; warning time + + "Enable" + warning_time_x + warning_time_y + "ROOT/taobin_project/image/smoothie/proccess/clock.png" + + + + 50 + 550 + + 002408 + + + + + 0 + 1320 + + 002406 + + + +; cancel to home + + + + 0 + 1760 + 1080 + 85 + Center + + 002404 + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ProcessCupDebugText + + + + + + + 1 + 1 + KanitTTF + 22 + 1080 + end + 0xFF0000 + "V01 " + + + + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + + + Var StrawGetMoreState = "Invisible" + Var bg_lidProblem_ST = "Enable" + Var GetLidButtonState2 = "Invisible" + Var bg_lidProblem_ST2 ="Enable" + + Var XStraw = 376 + Var EnableGetMoreStrawFileName2 = "Invisible" + Var bg_strawProblem_ST2 ="Enable" + + + + Var MachineState_Result = 0 + Var waitAckPay = 1 + Var BREW_COUNT_DOWN_FROM_APP = "on" + Var CountDownBrewing = 122 + Var MachineStage = "testing" + Var BREW_CNT = 122 + + Var InternationalEnable = 1 + DEBUGVAR InternationalEnable + Var LanguageObjectShow = "Enable" + Var NoLangObjectShow = "Invisible" + + + Var Top2Timeout = 19 + DEBUGVAR CountDownBrewing + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml" + +; Initial for jump to page_brewing3.xml + + + ;Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml" + + Open "ROOT/taobin_project/xml/page_check_member2.xml" + + + + + + Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml" + + + + + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + + + + + + Open "ROOT/taobin_project/xml/page_topup_credit3-TopupSuccess.xml" + + + + + + Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" + + + diff --git a/inter/tha/xml/page_topping_frozen_fruit_select.lxml b/inter/tha/xml/page_topping_frozen_fruit_select.lxml index cff90c0e..69c37482 100644 --- a/inter/tha/xml/page_topping_frozen_fruit_select.lxml +++ b/inter/tha/xml/page_topping_frozen_fruit_select.lxml @@ -6,20 +6,25 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - + Machine WakeUp Var BugFlag = 0 - + CRLFToSpace showname CRLFToSpace showdesc - + + Var MachineEvent = 0 + Var MatchineSpiralStage = "-" + + Var NextButtonState = "Invisible" + ;- Begin Var PriceDrinkNoTop = PriceDrink Var PriceDrinkTmp = PriceDrink Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp Var Timeout = 0 - + ;SAVELOG PriceDrinkTmp ;- End @@ -41,19 +46,19 @@ DEBUGVAR backGroundAddExtra DEBUGVAR backGroundAddShotPremium - + DEBUGVAR MultiPayEnable DEBUGVAR CART_COUNT Var btnAddCart = "Invisible" - If MultiPayEnable = "true" Then + If MultiPayEnable = "true" Then Var btnAddCart = "Enable" If CART_COUNT = 3 Then - Var btnAddCart = "Invisible" + Var btnAddCart = "Invisible" EndIf EndIf - Var LidDeactiveButton = "Invisible" - Var StrawDeactiveButton = "Invisible" + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" Machine DoorClose Machine DoorLidClose @@ -63,7 +68,7 @@ Var NEW_MULTI = "Invisible" Var high_light_drink_type = "Invisible" - + Var text_hot_color = "0x84776F" Var text_cold_color = "0x84776F" Var text_blender_color = "0x84776F" @@ -104,20 +109,20 @@ If hot_button_state = "Disable2" Then Var text_price_d1 = "" Else - Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormatFull, PreScaleConvertShow) EndIf If cold_button_state = "Disable2" Then Var text_price_d2 = "" Else - Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormatFull, PreScaleConvertShow) EndIf - + If blend_button_state = "Disable2" Then Var text_price_d3 = "" Else - Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormatFull, PreScaleConvertShow) + Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormatFull, PreScaleConvertShow) EndIf DEBUGVAR LanguageShowByIndex @@ -134,27 +139,31 @@ CRLFToSpace showname CRLFToSpace showdesc + Var Seeker.PictureDrink = PictureDrink + Var Seeker.showname = showname + + 1000 - + DEBUGVAR Timeout Var Timeout = Timeout + 1 - + If Timeout > 40 Then Var Timeout = 0 - If Seeker = "next" Then + If Seeker = "next" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_brewing3Conti.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" + Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - + EndIf - If MultiPayEnable = "true" Then + If MultiPayEnable = "true" Then If NEW_MULTI = "Invisible" Then Var NEW_MULTI = "Enable" Else @@ -164,18 +173,96 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - + EndIf EndIf + If MachineEvent = 1 Then + If MatchineSpiralStage = "-" Then + + Else + If MatchineSpiralStage = "spiral-valid" Then + Function 2 + Else + ; Verify error + DEBUGVAR MachineSpiralErrorCode + Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml" + EndIf + EndIf + EndIf + Refresh TimerReset - + + + + DEBUGVAR LanguageShow + DEBUGVAR InternationalEnable + + SAVELOG "EventLanguageOnChange menu -list" + + If InternationalEnable = 1 Then + If CountryName = "Thailand" Then + Var show_eng_button_stage = "Invisible" + Var LanguageButtonEnable = "Enable" + EndIf + If CountryName = "HongKong" Then + Var show_eng_button_stage = "Invisible" + Var LanguageButtonEnable = "Invisible" + Var BtnLangToggleIndex = "Enable" + EndIf + Else + Var LanguageButtonEnable = "Invisible" + Var show_eng_button_stage = "Enable" + EndIf + + If LanguageShow = "ENG" Then + Var showname_max_size = 58 + Var warning_image_x = 220 + Var warning_image_y = 1333 + Var warning_text_x = 20 + Var warning_text_y = 1312 + Var text_payment_next_x = 132 + EndIf + + If LanguageShow = "THAI" Then + Var showname_max_size = 68 + Var warning_image_x = 335 + Var warning_image_y = 1333 + Var warning_text_x = 20 + Var warning_text_y = 1312 + Var text_payment_next_x = 142 + EndIf + + If LanguageShow = "MSC" Then + Var showname_max_size = 68 + Var warning_image_x = 350 + Var warning_image_y = 1333 + Var warning_text_x = 20 + Var warning_text_y = 1312 + Var text_payment_next_x = 142 + EndIf + + If LanguageShow = "MYANMAR" Then + Var showname_max_size = 68 + Var warning_image_x = 300 + Var warning_image_y = 1333 + Var warning_text_x = 10 + Var warning_text_y = 1312 + Var text_payment_next_x = 142 + EndIf + + ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml" + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RefreshAll + + +;include="ROOT/taobin_project/inc/video.inc" 0 @@ -196,7 +283,7 @@ show_btp "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; @@ -205,17 +292,17 @@ DEBUGVAR LanguageShowByIndex DEBUGVAR LanguageShow - + If SelectDrinkType = 1 Then Var showname = NameLang[IndexDrinktType][LanguageShowByIndex] Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex] - + Else Var showname = aliasName[LanguageShowByIndex] Var showdesc = aliasName[LanguageShowByIndex] - + EndIf - + BackslashNToEnter showname BackslashNToEnter showdesc CRLFToSpace showname @@ -233,16 +320,16 @@ "ROOT/taobin_project/image/page2/bn_back_arrow.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - + Open OpenFromXML - - + + @@ -251,12 +338,16 @@ Else + Var MachineEvent = 1 DEBUGVAR LinkProductCodeAnotherMachine[0] DEBUGVAR LinkProductCodeAnotherMachine[1] DEBUGVAR LinkProductCodeAnotherMachine[2] - - Function 2 - + + Var MatchineSpiralStage = "-" + + GenHashWithTimeStamp SpiralRef + SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef + EndIf @@ -266,7 +357,7 @@ ; same 374 - 382 + 752 331 436 PictureDrink @@ -276,14 +367,14 @@ 374 399 - eval( + eval( If IsSmoRet = "true" Then Var return = "Enable" Else Var return = "Invisible" EndIf -) - +) + "ROOT/taobin_project/image/topping2/blender_icon.png" @@ -291,66 +382,70 @@ ; Text head 0 - 752 + 602 1080 Center - 68 + showname_max_size + Auto + 2 KanitMediumTTF 0x513C2F showname -; same + 0 - 836 + 1082 1080 Center - 24 - KanitLightTTF + 68 + KanitMediumTTF + 0xEE8C62 + text_price_d3 + + +; same + + 25 + 1232 + 1080 + Center + 32 + KanitMediumTTF 0x6F5F51 showdesc +; warning time + + "Enable" + warning_image_x + warning_image_y + "ROOT/taobin_project/image/topping_inter/time.png" + + + + "Enable" + warning_text_x + warning_text_y + + 0 + 19 + 002290 + + + - - - - Open "/media/bt/xml/security_alarm.xml" + + Open "/media/bt/xml/security_alarm.xml" -; back - @@ -365,7 +460,7 @@ Var( DirImage + "/bp_add.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var PriceDrink = PriceDrinkTmp SAVELOG "USER press next ( topping ) - new" @@ -380,25 +475,25 @@ If StrawState = "Press" Then - Machine StrawOrder + Machine StrawOrder Var LedLidBlink = "true" EndIf If LidState = "Press" Then - Machine LidOrder + Machine LidOrder Var LedLidBlink = "true" EndIf Var StrawState = "Enable" Var LidState = "Enable" - ; - + ; + Var SelectDrink = UserSelectProductCode - ; Set drink + ; Set drink Topping "Select" UserSelectProductCode - ; Set option toppinng and pack + ; Set option toppinng and pack Topping "Select1-ID" topping1 Topping "Select2-ID" topping2 Topping "Select3-ID" topping3 @@ -419,7 +514,7 @@ EndIf EndIf EndIf - + Var CartUpdate = "true" @@ -431,30 +526,31 @@ ; "0x00BDFF" 500 Var( DirImage + "/new_multi.png" ) - + ; next + + 420 + 1442 + 250 + 75 + + 002291 + + + @@ -716,7 +819,7 @@ Var img_cold_dis = "/bt_cold_disable.png" Var img_cold_dis2 = "/bt_cold_disable2.png" EndIf - + If img_smth_no_flag = 1 Then SAVELOG "Smoothies change img. 1" Var img_smth = "/bt_smoothie_no.png" @@ -751,12 +854,12 @@ DEBUGVAR menu_name_thai_cold SAVELOG "FUNCTION2" - + Var TOPPING_PRICE = 0 Var SelectDrinkType = 0 - + ; Set default If SelectCountDrinkType = 1 Then If DefaultDrinkType = 1 Then @@ -777,7 +880,7 @@ Var normal_button_state = "PressForever" Var SelectDrinkType = 1 EndIf - + Var IndexDrinktType = 1 EndIf If DefaultDrinkType = 3 Then @@ -808,7 +911,7 @@ Machine PreparCup EndIf - + If cold_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD2 Var UserSelectProductCode = PD_CODE2 @@ -829,7 +932,7 @@ Machine PreparCup EndIf - + If blend_button_state = "PressForever" Then Var PriceDrinkNoTop = PriceD3 Var UserSelectProductCode = PD_CODE3 @@ -857,7 +960,7 @@ BackslashNToEnter showdesc CRLFToSpace showname CRLFToSpace showdesc - + DEBUGVAR PriceDrinkNoTop DEBUGVAR PriceDiff @@ -873,18 +976,18 @@ Var TOPPING_PRICE = 0 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - + Var topping2 = toppingID2index2 - + Var DisableUsingCode = "true" - + Var showText7 = "Enable" SAVELOG "Select premi normal shot" Else - If showShotEnable = "Press" Then + If showShotEnable = "Press" Then If blendedState = "Press" Then Var PriceDrinkTmp = PriceDrinkNoTop EndIf @@ -895,11 +998,11 @@ ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - + Var topping2 = toppingID2index2 - + Var DisableUsingCode = "true" - + Var showText7 = "Enable" SAVELOG "Select add normal shot" @@ -907,7 +1010,7 @@ If blendedState = "Disable" Then Var blendedState = "Enable" EndIf - + Var PriceDrinkTmp = PriceDrinkNoTop Var topping2 = toppingID2index1 @@ -935,9 +1038,9 @@ Var topping6 = toppingID6index1 Var DisableUsingCode = "false" - + EndIf - + DEBUGVAR OatMilkEnable DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName1_State @@ -950,7 +1053,7 @@ EndIf EndIf EndIf - + DEBUGVAR SelectDrinkType @@ -968,7 +1071,7 @@ SAVELOG PriceDrinkTmp If RoadShow = "true" Then - + Var PriceDrinkTmpShow = "Free" DEBUGVAR SelectDrink2 @@ -982,7 +1085,8 @@ Var Timeout = 0 - + Var NextButtonState = "Enable" + RefreshAll @@ -990,5 +1094,8 @@ ; + + OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" + diff --git a/inter/tha/xml/ticket_time_blending.ev b/inter/tha/xml/ticket_time_blending.ev new file mode 100644 index 00000000..0fa5b894 --- /dev/null +++ b/inter/tha/xml/ticket_time_blending.ev @@ -0,0 +1,5 @@ +If TimeOutSmoothiesProcess > -1 Then + Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess +Else + Var TimeOutSmoothiesProcess = 120 +EndIf \ No newline at end of file diff --git a/inter/tha/xml/topview_helper.lxml b/inter/tha/xml/topview_helper.lxml new file mode 100644 index 00000000..8093d219 --- /dev/null +++ b/inter/tha/xml/topview_helper.lxml @@ -0,0 +1,52 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= Helper Icon ================================" + + + + + + ;include="ROOT/taobin_project/inter/tha/xml/helper_show_and_refresh.lxml" + + Var Timeout = 0 + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + + 1000 + + + + Refresh + TimerReset + + +; helper button + + + + diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index fac2e54b..0fb1a7bf 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -1382,6 +1382,15 @@ Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt Name=FrozenFruit,file=page_catalog_group_frozen_fruit.skt,topping_xml_file=page_topping_frozen_fruit_select.lxml,parameter=show-blend-only +<<<<<<< HEAD + มะม่วงปั่น Mango Smoothie มะม่วงปั่น แช่แข็ง Frozen mango smoothies - - 12-00-07-0000 bn_frozen_mango.png - - - - + มะม่วงเต่าปั่น Mango Tao Pun มะม่วง Real Mango - - 12-06-03-0001 blended_mango_only.png + มะม่่วงลิ้นจี่เต่าปั่น Mango Lychee Tao Pun มะม่วง ลิ้นจี่ Real Mango Lychee - - 12-06-03-0002 blended_mango_lychee.png + มะม่วงสตรอเบอรีเต่าปั่น Mango Strawberry Tao Pun มะม่วง สตรอเบอรี Real Mango Strawberry - - 12-06-03-0003 blended_mango_strawberry.png + มะม่วงสละเต่าปั่น Mango Salak Tao Pun มะม่วง สละ Real Mango Salak - - 12-06-03-0004 blended_mango_sala.png + มะม่วงมัทฉะเต่าปั่น Mango Pure Matcha Tao Pun มะม่วง มัทฉะ Real Mango Matcha - - 12-06-03-0005 blended_mango_greentea.png + มะม่วงชาไต้หวันเต่าปั่น Mango Taiwanese Tea Tao Pun มะม่วง ชาไต้หวัน Real Mango TaiwaneseTea - - 12-06-03-0006 blended_mango_taiwanese_tea.png +======= มะม่วงปั่น Mango Smoothie มะม่วงปั่น แช่แข็ง Frozen mango smoothies - - 12-00-07-0000 bn_frozen_mango.png - - - posi1 - - - - มะม่วงเต่าปั่น Mango Tao Pun มะม่วง Real Mango - - 12-06-03-0001 blended_mango_only.png - - - posi1 - - - - มะม่่วงลิ้นจี่เต่าปั่น Mango Lychee Tao Pun มะม่วง ลิ้นจี่ Real Mango Lychee - - 12-06-03-0002 blended_mango_lychee.png - - - posi1 - - - - @@ -1389,6 +1398,7 @@ Name=FrozenFruit,file=page_catalog_group_frozen_fruit.skt,topping_xml_file=page_ มะม่วงสละเต่าปั่น Mango Salak Tao Pun มะม่วง สละ Real Mango Salak - - 12-06-03-0004 blended_mango_sala.png - - - posi1 - - - - มะม่วงมัทฉะเต่าปั่น Mango Pure Matcha Tao Pun มะม่วง มัทฉะ Real Mango Matcha - - 12-06-03-0005 blended_mango_greentea.png - - - posi1 - - - - มะม่วงชาไต้หวันเต่าปั่น Mango Taiwanese Tea Tao Pun มะม่วง ชาไต้หวัน Real Mango TaiwaneseTea - - 12-06-03-0006 blended_mango_taiwanese_tea.png - - - posi1 - - - - +>>>>>>> 6467e5f893ec61fc1c783c5b4e790ea2d74d664c diff --git a/video/Mixer_proof3.mp4 b/video/Mixer_proof3.mp4 new file mode 100644 index 00000000..6e399673 Binary files /dev/null and b/video/Mixer_proof3.mp4 differ diff --git a/video/TaoBin_Tao_Pun_motion_proof3.mp4 b/video/TaoBin_Tao_Pun_motion_proof3.mp4 new file mode 100644 index 00000000..b7fe430c Binary files /dev/null and b/video/TaoBin_Tao_Pun_motion_proof3.mp4 differ diff --git a/video/TaoBin_Tao_Pun_motion_proof3_pause.mp4 b/video/TaoBin_Tao_Pun_motion_proof3_pause.mp4 new file mode 100644 index 00000000..a11adafe Binary files /dev/null and b/video/TaoBin_Tao_Pun_motion_proof3_pause.mp4 differ diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 1025d23c..9007f24a 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -8,6 +8,8 @@ Var ChildrenFree = 0 +Var KBankCashlessMachine = 0 +Var SmoothieToPayment = 0 Var OreoDueEnable = 0 Var OreoForFreeEnable = 0 @@ -317,4 +319,4 @@ If BoxID = 176757 Then Var SaveOrderNameAndPictureEnable = 1 EndIf -DEBUGVAR SystemDateDayOfWeek \ No newline at end of file +DEBUGVAR SystemDateDayOfWeek diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index e7a6af70..574569e3 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -6,6 +6,8 @@ SoundVolume + RootLayoutVisible 3 "hide" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev" Var SendNotiPaySuccess = 2 @@ -1138,7 +1140,6 @@ Else Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - EndIf DEBUGVAR CountUpBrewing diff --git a/xml/page_board.xml b/xml/page_board.xml index 69ad4df9..237502aa 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -32,6 +32,7 @@ Var credit_card_enable = "" READ_FILE "/mnt/sdcard/credit_card_enable" credit_card_enable + Var BaseOnPageBoard = 1 Var eng_enable = "true" Var thai_enable = "true" @@ -134,6 +135,8 @@ Var ShowButtonClick_WTC = "Invisible" Var ShowButtonClickFull_WTC = "Invisible" + Var BtnLangToggleIndex = "Invisible" + ;SAVELOG DisplayType If DisplayType = "2" Then @@ -1312,7 +1315,39 @@ If EnableMultiInstanceFromBoxID = 1 Then If CountryName = "Thailand" Then - + + + ; enable helper + Var EnableHelperShow = 0 + ;Var FromDrinkOk = 1 + Var CurrHelpCenter = 0 + If EnableHelperShow = 1 Then + ; enable btn_change_langs + Var EnableBtnLangWithHelper = 1 + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RootLayoutVisible 3 "show" + + If FromDrinkOk = 1 Then + Var TimeOutShowHelpCenter = 15 + + Var FromSmoothieProcess = "Invisible" + Var FromPaymentCash = "Invisible" + Var FromBrewingProcess = "Enable" + + RootLayoutVisible 15 "show" + OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" + Else + RootLayoutVisible 15 "hide" + EndIf + Else + RootLayoutVisible 3 "hide" + EndIf + Var EnableMultiInstance = "true" Var MyanmarLangEnable = "true" Var InternationalShow = 0 @@ -1326,6 +1361,18 @@ Var InternationalShow = 0 EndIf + If BoxID = 210699 Then + Var SpiralOnline = "true" + Var SpiralModeFrozenFruit = 1 + Var InternationalShow = 1 + EndIf + + If BoxID = 105005 Then + Var SpiralOnline = "true" + Var SpiralModeFrozenFruit = 1 + Var InternationalShow = 1 + EndIf + ; test payment Var New_Payment = 1 @@ -1455,7 +1502,17 @@ ;DEBUGVAR LivenessControlVersion ;DEBUGVAR Not#CameraSettingStatus - RootLayoutVisible 3 "hide" + If EnableMultiInstanceFromBoxID = 1 Then + If CountryName = "Thailand" Then + If EnableHelperShow = 1 Then + RootLayoutVisible 3 "show" + Else + RootLayoutVisible 3 "hide" + EndIf + Else + RootLayoutVisible 3 "hide" + EndIf + EndIf If SELLSTATUS = "DEACTIVE" Then OpenInst 0 "/ROOT/xml/offline.xml" @@ -2060,6 +2117,9 @@ PRICE "Reset" "-" DEBUGVAR InternationalEnable DEBUGVAR CountryName + + Var BaseOnPageBoard = 0 + If InternationalEnable = 1 Then If CountryName = "Thailand" Then SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" @@ -2221,11 +2281,41 @@ PRICE "Reset" "-" Open "ROOT/taobin_project/xml/page_sleepmode.xml" EndIf + ; for count helper show + If EnableHelperShow = 1 Then + If FromDrinkOk = 1 Then + If TimeOutShowHelpCenter > 0 Then + Var TimeOutShowHelpCenter = TimeOutShowHelpCenter - 1 + EndIf + + If TimeOutShowHelpCenter = 0 Then + Var FromDrinkOk = 0 + If CurrHelpCenter = 1 Then + ;do not thing + Else + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + EndIf + EndIf + EndIf + EndIf + Refresh TimerReset + + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + SAVELOG "EVENT END" @@ -2297,6 +2387,8 @@ PRICE "Reset" "-" SoundVolume + Var BaseOnPageBoard = 0 + ;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" @@ -2344,6 +2436,7 @@ PRICE "Reset" "-" Var NextPage = "-" + Var BaseOnPageBoard = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" @@ -2403,6 +2496,7 @@ PRICE "Reset" "-" SAVELOG "click ShowButtonClickFull" Var NextPage = "-" + Var BaseOnPageBoard = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If SpiralOnline = "true" Then If InternationalEnable = 1 Then diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index b6b69e21..23ffbe6d 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -5,7 +5,7 @@ "0xeae6e1" SoundVolume - + RootLayoutVisible 3 "hide" If New_Payment = 1 Then Open "ROOT/taobin_project/xml/page_NewBrewing3.xml" diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 6d3bdd25..7d19fa1a 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -5,7 +5,8 @@ "0xeae6e1" SoundVolume - + RootLayoutVisible 3 "hide" + Var waitAckPay = 0 Var ChangeFlag = 0 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index d4a427c1..6099d71a 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -293,6 +293,9 @@ Var EnableDoorJamAlert = 0 + ; helper show in page_board + Var FromDrinkOk = 1 + 500 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 1cb1cff8..a7f1ef96 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -436,7 +436,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Var TxRef1 = "" CreateTxRef1 TxRef1 Else @@ -447,7 +451,11 @@ Var PaidPaymentFromNextStage = 1 EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -463,7 +471,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Var TxRef1 = "" CreateTxRef1 TxRef1 Else @@ -474,7 +486,11 @@ Var PaidPaymentFromNextStage = 1 EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -1296,6 +1312,21 @@ Var X_CASH3 = 664 - 113 EndIf + ; helper + Var FromSmoothieProcess = "Invisible" + Var FromPaymentCash = "Enable" + Var FromBrewingProcess = "Invisible" + + If EnableHelperShow = 1 Then + Var Showhelper = "Enable" + Else + Var Showhelper = "Invisible" + EndIf + + ; langs + Var EnableBtnLangWithHelper = 0 + + @@ -1376,7 +1407,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf ;Var TxRef1 = "" ;CreateTxRef1 TxRef1 EndIf @@ -1384,7 +1419,11 @@ Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var BrewingTextThai = "เตรียมแก้ว" - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -1930,12 +1969,20 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf EndIf Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf EndIf @@ -2178,8 +2225,12 @@ If TestLoopMakeDrink = 1 Then - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -2210,7 +2261,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Var TxRef1 = "" CreateTxRef1 TxRef1 Else @@ -2221,7 +2276,11 @@ EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf Else If CancelFlag = 0 Then @@ -2762,7 +2821,25 @@ EndIf +; helper button + @@ -2893,8 +2970,12 @@ Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate EndIf @@ -3745,11 +3826,19 @@ eval( If IgnoreNetCore = "true" Then If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Else EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -3766,9 +3855,12 @@ eval( - - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 345dfd93..4a168707 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -220,7 +220,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Var TxRef1 = "" CreateTxRef1 TxRef1 @@ -232,7 +236,11 @@ Var DrinkPaid = SelectDrink Var PaidPaymentFromNextStage = 1 EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf Var ReqAdddata22 = 0 diff --git a/xml/page_spiral_before_conti.xml b/xml/page_spiral_before_conti.xml new file mode 100644 index 00000000..8ac802f0 --- /dev/null +++ b/xml/page_spiral_before_conti.xml @@ -0,0 +1,77 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + + Var Timeout = 0 + + + 1000 + + + Var Timeout = Timeout + 1 + + If Timeout > 7 Then + Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml" + EndIf + + TimerReset + Refresh + + + + + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + 84 + 1314 + 911 + 265 + "ROOT/taobin_project/image/smoothie/proccess/bg_empty.png" + + + + 0 + 1344 + 1080 + 85 + Center + + 002433 + + + + + 0 + 1430 + Center + + 002434 + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + \ No newline at end of file diff --git a/xml/page_spiral_failed.xml b/xml/page_spiral_failed.xml new file mode 100644 index 00000000..b9a0f6cb --- /dev/null +++ b/xml/page_spiral_failed.xml @@ -0,0 +1,76 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + + Var Timeout = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + + + 1000 + + + Var Timeout = Timeout + 1 + + If Timeout > 3 Then + ;include="ROOT/taobin_project/inc/return_condition.ev" + EndIf + + TimerReset + Refresh + + + + + + + + + 89 + 700 + 902 + 902 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_fail.png" + + + + 84 + 1314 + 911 + 265 + "ROOT/taobin_project/image/smoothie/proccess/bg_empty.png" + + + + 0 + 1344 + 1080 + 85 + Center + + 002430 + + + + + 0 + 1430 + Center + + 002432 + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + \ No newline at end of file diff --git a/xml/page_spiral_invalid_failed.xml b/xml/page_spiral_invalid_failed.xml new file mode 100644 index 00000000..f198060e --- /dev/null +++ b/xml/page_spiral_invalid_failed.xml @@ -0,0 +1,76 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + + Var Timeout = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + + + 1000 + + + Var Timeout = Timeout + 1 + + If Timeout > 3 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + TimerReset + Refresh + + + + + + + + + 89 + 700 + 902 + 902 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_fail.png" + + + + 84 + 1314 + 911 + 265 + "ROOT/taobin_project/image/smoothie/proccess/bg_empty.png" + + + + 0 + 1344 + 1080 + 85 + Center + + 002430 + + + + + 0 + 1430 + Center + + 002431 + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + \ No newline at end of file diff --git a/xml/page_spiral_sell.xml b/xml/page_spiral_sell.xml new file mode 100644 index 00000000..0bc1e28d --- /dev/null +++ b/xml/page_spiral_sell.xml @@ -0,0 +1,111 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + + Var Timeout = 0 + Var LastMakeSpiralResult = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + GenHashWithTimeStamp SpiralRef + Var Seeker.sprial_product_code = LinkProductCodeAnotherMachine[0] + DEBUGVAR Seeker.sprial_product_code + Var ServiceCredit = Seeker.sprial_product_code + SPIRAL_SELL ServiceCredit SpiralRef + + Var TimeOutSmoothiesProcess = 120 + Var Seeker.SmoothieToPayment = SmoothieToPayment + Var NextSmoothie = 0 + DEBUGVAR Seeker.SmoothieToPayment + + + 1000 + + + Var Timeout = Timeout + 1 + + ; test + ;If Timeout > 10 Then + ; Var LastMakeSpiralResult = 2 + ;EndIf + + DEBUGVAR LastMakeSpiralResult + + If LastMakeSpiralResult = 1 Then + + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralVMName + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + ServiceCredit + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + 1 + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralRemaining + + Var SpiralPayDetail="locker:S:0:" + Var SpiralPayDetail = SpiralPayDetail + SessionID4 + + DEBUGVAR SpiralPayDetail + Var Seeker.sprial_pay_detail = SpiralPayDetail + + If Seeker = "next" Then + Var NextOrder = "true" + Var NextSmoothie = 1 + + Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml" + EndIf + + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" + EndIf + + If LastMakeSpiralResult = 2 Then + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/spiral_pay_fail.ev" + + Open "ROOT/taobin_project/xml/page_spiral_failed.xml" + + EndIf + + If Timeout > 120 Then + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/spiral_pay_fail.ev" + + Open "ROOT/taobin_project/xml/page_spiral_failed.xml" + EndIf + + TimerReset + Refresh + + + + + + + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 7869f973..4ba25dc0 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -7,6 +7,9 @@ SoundVolume ; On open + + RootLayoutVisible 3 "hide" + Var CountDownThankyou = 3 Var CountDownBrewing = BrewTime Var CountUpBrewing = 0 diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index b6d7eeed..ff2773a3 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -8,6 +8,9 @@ ; This page Seeker must curr ; On open + + + Var CountDownThankyou = 4 Var CountDownBrewing = BrewTime Var CountUpBrewing = 0 @@ -49,14 +52,14 @@ EndIf ;inter-image - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var BottomText = PicturePath + "text_bottom_eng.png" Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var BottomText = PicturePath + "text_bottom_eng.png" @@ -116,16 +119,17 @@ Var DirImage = "ROOT/taobin_project/image/complete_en/" EndIf + ;inter-image If LanguageShow = "MYANMAR" Then - Var DirImage = "ROOT/taobin_project/image/complete_mmr/" + Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/" EndIf If LanguageShow = "MSC" Then - Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_msc/" + Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/" EndIf If LanguageShow = "MTC" Then - Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_mtc/" + Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/" EndIf Var txtDrinkOKState = "Invisible" @@ -141,7 +145,13 @@ ;include=ROOT/taobin_project/inc/remove_cup_event_open.inc - SAVELOG "Thank you conti version TCT6" + Var buttonRemoveCup = "Invisible" + + SAVELOG "Thank you conti version TCT7" + SAVELOG "Support NextSmoothie" + + DEBUGVAR NextSmoothie + DEBUGVAR Seeker.SmoothieToPayment ;PendingFlag InternationalEnable ;PendingFlag New_Payment @@ -177,7 +187,7 @@ SAVELOG "Make next order by take-cup with close-maintenance 2" Var error_code_stop_now = 1221 - + If DoorCupPosition = "bottom" Then @@ -190,7 +200,7 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - + Open "ROOT/taobin_project/xml/page_cannotConti.xml " EndIf @@ -201,29 +211,29 @@ SAVELOG "Make next order by take-cup with close-maintenance 3" Var error_code_stop_now = CupErrorCodeForNextOrder - + If DoorCupPosition = "bottom" Then Else Var error_code_stop_now = 1296 __CMD "error-code-1296" 0 "-" "-" - + EndIf If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - + Var LastMakeDrinkResult = "fail" Open "ROOT/taobin_project/xml/page_cannotConti.xml" EndIf ; setvarint Timeout2 888 - + If Timeout2 > 890 Then - + __CMD "cup-error-code" "-" "-" "-" DEBUGVAR CupErrorCodeForNextOrder EndIf @@ -243,7 +253,7 @@ __CMD "check-cup" Seeker.selected_a_drink "-" "-" - ; old condition + ; old condition If HaveCup = "false" Then If MachineStage = "show-menu" Then @@ -272,8 +282,8 @@ DEBUGVAR CountDownThankyou - ; run test; - If CountDownThankyou = 0 Then + ; obsolete + If CountDownThankyou = 99 Then ; reset all var DEBUGVAR MachineStage @@ -288,6 +298,7 @@ If MachineStage = "show-menu" Then If HaveCup = "false" Then + Var LastMakeDrinkResult = "-" If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID @@ -335,18 +346,32 @@ Var MachineState_Result = 0 If MenuReadyForCup = "YES" Then + + ; smoothie next + If NextSmoothie = 1 Then + DEBUGVAR Seeker + DEBUGVAR Seeker.SmoothieToPayment + Var NextSmoothie = 0 + If Seeker.SmoothieToPayment = 1 Then + Var TimeOutSmoothiesProcess = 120 + Var Seeker.SmoothieToPayment = 0 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" + EndIf + EndIf + Var LastMakeDrinkResult = "-" If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf MakeDrinkV1 Seeker.selected_a_drink SelectSugarID - + If CountryName = "Thailand" Then - If New_Payment = 1 Then - Open "ROOT/taobin_project/xml/page_NewBrewing3.xml" + If New_Payment = 1 Then + Open "ROOT/taobin_project/xml/page_NewBrewing3.xml" Else - Open "ROOT/taobin_project/xml/page_brewing3.xml" + Open "ROOT/taobin_project/xml/page_brewing3.xml" EndIf Else @@ -355,12 +380,12 @@ Open Brew3Inter Else ;obsolete - If New_Payment = 1 Then - Open "ROOT/taobin_project/xml/page_NewBrewing3.xml" + If New_Payment = 1 Then + Open "ROOT/taobin_project/xml/page_NewBrewing3.xml" Else - Open "ROOT/taobin_project/xml/page_brewing3.xml" + Open "ROOT/taobin_project/xml/page_brewing3.xml" EndIf - EndIf + EndIf EndIf EndIf @@ -382,6 +407,9 @@ ;include=ROOT/taobin_project/inc/remove_cup_step.inc + If Timeout2 < 3 Then + Var buttonRemoveCup = "Invisible" + EndIf If buttonRemoveCup = "Invisible" Then If show_eng = "true" Then @@ -390,30 +418,30 @@ Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" EndIf ;inter-text - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var MachineErrorDetailAll = " 请拿杯子。" EndIf - If LanguageShow = "MTC" Then + If LanguageShow = "MTC" Then Var MachineErrorDetailAll = " 請拿杯子。" EndIf - Else + Else If CupChecking = "true" Then If show_eng = "true" Then Var MachineErrorDetailAll = " Please take a cup." Else Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" - EndIf + EndIf ;inter-text - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var MachineErrorDetailAll = " 请拿杯子。" EndIf - If LanguageShow = "MTC" Then + If LanguageShow = "MTC" Then Var MachineErrorDetailAll = " 請拿杯子。" EndIf Else @@ -423,25 +451,28 @@ Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ" EndIf ;inter-text - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var MachineErrorDetailAll = " 按按钮取杯子。" EndIf - If LanguageShow = "MTC" Then + If LanguageShow = "MTC" Then Var MachineErrorDetailAll = " 按按鈕取杯子。" EndIf EndIf EndIf + If Timeout2 < 3 Then + Var MachineErrorDetailAll = "..." + EndIf DEBUGVAR MenuReadyForCup If MenuReadyForCup = "YES" Then If DoorCupPosition = "bottom" Then - + Var VideoPlayFile = VideoPath Var VideoPlayFile = VideoPlayFile + VideoFileBegin Var VideoPlayFile = VideoPlayFile + "1" @@ -454,9 +485,9 @@ DEBUGVAR CountDownForShowMenuNextOrderToBrew DEBUGVAR Seeker.selected_a_drink - + If CountDownForShowMenuNextOrderToBrew = 3 Then - + EndIf @@ -475,7 +506,7 @@ Var buttonRemoveCup = "Invisible" Else - + EndIf diff --git a/xml/process/payext_setup.ev b/xml/process/payext_setup.ev index 6026ea70..30a2845f 100644 --- a/xml/process/payext_setup.ev +++ b/xml/process/payext_setup.ev @@ -15,7 +15,7 @@ If Seeker.PayWithQR = 0 Then Var PayO2 = Seeker.CoffeePinNumber EndIf EndIf - +DEBUGVAR Seeker DEBUGVAR TelephoneNumber Var TelephoneNumberExt = TelephoneNumber If TelephoneNumberExt = "" Then @@ -24,3 +24,10 @@ EndIf __CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID Var payOrderChannel = "/XML|" + Seeker.OrderChanel __CMD "SetPayType" Seeker.ORDER_ID payOrderChannel "" + + +DEBUGVAR Seeker.SmoothieToPayment +If Seeker.SmoothieToPayment = 1 Then + SAVELOG "[FROZEN-FRUIT] Set spiral pay detail" + __CMD "SprialPayDetail" Seeker.sprial_pay_detail "-" "-" +EndIf diff --git a/xml/process/spiral_pay_fail.ev b/xml/process/spiral_pay_fail.ev new file mode 100644 index 00000000..34ae6089 --- /dev/null +++ b/xml/process/spiral_pay_fail.ev @@ -0,0 +1,66 @@ +TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev" + +Var SelectDrink = Seeker.selected_a_drink +Var ExtendData = Seeker.ExtendData +Var ServiceAmount2 = Seeker.ServiceAmount2 +Var SessionID2 = SelectSlot + ":" +Var SessionID2 = SessionID2 + ExtendData + +Var CreditReference = Seeker.CreditReferenceTmp +Var VendingDiscount = Seeker.VendingDiscount +Var VendingCampaign = Seeker.VendingCampaign +Var TxReference = Seeker.TxRef1 +Var VendingOrderID = Seeker.ORDER_ID +Var PayType = "newpay" + +Var ServiceType = "coffee-payment" +Var ServiceCredit = SelectDrink +Var SuggestID = "" + +Var PayDetail = "2/S:0/0/" + +Var SessionID4 = MachineSpiralID +Var SessionID4 = SessionID4 + ":" +Var SessionID4 = SessionID4 + MachineSpiralVMName +Var SessionID4 = SessionID4 + ":" +Var SessionID4 = SessionID4 + MachineSpiralSlotID +Var SessionID4 = SessionID4 + ":" +Var SessionID4 = SessionID4 + ServiceCredit +Var SessionID4 = SessionID4 + ":" +Var SessionID4 = SessionID4 + 1 +Var SessionID4 = SessionID4 + ":" +Var SessionID4 = SessionID4 + MachineSpiralRemaining + +Var PayDetail = PayDetail + "|locker:F:" +Var PayDetail = PayDetail + MachineSpiralErrorCode +Var PayDetail = PayDetail + ":" +Var PayDetail = PayDetail + SessionID4 + +Var PayDetail = PayDetail + "/XML|" +Var PayDetail = PayDetail + Seeker.OrderChanel + +If Seeker.CodeChannel = 1 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.VendingCode + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + Seeker.CodeNumber + Var SessionID2 = SessionID2 + "/" + + + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate +Else + + + Var PayDetail2 = Seeker.PayDetail2 + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + +EndIf \ No newline at end of file diff --git a/xml/topview2.xml b/xml/topview2.xml index ddd7bec9..54bb0d6d 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -19,6 +19,7 @@ EndIf If CountryName = "Thailand" Then + Var BtnLangToggleIndex = "Invisible" TRY topview2_script EndIf diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 3be54bd4..1db627af 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -8,6 +8,12 @@ ; On open Machine AndroidTemperatureUpdateNow + DEBUGVAR CH9991_Status + DEBUGVAR CH9992_Status + DEBUGVAR CH9993_Status + DEBUGVAR CH9994_Status + DEBUGVAR GetFreeFromError + Var info_startX = 11 Var info_1Y = 250 Var info_2Y = 320