diff --git a/image/new_vending_info/0.png b/image/new_vending_info/0.png new file mode 100644 index 00000000..6b096a5e Binary files /dev/null and b/image/new_vending_info/0.png differ diff --git a/image/new_vending_info/1.png b/image/new_vending_info/1.png new file mode 100644 index 00000000..5d964b61 Binary files /dev/null and b/image/new_vending_info/1.png differ diff --git a/image/new_vending_info/2.png b/image/new_vending_info/2.png new file mode 100644 index 00000000..089ccbc4 Binary files /dev/null and b/image/new_vending_info/2.png differ diff --git a/image/new_vending_info/3.png b/image/new_vending_info/3.png new file mode 100644 index 00000000..c89374f7 Binary files /dev/null and b/image/new_vending_info/3.png differ diff --git a/image/new_vending_info/4.png b/image/new_vending_info/4.png new file mode 100644 index 00000000..9dc2a224 Binary files /dev/null and b/image/new_vending_info/4.png differ diff --git a/image/new_vending_info/5.png b/image/new_vending_info/5.png new file mode 100644 index 00000000..5e0a7db8 Binary files /dev/null and b/image/new_vending_info/5.png differ diff --git a/image/new_vending_info/6.png b/image/new_vending_info/6.png new file mode 100644 index 00000000..8003f93a Binary files /dev/null and b/image/new_vending_info/6.png differ diff --git a/image/new_vending_info/7.png b/image/new_vending_info/7.png new file mode 100644 index 00000000..413eb99c Binary files /dev/null and b/image/new_vending_info/7.png differ diff --git a/image/new_vending_info/8.png b/image/new_vending_info/8.png new file mode 100644 index 00000000..de0e52a8 Binary files /dev/null and b/image/new_vending_info/8.png differ diff --git a/image/new_vending_info/9.png b/image/new_vending_info/9.png new file mode 100644 index 00000000..7891342c Binary files /dev/null and b/image/new_vending_info/9.png differ diff --git a/image/new_vending_info/Backspace.png b/image/new_vending_info/Backspace.png new file mode 100644 index 00000000..effdb3e4 Binary files /dev/null and b/image/new_vending_info/Backspace.png differ diff --git a/image/new_vending_info/Enter key.png b/image/new_vending_info/Enter key.png new file mode 100644 index 00000000..cabce8a6 Binary files /dev/null and b/image/new_vending_info/Enter key.png differ diff --git a/image/new_vending_info/Left shift.png b/image/new_vending_info/Left shift.png new file mode 100644 index 00000000..ded40b28 Binary files /dev/null and b/image/new_vending_info/Left shift.png differ diff --git a/image/new_vending_info/QuickTest.png b/image/new_vending_info/QuickTest.png new file mode 100644 index 00000000..79eea977 Binary files /dev/null and b/image/new_vending_info/QuickTest.png differ diff --git a/image/new_vending_info/arrow_back.png b/image/new_vending_info/arrow_back.png new file mode 100644 index 00000000..ddcbdb5f Binary files /dev/null and b/image/new_vending_info/arrow_back.png differ diff --git a/image/new_vending_info/cancel.png b/image/new_vending_info/cancel.png new file mode 100644 index 00000000..6039f1ae Binary files /dev/null and b/image/new_vending_info/cancel.png differ diff --git a/image/new_vending_info/confirm.png b/image/new_vending_info/confirm.png new file mode 100644 index 00000000..81dfb6e1 Binary files /dev/null and b/image/new_vending_info/confirm.png differ diff --git a/image/new_vending_info/exit_button.png b/image/new_vending_info/exit_button.png new file mode 100644 index 00000000..b2567854 Binary files /dev/null and b/image/new_vending_info/exit_button.png differ diff --git a/image/new_vending_info/get_acc_btn.png b/image/new_vending_info/get_acc_btn.png new file mode 100644 index 00000000..76ef36fa Binary files /dev/null and b/image/new_vending_info/get_acc_btn.png differ diff --git a/image/new_vending_info/info_table_template.png b/image/new_vending_info/info_table_template.png new file mode 100644 index 00000000..4b823e5e Binary files /dev/null and b/image/new_vending_info/info_table_template.png differ diff --git a/image/new_vending_info/nav-bar-mid.png b/image/new_vending_info/nav-bar-mid.png new file mode 100644 index 00000000..2520f868 Binary files /dev/null and b/image/new_vending_info/nav-bar-mid.png differ diff --git a/image/new_vending_info/password_prompt.png b/image/new_vending_info/password_prompt.png new file mode 100644 index 00000000..93ceceaa Binary files /dev/null and b/image/new_vending_info/password_prompt.png differ diff --git a/image/new_vending_info/password_prompt_ext.png b/image/new_vending_info/password_prompt_ext.png new file mode 100644 index 00000000..02b506e4 Binary files /dev/null and b/image/new_vending_info/password_prompt_ext.png differ diff --git a/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml b/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml index 529c13d4..0706e9b2 100644 --- a/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml +++ b/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml @@ -30,11 +30,15 @@ DEBUGVAR Seeker.CodeChannel Var Seeker.UseProThaiTeaCode = 1 Var Seeker.ProThaiTea = 1 - Else + Else Var Seeker.ProThaiTea = 1 Var Seeker.UseProThaiTeaCode = 0 DEBUGVAR Seeker.ProThaiTea DEBUGVAR Seeker.UseProThaiTeaCode + + ; support-for-multi-pro-with-same-cid + Var param1 = "702" + AddData Cid TelephoneNumber param1 param2 param3 EndIf EndIf diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index 00f0fa32..759f379a 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -1,4 +1,4 @@ -; malaysia +; malaysia ;DEBUGVAR SystemDateMonthInt @@ -24,8 +24,13 @@ If SystemDateMonthInt = 6 Then EndIf EndIf + If SystemDateMonthInt = 7 Then - If SystemDateDayInt < 16 Then + Var ProThaiTeaEnable = 1 +EndIf + +If SystemDateMonthInt = 8 Then + If SystemDateDayInt < 31 Then Var ProThaiTeaEnable = 1 Else Var ProThaiTeaEnable = 0 @@ -34,4 +39,4 @@ EndIf If BoxID = 177746 Then Var ProThaiTeaEnable = 1 -EndIf \ No newline at end of file +EndIf diff --git a/inter/mys/xml/page_catalog_group_pro_thai_tea.lxml b/inter/mys/xml/page_catalog_group_pro_thai_tea.lxml index adb9d5d7..b3327854 100644 --- a/inter/mys/xml/page_catalog_group_pro_thai_tea.lxml +++ b/inter/mys/xml/page_catalog_group_pro_thai_tea.lxml @@ -1,613 +1,613 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - 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/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - Var FromProThaiTea = 0 - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - 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 - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - - DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en/" - Var ice_tab_text = "Ice will be ready at " - EndIf - - SAVELOG "EventLanguageOnChange menu -list" - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 400 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - RefreshAll - - - -; 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 - - - - - - - - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 - 462 - 22 - 170 - 30 - KanitMediumTTF - 0x6F5F51 - PriceUnitText - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + 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/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + Var FromProThaiTea = 0 + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + 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 + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en/" + Var ice_tab_text = "Ice will be ready at " + EndIf + + SAVELOG "EventLanguageOnChange menu -list" + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + + +; 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 + + + + + + + + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 940 + 462 + 22 + 170 + 30 + KanitMediumTTF + 0x6F5F51 + PriceUnitText + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + 10 497 @@ -726,6 +726,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromProThaiTea = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1000,7 +1001,8 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 - + Var FromProThaiTea = 1 + Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1274,6 +1276,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromProThaiTea = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1548,6 +1551,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromProThaiTea = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1822,6 +1826,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromProThaiTea = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2096,6 +2101,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromProThaiTea = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2370,6 +2376,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromProThaiTea = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2644,6 +2651,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromProThaiTea = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2918,6 +2926,7 @@ DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var FromProThaiTea = 1 Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -3100,9 +3109,9 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - + + + + + + diff --git a/xml/page_board.xml b/xml/page_board.xml index 4ba34049..837532de 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1053,15 +1053,38 @@ Var GetNamHomCoconutRemainReward = 0 Var NamHomCoconutRemainReward_Y = 1071 Var NamHomCoconutRemainRewardNumber_Y = 1130 + Var dummyPhone = "089999999" + + If GetNamHomCoconutRemainRewardLastTime = "" Then + Var GetNamHomCoconutRemainRewardLastTime = 0 + EndIf + DEBUGVAR NamHomCoconutPro DEBUGVAR CurrentMainVideo If NamHomCoconutPro = 1 Then If CurrentMainVideo = 2 Then Var ShouldShowNamHomCoconutRemainReward = 1 + DEBUGVAR GetNamHomCoconutRemainRewardLastTime + DEBUGVAR SystemTimeMinuteInt + Var TimeDiff = SystemTimeMinuteInt - GetNamHomCoconutRemainRewardLastTime + DEBUGVAR TimeDiff + If TimeDiff >= 15 Then + DEBUGVAR "update nam hom coconut remain reward!!!" + DEBUGVAR GetNamHomCoconutRemainReward + If GetNamHomCoconutRemainReward = 0 Then + GETACCEXT dummyPhone 34 + Var GetNamHomCoconutRemainReward = 1 + EndIf + Else + If TimeDiff <= -15 Then + DEBUGVAR "update nam hom coconut remain reward!!!" + If GetNamHomCoconutRemainReward = 0 Then + GETACCEXT dummyPhone 34 + Var GetNamHomCoconutRemainReward = 1 + EndIf + EndIf + EndIf EndIf - Var GetNamHomCoconutRemainReward = 1 - Var dummy_phone = "089999999" - GETACCEXT dummy_phone 34 EndIf If EnergyDrink1BathPro = 1 Then @@ -1140,6 +1163,7 @@ Var NamHomCoconutRemainReward = SumNamHomCoconutRemainReward DEBUGVAR NamHomCoconutRemainReward + Var GetNamHomCoconutRemainRewardLastTime = SystemTimeMinuteInt EndIf EndIf diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 67873cc2..09850540 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -114,7 +114,7 @@ Var QRCODE8 = "" Var CountStepPackPayment = 0 - Var CountStepForCupFlagDelay = 1 + Var CountStepForCupFlagDelay = 0 Var VendingBank = "other" Var ReqPayInfoFromCashOther = 0 @@ -436,7 +436,7 @@ ; mys pro thai tea If FromProThaiTea = 1 Then - Var Seeker.VendingCode = "RM0" + Var Seeker.VendingCode = "TT1F1" Var Seeker.FreeVendingCampaign = 0 EndIf @@ -528,8 +528,6 @@ ; Var CountStepPackPayment = CountStepPackPayment + 1 ;EndIf - Var CountStepPackPayment = 1 - DEBUGVAR Seeker DEBUGVAR HaveCup ;DEBUGVAR CupChecking @@ -561,6 +559,7 @@ Var CoinAmount = 0 Else If NOCashFlag = 0 Then + SAVELOG "CoinVending XBILL from page_payment" CoinVending XBILL Else Var CoinAmount = 0 @@ -588,7 +587,7 @@ DEBUGVAR Seeker DEBUGVAR Seeker.ExtendData - + Var CountStepPackPayment = 1 EndIf If Delay = 1 Then diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 0f616571..768e1017 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -1049,11 +1049,6 @@ Var ReqPayInfoFromCashOther = 0 EndIf - If ReqPayInfoFromCashOther = 2 Then - Var alphaState = "Enable" - Var ReqPayInfoFromCashOther = 0 - EndIf - DEBUGVAR MenuCautionImageStage0 @@ -2649,13 +2644,12 @@ Var alphaState = "Enable" Coin CARD Var ReqPayInfoFromCashOther = 2 - Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf EndIf EndIf - + Refresh @@ -2834,7 +2828,12 @@ ;CoinVending ON ;VendingQR OFF - CashlessReq OFF + DEBUGVAR ReqPayInfoFromCashOther + + If ReqPayInfoFromCashOther = 2 Then + DEBUGVAR "CashlessReq OFF by user" + CashlessReq OFF + EndIf If CashlessPayFlag = 1 Then Var CashlessPayFlag = 0 diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 098ee2c3..6e2ef0ac 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -46,11 +46,11 @@ Var info_text_13Y = info_13Y + 18 Var info_text_14Y = info_14Y + 18 - + Var info2_startX = 550 Var info2_text_startX = info2_startX + 22 - + Var temphot = "น้ำร้อน องศา " Var temphot = temphot + BrewTemp Var temphot = temphot + " C" @@ -64,16 +64,16 @@ Else Var tempice = tempice + " เต็มถัง " EndIf - - Var configfile = "CFG = " + ConfigNumer + + Var configfile = "CFG = " + ConfigNumer Var ice_version_text = " ICE version " + IceVersion Var brew_version_text = "Server status " + NetworkStatus - Var show_version = brew_version_text + Var show_version = brew_version_text - Var show_boxid = "[ " + BoxID + Var show_boxid = "[ " + BoxID Var show_boxid = show_boxid + " ]" Var ShowVersionAll = BrewMachineFirmwareVersion + " | " @@ -86,7 +86,7 @@ Var Timeout = 0 Var IDFullNameEng = "เสียบบัตร แล้วกดอ่าน " - Var Text1_6 = "Door/Lid/Straw : " + Service_LidStraw + Var Text1_6 = "Door/Lid/Straw : " + Service_LidStraw Var Text2_6 = "ฝา : " + Lid1Status var Text1_7 = "CellSite :" + CellSite @@ -95,10 +95,10 @@ var Text2_7 = Text2_7 + SignalStrengthLevel var Text2_7 = Text2_7 + "]" - + Cart "DeleteMenuID" "ALL" - + Var Text1_8 = "IP " + MobileIPNetwork @@ -136,7 +136,7 @@ Var AndroidBoardTempMax = AndroidBoardTemp15 Else Var AndroidBoardTempMax = AndroidBoardTemp16 - EndIf + EndIf Var Text2_9 = "CPUH: " Var Text2_9 = Text2_9 + AndroidBoardTempMax @@ -150,21 +150,21 @@ DEBUGVAR AndroidTouchScreenHeartBeat - + Var CanResetTouch = 0 Var CountDownReset = 0 Var strTouchScreen = " Reset Touch : disable." - + Var MainMenuBlockCount = 2 1000 - + Var Timeout = Timeout + 1 If Timeout > 15 Then - Open "ROOT/taobin_project/xml/page_board.xml" + Open "ROOT/taobin_project/xml/page_board.xml" EndIf If GoToCamera = 1 Then @@ -177,10 +177,10 @@ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" EndIf - If GoToCamera > 0 Then + If GoToCamera > 0 Then Var GoToCamera = GoToCamera - 1 - EndIf + EndIf DEBUGVAR AdvertiseProfile @@ -203,11 +203,11 @@ Var CountDownCheckCamera = 5 If Not#CameraSettingStatus = "" Then If CameraCount = 1 Then - + CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.65" EndIf EndIf - Else + Else Var CountDownCheckCamera = CountDownCheckCamera - 1 EndIf @@ -232,7 +232,7 @@ Var AndroidBoardTempMax = AndroidBoardTemp15 Else Var AndroidBoardTempMax = AndroidBoardTemp16 - EndIf + EndIf Var Text2_9 = "CPUH: " Var Text2_9 = Text2_9 + AndroidBoardTempMax @@ -256,12 +256,12 @@ Var strTouchScreen = " Reset Touch : " + CountDownReset Var CanResetTouch = 1 EndIf - EndIf + EndIf Refresh TimerReset - - + + @@ -331,34 +331,34 @@ DEBUGVAR str_sim_on If str_sim_on = "1" Then ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" - + TopView "show" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" EndIf - + READ_FILE "/mnt/sdcard/coffeevending/.test_menu" str_test_menu DEBUGVAR str_test_menu If str_test_menu = "1" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" - + TopView "show" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" EndIf - + If CountTouchButton = 7 Then ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" - + TopView "show" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" @@ -410,7 +410,7 @@ ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_camera.xml" - + ;TopView "show" ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" @@ -594,11 +594,11 @@ info1_startX info_8Y "ROOT/taobin_project/image/tab_1.png" - + CameraService "filter-remove-all" CameraService "add-filter=mClass=9,mSubclass=4" CameraService "add-filter=USB Camera" - + CameraService "Start" @@ -608,11 +608,11 @@ info2_startX info_8Y "ROOT/taobin_project/image/tab_1.png" - + If CameraCount = 1 Then - + CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0" EndIf @@ -645,7 +645,7 @@ info1_startX info_9Y "ROOT/taobin_project/image/tab_1.png" - + @@ -654,7 +654,7 @@ info2_startX info_9Y "ROOT/taobin_project/image/tab_1.png" - + @@ -682,7 +682,7 @@ info1_startX info_10Y "ROOT/taobin_project/image/tab_1.png" - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" OpenInst 2 "ROOT/taobin_project/xml/page_identity_verification.xml" @@ -705,8 +705,8 @@ info2_startX info_10Y "ROOT/taobin_project/image/tab_1.png" - - + + ;Open "ROOT/taobin_project/xml/test_qr.xml" @@ -718,7 +718,7 @@ info2_startX info_11Y "ROOT/taobin_project/image/tab_1.png" - + ; reset If CountTouchButton > 4 Then Var CountTouchButton = 0 @@ -735,7 +735,7 @@ Var ACCString !assigned SprintFmt("ACC: "%s"\r\n", TelephoneNumber) DEBUGVAR ACCString - + If show_eng = "true" Then Var LangString = "LANG: "EN"\r\n" Else @@ -762,7 +762,7 @@ Var GameInstalled = "-" CheckApp "com.NDF.taobin" GameInstalled DEBUGVAR GameInstalled - + If GameInstalled = "true" Then RunApp "com.NDF.taobin" EndIf @@ -788,7 +788,7 @@ info1_startX info_11Y "ROOT/taobin_project/image/tab_1.png" - + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" OpenInst 2 "ROOT/taobin_project/xml/sometime/top_spender.xml" @@ -813,7 +813,7 @@ info1_startX info_12Y "ROOT/taobin_project/image/tab_1.png" - + If CanResetTouch = 1 Then ResetTouch @@ -844,8 +844,8 @@ Var return = "Invisible" EndIf ) - - + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_enable_credit_card.xml" @@ -866,7 +866,41 @@ ) "Enable CreditCard" - + +;EnableNewBrewUI + + info2_startX + info_13Y + "ROOT/taobin_project/image/tab_1.png" + eval( + If EnableNewBrewUI = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/vending_info2.xml" + + + + + + info2_text_startX + info_text_13Y + 30 + fontType1 + 0x000000 + eval( + If EnableNewBrewUI = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "New ui V2" + ; ; 930 @@ -888,8 +922,8 @@ "ROOT/taobin_project/image/bp_cancel.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - Open "ROOT/taobin_project/xml/page_board.xml" + + Open "ROOT/taobin_project/xml/page_board.xml" diff --git a/xml/vending_info2.xml b/xml/vending_info2.xml new file mode 100644 index 00000000..903ac35e --- /dev/null +++ b/xml/vending_info2.xml @@ -0,0 +1,909 @@ + + + 1080 + 1312 + SoundVolume + "0x2c2928" + + ; On open + Machine AndroidTemperatureUpdateNow + + Var info_startX = 11 + Var info_1Y = 250 + Var info_2Y = 320 + Var info_3Y = 390 + Var info_4Y = 460 + Var info_5Y = 530 + Var info_6Y = 600 + Var info_7Y = 670 + Var info_8Y = 740 + Var info_9Y = 810 + + Var info_10Y = 880 + Var info_11Y = 950 + Var info_12Y = 1020 + Var info_13Y = 1090 + + Var info_14Y = 1160 + + Var info_cancel_y = info_14Y + 50 + + + Var info_text_startX = info_startX + 22 + Var info_text_1Y = info_1Y + 18 + Var info_text_2Y = info_2Y + 18 + Var info_text_3Y = info_3Y + 18 + Var info_text_4Y = info_4Y + 18 + Var info_text_5Y = info_5Y + 18 + Var info_text_6Y = info_6Y + 18 + Var info_text_7Y = info_7Y + 18 + Var info_text_8Y = info_8Y + 18 + Var info_text_9Y = info_9Y + 18 + + Var info_text_10Y = info_10Y + 18 + Var info_text_11Y = info_11Y + 18 + Var info_text_12Y = info_12Y + 18 + Var info_text_13Y = info_13Y + 18 + + Var info_text_14Y = info_14Y + 18 + + + Var info2_startX = 550 + Var info2_text_startX = info2_startX + 22 + + Var temphot = "น้ำร้อน องศา " + Var temphot = temphot + BrewTemp + Var temphot = temphot + " C" + + Var tempice = "น้าแข็ง องศา " + Var tempice = tempice + IceTemp + Var tempice = tempice + " C " + + If IceFull = 0 Then + Var tempice = tempice + " ไม่เต็ม " + Else + Var tempice = tempice + " เต็มถัง " + EndIf + + Var configfile = "CFG = " + ConfigNumer + + + Var ice_version_text = " ICE version " + IceVersion + Var brew_version_text = "Server status " + NetworkStatus + + Var show_version = brew_version_text + + Var show_boxid = "[ " + BoxID + Var show_boxid = show_boxid + " ]" + + Var ShowVersionAll = BrewMachineFirmwareVersion + " | " + Var ShowVersionAll = ShowVersionAll + XMLPageVersion + Var ShowVersionAll = ShowVersionAll + " | " + Var ShowVersionAll = ShowVersionAll + JXMLVersion + + Var IDCardState = "Invisible" + + Var Timeout = 0 + Var IDFullNameEng = "เสียบบัตร แล้วกดอ่าน " + + Var Text1_6 = "Door/Lid/Straw : " + Service_LidStraw + Var Text2_6 = "ฝา : " + Lid1Status + + var Text1_7 = "CellSite :" + CellSite + var Text2_7 = "ระดับสัญญาณ :" + SignalStrengthStr + var Text2_7 = Text2_7 + " [" + var Text2_7 = Text2_7 + SignalStrengthLevel + var Text2_7 = Text2_7 + "]" + + + Cart "DeleteMenuID" "ALL" + + + Var Text1_8 = "IP " + MobileIPNetwork + + + Var Text1_10 = "Spiral=" + SpiralStatus1 + Var Text1_10 = Text1_10 + " Err=" + Var Text1_10 = Text1_10 + SpiralErrcause1 + + + Var Text2_10 = "Spiral=" + SpiralStatus2 + Var Text2_10 = Text2_10 + " Err=" + Var Text2_10 = Text2_10 + SpiralErrcause2 + + Var GoToCamera = 0 + + DEBUGVAR AndroidBoardTemp10 + + Var android_text3_1 = "CPUL: " + Var android_text3_1 = android_text3_1 + AndroidBoardTemp11 + + Var android_text3_2 = "GPU: " + Var android_text3_2 = android_text3_2 + AndroidBoardTemp18 + + Var AndroidBoardTempMax = AndroidBoardTemp13 + If AndroidBoardTempMax > AndroidBoardTemp14 Then + Var AndroidBoardTempMax = AndroidBoardTemp13 + Else + Var AndroidBoardTempMax = AndroidBoardTemp14 + EndIf + If AndroidBoardTempMax > AndroidBoardTemp15 Then + Var AndroidBoardTempMax = AndroidBoardTemp14 + Else + Var AndroidBoardTempMax = AndroidBoardTemp15 + EndIf + If AndroidBoardTempMax > AndroidBoardTemp16 Then + Var AndroidBoardTempMax = AndroidBoardTemp15 + Else + Var AndroidBoardTempMax = AndroidBoardTemp16 + EndIf + + Var Text2_9 = "CPUH: " + Var Text2_9 = Text2_9 + AndroidBoardTempMax + Var Text2_9 = Text2_9 + "," + Var Text2_9 = Text2_9 + android_text3_1 + Var Text2_9 = Text2_9 + "," + Var Text2_9 = Text2_9 + android_text3_2 + + + Var strCountryName = " " + CountryName + + DEBUGVAR AndroidTouchScreenHeartBeat + + + Var CanResetTouch = 0 + Var CountDownReset = 0 + Var strTouchScreen = " Reset Touch : disable." + + + Var MainMenuBlockCount = 2 + + Var PassPhrase = "" + Var showStatusText = "" + + Var alphaPasswordPrompt = "Invisible" + Var alphaPasswordPromptWithKeyboard = "Invisible" + + Var ClickOn = "" + + + + 1000 + + + + Var Timeout = Timeout + 1 + If Timeout > 15 Then + Open "ROOT/taobin_project/xml/page_board.xml" + EndIf + + DEBUGVAR PasswordOK + DEBUGVAR WaitPasswordCheck + + If PasswordOK = 1 Then + Var Timeout = 20 + Var PasswordOK = 0 + + Var alphaPasswordPromptWithKeyboard = "Invisible" + Var alphaPasswordPrompt = "Invisible" + + Var PassPhrase = "" + + If ClickOn = "GetAccess" Then + ;MainMenu + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" + EndIf + + If ClickOn = "QuickTest" Then + ;open + EndIf + + EndIf + + + + If WaitPasswordCheck = 1 Then + If PasswordOK = 1 Then + + Else + + __CMD "check-password-wait" "-" "-" "-" + + EndIf + + EndIf + + + + + If GoToCamera = 1 Then + Var NextPage = "-" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_camera.xml" + + + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + EndIf + + If GoToCamera > 0 Then + Var GoToCamera = GoToCamera - 1 + + EndIf + + DEBUGVAR AdvertiseProfile + + Var Text1_8 = "IP " + MobileIPNetwork + + Var Text2_8 = "Camera " + CameraCount + + Var Text1_9 = SystemTime + Var Text1_9 = Text1_9 + " " + Var Text1_9 = Text1_9 + SystemDate + + Var skr = "curr" + DEBUGVAR skr.NOBONUS + + Var skr = "next" + DEBUGVAR skr.NOBONUS + + DEBUGVAR Not#CameraSettingStatus + If CountDownCheckCamera = 0 Then + Var CountDownCheckCamera = 5 + If Not#CameraSettingStatus = "" Then + If CameraCount = 1 Then + + CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.65" + EndIf + EndIf + Else + Var CountDownCheckCamera = CountDownCheckCamera - 1 + EndIf + + Var android_text3_1 = "CPUL: " + Var android_text3_1 = android_text3_1 + AndroidBoardTemp11 + + Var android_text3_2 = "GPU: " + Var android_text3_2 = android_text3_2 + AndroidBoardTemp18 + + Var AndroidBoardTempMax = AndroidBoardTemp13 + If AndroidBoardTempMax > AndroidBoardTemp14 Then + Var AndroidBoardTempMax = AndroidBoardTemp13 + Else + Var AndroidBoardTempMax = AndroidBoardTemp14 + EndIf + If AndroidBoardTempMax > AndroidBoardTemp15 Then + Var AndroidBoardTempMax = AndroidBoardTemp14 + Else + Var AndroidBoardTempMax = AndroidBoardTemp15 + EndIf + If AndroidBoardTempMax > AndroidBoardTemp16 Then + Var AndroidBoardTempMax = AndroidBoardTemp15 + Else + Var AndroidBoardTempMax = AndroidBoardTemp16 + EndIf + + Var Text2_9 = "CPUH: " + Var Text2_9 = Text2_9 + AndroidBoardTempMax + Var Text2_9 = Text2_9 + "," + Var Text2_9 = Text2_9 + android_text3_1 + Var Text2_9 = Text2_9 + "," + Var Text2_9 = Text2_9 + android_text3_2 + + + + + If AndroidTouchScreenHeartBeat = "-" Then + Var strTouchScreen = " Reset Touch : Disable." + Else + DEBUGVAR CountDownReset + If CountDownReset = 0 Then + Var strTouchScreen = " Reset Touch : " + AndroidTouchScreenHeartBeat + Var CanResetTouch = 1 + Else + Var Timeout = 0 + Var strTouchScreen = " Reset Touch : " + CountDownReset + Var CanResetTouch = 1 + EndIf + EndIf + + Refresh + TimerReset + + + + + + + + +; table + + 300 + 18 + 575 + 480 + SoundVolume + "ROOT/taobin_project/image/new_vending_info/info_table_template.png" + + +; machine-id + + 540 + 150 + 19 + fontType1 + 0xe2e2e2 + BoxID + + +; Date + + 540 + 195 + 19 + fontType1 + 0xe2e2e2 + Text1_9 + + +; country + + 540 + 230 + 19 + fontType1 + 0xe2e2e2 + strCountryName + + + +; IP + + 540 + 270 + 19 + fontType1 + 0xe2e2e2 + MobileIPNetwork + + +; cfg + + 540 + 315 + 19 + fontType1 + 0xe2e2e2 + ConfigNumer + + +; software-ver + + 540 + 355 + 19 + fontType1 + 0xe2e2e2 + ShowVersionAll + + +;cell-site + + 540 + 395 + 19 + fontType1 + 0xe2e2e2 + CellSite + + + +;signal + + 540 + 420 + 19 + fontType1 + 0xe2e2e2 + SignalStrengthLevel + + + + + + + + + + + Var IDCardState = "Enable" + + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + DEBUGVAR IDFullNameEng + + + SAVELOG IDFullNameEng + + +; /mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/ + +; show-pop + + + + + +; keyboard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 500 + 800 + End + 24 + alphaPasswordPromptWithKeyboard + RobotoBlack + 0xE2E2E2 + "Enable" + PassPhrase + + + diff --git a/xml/vending_tasks_pre_main.xml b/xml/vending_tasks_pre_main.xml new file mode 100644 index 00000000..e61bab1c --- /dev/null +++ b/xml/vending_tasks_pre_main.xml @@ -0,0 +1,36 @@ + + 1080 + 1312 + SoundVolume + "0x2c2928" + +; header + + 0 + 0 + 80 + 1080 + SoundVolume + "ROOT/taobin_project/image/new_vending_info/nav-bar-mid.png" + + +;back + + +;task + + + + \ No newline at end of file