diff --git a/image/page3_2/bn_appfast2.png b/image/page3_2/bn_appfast2.png new file mode 100644 index 00000000..a1193f90 Binary files /dev/null and b/image/page3_2/bn_appfast2.png differ diff --git a/image/page3_2/bn_cho_ca2.png b/image/page3_2/bn_cho_ca2.png new file mode 100644 index 00000000..6f71040e Binary files /dev/null and b/image/page3_2/bn_cho_ca2.png differ diff --git a/image/page3_2/bn_coffee2.png b/image/page3_2/bn_coffee2.png new file mode 100644 index 00000000..96edea75 Binary files /dev/null and b/image/page3_2/bn_coffee2.png differ diff --git a/image/page3_2/bn_forkid2.png b/image/page3_2/bn_forkid2.png new file mode 100644 index 00000000..393558b5 Binary files /dev/null and b/image/page3_2/bn_forkid2.png differ diff --git a/image/page3_2/bn_health.png b/image/page3_2/bn_health.png new file mode 100644 index 00000000..938e5832 Binary files /dev/null and b/image/page3_2/bn_health.png differ diff --git a/image/page3_2/bn_protein2.png b/image/page3_2/bn_protein2.png new file mode 100644 index 00000000..0089bdef Binary files /dev/null and b/image/page3_2/bn_protein2.png differ diff --git a/image/page3_2/bn_recommend2.png b/image/page3_2/bn_recommend2.png new file mode 100644 index 00000000..ec9b3f95 Binary files /dev/null and b/image/page3_2/bn_recommend2.png differ diff --git a/image/page3_2/bn_sodada2.png b/image/page3_2/bn_sodada2.png new file mode 100644 index 00000000..d2600ee3 Binary files /dev/null and b/image/page3_2/bn_sodada2.png differ diff --git a/image/page3_2/bn_tea2.png b/image/page3_2/bn_tea2.png new file mode 100644 index 00000000..1b47bfac Binary files /dev/null and b/image/page3_2/bn_tea2.png differ diff --git a/image/page3_2/bn_vending2.png b/image/page3_2/bn_vending2.png new file mode 100644 index 00000000..fbf3f407 Binary files /dev/null and b/image/page3_2/bn_vending2.png differ diff --git a/image/page3_2/bp_appfast2.png b/image/page3_2/bp_appfast2.png new file mode 100644 index 00000000..3effe748 Binary files /dev/null and b/image/page3_2/bp_appfast2.png differ diff --git a/image/page3_2/bp_cho_ca2.png b/image/page3_2/bp_cho_ca2.png new file mode 100644 index 00000000..5ba7812f Binary files /dev/null and b/image/page3_2/bp_cho_ca2.png differ diff --git a/image/page3_2/bp_coffee2.png b/image/page3_2/bp_coffee2.png new file mode 100644 index 00000000..ad4c7f6e Binary files /dev/null and b/image/page3_2/bp_coffee2.png differ diff --git a/image/page3_2/bp_forkid2.png b/image/page3_2/bp_forkid2.png new file mode 100644 index 00000000..036f34d7 Binary files /dev/null and b/image/page3_2/bp_forkid2.png differ diff --git a/image/page3_2/bp_health.png b/image/page3_2/bp_health.png new file mode 100644 index 00000000..17c503c3 Binary files /dev/null and b/image/page3_2/bp_health.png differ diff --git a/image/page3_2/bp_protein2.png b/image/page3_2/bp_protein2.png new file mode 100644 index 00000000..25c890a0 Binary files /dev/null and b/image/page3_2/bp_protein2.png differ diff --git a/image/page3_2/bp_recommend2.png b/image/page3_2/bp_recommend2.png new file mode 100644 index 00000000..26cbbc98 Binary files /dev/null and b/image/page3_2/bp_recommend2.png differ diff --git a/image/page3_2/bp_sodada2.png b/image/page3_2/bp_sodada2.png new file mode 100644 index 00000000..68c77129 Binary files /dev/null and b/image/page3_2/bp_sodada2.png differ diff --git a/image/page3_2/bp_tea2.png b/image/page3_2/bp_tea2.png new file mode 100644 index 00000000..68fb5a45 Binary files /dev/null and b/image/page3_2/bp_tea2.png differ diff --git a/image/page3_2/bp_vending2.png b/image/page3_2/bp_vending2.png new file mode 100644 index 00000000..4ba98fdb Binary files /dev/null and b/image/page3_2/bp_vending2.png differ diff --git a/image/page3_2_en/bn_appfast2.png b/image/page3_2_en/bn_appfast2.png new file mode 100644 index 00000000..ff81f4ef Binary files /dev/null and b/image/page3_2_en/bn_appfast2.png differ diff --git a/image/page3_2_en/bn_cho_ca2.png b/image/page3_2_en/bn_cho_ca2.png new file mode 100644 index 00000000..39a10ad9 Binary files /dev/null and b/image/page3_2_en/bn_cho_ca2.png differ diff --git a/image/page3_2_en/bn_coffee2.png b/image/page3_2_en/bn_coffee2.png new file mode 100644 index 00000000..4a616efb Binary files /dev/null and b/image/page3_2_en/bn_coffee2.png differ diff --git a/image/page3_2_en/bn_forkid2.png b/image/page3_2_en/bn_forkid2.png new file mode 100644 index 00000000..c21eeea6 Binary files /dev/null and b/image/page3_2_en/bn_forkid2.png differ diff --git a/image/page3_2_en/bn_health.png b/image/page3_2_en/bn_health.png new file mode 100644 index 00000000..880df7ef Binary files /dev/null and b/image/page3_2_en/bn_health.png differ diff --git a/image/page3_2_en/bn_protein2.png b/image/page3_2_en/bn_protein2.png new file mode 100644 index 00000000..7001eadb Binary files /dev/null and b/image/page3_2_en/bn_protein2.png differ diff --git a/image/page3_2_en/bn_recommend2.png b/image/page3_2_en/bn_recommend2.png new file mode 100644 index 00000000..b6e62aad Binary files /dev/null and b/image/page3_2_en/bn_recommend2.png differ diff --git a/image/page3_2_en/bn_sodada2.png b/image/page3_2_en/bn_sodada2.png new file mode 100644 index 00000000..bf09fbba Binary files /dev/null and b/image/page3_2_en/bn_sodada2.png differ diff --git a/image/page3_2_en/bn_tea2.png b/image/page3_2_en/bn_tea2.png new file mode 100644 index 00000000..a94c9ee8 Binary files /dev/null and b/image/page3_2_en/bn_tea2.png differ diff --git a/image/page3_2_en/bn_vending2.png b/image/page3_2_en/bn_vending2.png new file mode 100644 index 00000000..84cf0116 Binary files /dev/null and b/image/page3_2_en/bn_vending2.png differ diff --git a/image/page3_2_en/bp_appfast2.png b/image/page3_2_en/bp_appfast2.png new file mode 100644 index 00000000..92d992e1 Binary files /dev/null and b/image/page3_2_en/bp_appfast2.png differ diff --git a/image/page3_2_en/bp_cho_ca2.png b/image/page3_2_en/bp_cho_ca2.png new file mode 100644 index 00000000..b7f97c8a Binary files /dev/null and b/image/page3_2_en/bp_cho_ca2.png differ diff --git a/image/page3_2_en/bp_coffee2.png b/image/page3_2_en/bp_coffee2.png new file mode 100644 index 00000000..0e2dd8fa Binary files /dev/null and b/image/page3_2_en/bp_coffee2.png differ diff --git a/image/page3_2_en/bp_forkid2.png b/image/page3_2_en/bp_forkid2.png new file mode 100644 index 00000000..82540c15 Binary files /dev/null and b/image/page3_2_en/bp_forkid2.png differ diff --git a/image/page3_2_en/bp_health.png b/image/page3_2_en/bp_health.png new file mode 100644 index 00000000..1ce667f1 Binary files /dev/null and b/image/page3_2_en/bp_health.png differ diff --git a/image/page3_2_en/bp_protein2.png b/image/page3_2_en/bp_protein2.png new file mode 100644 index 00000000..6a5f3196 Binary files /dev/null and b/image/page3_2_en/bp_protein2.png differ diff --git a/image/page3_2_en/bp_recommend2.png b/image/page3_2_en/bp_recommend2.png new file mode 100644 index 00000000..2891b339 Binary files /dev/null and b/image/page3_2_en/bp_recommend2.png differ diff --git a/image/page3_2_en/bp_sodada2.png b/image/page3_2_en/bp_sodada2.png new file mode 100644 index 00000000..926d9c0f Binary files /dev/null and b/image/page3_2_en/bp_sodada2.png differ diff --git a/image/page3_2_en/bp_tea2.png b/image/page3_2_en/bp_tea2.png new file mode 100644 index 00000000..134e6a51 Binary files /dev/null and b/image/page3_2_en/bp_tea2.png differ diff --git a/image/page3_2_en/bp_vending2.png b/image/page3_2_en/bp_vending2.png new file mode 100644 index 00000000..edfde762 Binary files /dev/null and b/image/page3_2_en/bp_vending2.png differ diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml new file mode 100644 index 00000000..f23cd9de --- /dev/null +++ b/xml/menu_catalog_new.xml @@ -0,0 +1,506 @@ + + + 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 + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + diff --git a/xml/page_catalog_group_appfast.skt b/xml/page_catalog_group_appfast.skt index d4e3ab8e..341a5420 100644 --- a/xml/page_catalog_group_appfast.skt +++ b/xml/page_catalog_group_appfast.skt @@ -1,5 +1,6 @@ @@ -51,7 +52,13 @@ diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index e7004853..87f48d2c 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -274,6 +274,7 @@ If PaySuccessWithDaemonTask = 1 Then Else + Var LastMakeDrinkResult = "-" MakeDrinkV1 Seeker.selected_a_drink SelectSugarID EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 8187ec19..cc0e7811 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.62" - Var XMLPageVersionInt = 662 + Var XMLPageVersion = "6.63" + Var XMLPageVersionInt = 663