diff --git a/image/page_doing_inter/bg_show_time_remaining.png b/image/page_doing_inter/bg_show_time_remaining.png new file mode 100644 index 00000000..1f941476 Binary files /dev/null and b/image/page_doing_inter/bg_show_time_remaining.png differ diff --git a/xml/menu_new_layout_gen_v2.py b/xml/menu_new_layout_gen_v2.py index d1b6c59c..dc3cb3e5 100644 --- a/xml/menu_new_layout_gen_v2.py +++ b/xml/menu_new_layout_gen_v2.py @@ -6,12 +6,14 @@ idx_name = 0 idx_desc = 1 idx_img = 2 - idx_hot_product_code = 5 - idx_cold_product_code = 6 - idx_blend_product_code = 7 - idx_hot_product_code2 = 8 - idx_cold_product_code2 = 9 - idx_blend_product_code2 = 10 + + + idx_hot_product_code = 6 + idx_cold_product_code = idx_hot_product_code + 1 + idx_blend_product_code = idx_cold_product_code + 1 + idx_hot_product_code2 = idx_blend_product_code + 1 + idx_cold_product_code2 = idx_hot_product_code2 + 1 + idx_blend_product_code2 = idx_cold_product_code2 + 1 idx_of_eng = 2 idx_of_eng_des = 3 idx_of_thai = 0 diff --git a/xml/page_board.xml b/xml/page_board.xml index 72156e9b..173060e0 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -534,7 +534,7 @@ ;READ_FILE "/mnt/sdcard/spiral" SpiralOnline - READ_FILE "/mnt/sdcard/new_layout" new_layout + ;READ_FILE "/mnt/sdcard/new_layout" new_layout DEBUGVAR XMLPageVersionInt @@ -639,9 +639,42 @@ EnableLanguage "CHINA" EnableLanguage "JAPAN" + + Var InternationalEnable = 0 + Var InternationalEnableStr = "false" + READ_FILE "/mnt/sdcard/coffeevending/InternationalEnable" InternationalEnableStr + + If InternationalEnableStr = "true" Then + Var InternationalEnable = 1 + EndIf + + + + + DEBUGVAR InternationalEnable + + + If InternationalEnable = 1 Then + Var LanguageObjectShow = "Enable" + Var NoLangObjectShow = "Invisible" + Else + Var LanguageObjectShow = "Invisible" + Var NoLangObjectShow = "Enable" + EndIf EndIf + + + + + Var InternationalEnable = 0 + + + Var InternationalEnable = 1 + + + 1000 If IgnoreNetCore = "true" Then diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index d04e23fe..151c46aa 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -14,8 +14,6 @@ SAVELOG "page_brewing3.xml" DEBUGVAR MachineStage - Var StrawStateX = "Enable" - Var LidStateX = "Enable" If CART_COUNT >= 1 Then @@ -259,26 +257,25 @@ If MachineState_Result > 0 Then - Var EnableSelectMenuBetweenBrew = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" Else - Var EnableSelectMenuBetweenBrew = "Enable" + Var SelectMenuBetweenBrewEnable1 = "Enable" EndIf If GetFreeFromError = 1 Then - Var EnableSelectMenuBetweenBrew = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf - If EnableSelectMenuBetweenBrew = "Enable" Then + If SelectMenuBetweenBrewEnable1 = "Enable" Then Var EnableGetMoreStrawFileName = "Enable" - Var EnableSelectMenuBetweenBrewBlink = "Enable" + Var SelectMenuBetweenBrewEnable1Blink = "Enable" Else - Var EnableSelectMenuBetweenBrewBlink = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var EnableGetMoreStrawFileName = "Invisible" EndIf - ; Hide Var bg_strawlid_ST = "Invisible" Var bg_strawProblem_ST = "Invisible" @@ -293,21 +290,36 @@ EndIf If RoadShow = "true" Then - Var EnableSelectMenuBetweenBrewBlink = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" EndIf If Seeker.CreditCard = 1 Then - Var EnableSelectMenuBetweenBrewBlink = "Invisible" - Var EnableSelectMenuBetweenBrew = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf If NeedUpgrade = "true" Then - Var EnableSelectMenuBetweenBrewBlink = "Invisible" - Var EnableSelectMenuBetweenBrew = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf DEBUGVAR NeedUpgrade + ; zone Language + If LanguageObjectShow = "Enable" Then + Var SelectMenuBetweenBrewEnable1 = "Invisible" + + Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png" + EndIf + If NoLangObjectShow = "Enable" Then + + EndIf + + + DEBUGVAR LanguageObjectShow + DEBUGVAR NoLangObjectShow + + Var CreditCardVoid = 0 @@ -335,7 +347,10 @@ Var GetLidButtonCountDown = 0 - + + Var XPosiShowCountDownBrew = 768 + Refresh + @@ -493,7 +508,7 @@ ;EndIf - If EnableSelectMenuBetweenBrew = "Enable" Then + If SelectMenuBetweenBrewEnable1 = "Enable" Then If Timeout = 5 Then If show_eng = "true" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3" @@ -1010,18 +1025,29 @@ EndIf If MachineState_Result > 0 Then - Var EnableSelectMenuBetweenBrew = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf - If EnableSelectMenuBetweenBrew = "Enable" Then - If EnableSelectMenuBetweenBrewBlink = "Enable" Then - Var EnableSelectMenuBetweenBrewBlink = "Invisible" + If SelectMenuBetweenBrewEnable1 = "Enable" Then + If SelectMenuBetweenBrewEnable1Blink = "Enable" Then + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Else - Var EnableSelectMenuBetweenBrewBlink = "Enable" + Var SelectMenuBetweenBrewEnable1Blink = "Enable" EndIf Else - Var EnableSelectMenuBetweenBrewBlink = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + EndIf + + If SelectMenuBetweenBrewEnable2 = "Enable" Then + If SelectMenuBetweenBrewEnable1Blink = "Enable" Then + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Else + Var SelectMenuBetweenBrewEnable1Blink = "Enable" + EndIf + + Else + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" EndIf DEBUGVAR CountUpBrewing @@ -1159,7 +1185,7 @@ EndIf If RoadShow = "true" Then - Var EnableSelectMenuBetweenBrewBlink = "Invisible" + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" EndIf @@ -1267,26 +1293,33 @@ 60 1290 + NoLangObjectShow PictureFile -; -; 60 -; 1649 -; BottomText -; + 0 1655 -EnableSelectMenuBetweenBrew + SelectMenuBetweenBrewEnable1 text_next_order + + 0 + 1655 + 1080 + SelectMenuBetweenBrewEnable2 + + 000408 + + + 835 1735 -EnableSelectMenuBetweenBrewBlink +SelectMenuBetweenBrewEnable1Blink "ROOT/taobin_project/image/page_payment/arrow_1.png" @@ -1310,36 +1343,34 @@ ShowCountDownBrewing + + 816 + 429 + LanguageObjectShow + + 000405 + + - + + Var CountDownBrewing = 121 + - ; straw left - - - +; +; +; -; LID left - - - +;; LID left +; +; +; diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 9b896a25..f8751d85 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -13,6 +13,7 @@ ; On open + DEBUGVAR ToppingNewShow Var NextPage = "-" @@ -679,6 +680,10 @@ + + Var waitAckPay = 1 + + diff --git a/xml/page_catalog_group_recommend.lxml b/xml/page_catalog_group_recommend.lxml index 2913e7a3..cd2996c9 100644 --- a/xml/page_catalog_group_recommend.lxml +++ b/xml/page_catalog_group_recommend.lxml @@ -6711,6 +6711,278 @@ Pink​ Rose & Berry center-vertical-horizontal + + ; parallel - - - + ; ==================> Len = 3 + ; 12-01-01-0044 12-01-02-0044 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0044.Button,12-01-02-0044.Button,Disable=Invisible,$Sum12010100441201020044) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + CHOPIN +AMERICANO + อเมริกาโน +CHOPIN + CHOPIN +AMERICANO + อเมริกาโน +CHOPIN + CHOPIN +AMERICANO + อเมริกาโน +CHOPIN + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + showthaiText + + Raisin Honey process +Note: Strawberry & Floral + Raisin Honey process +หอมสตรอว์เบอร์รี กุหลาบ มะลิ + Raisin Honey process +Note: Strawberry & Floral + Raisin Honey process +หอมสตรอว์เบอร์รี กุหลาบ มะลิ + Raisin Honey process +Note: Strawberry & Floral + Raisin Honey process +หอมสตรอว์เบอร์รี กุหลาบ มะลิ + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0044.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0044.Button + StringFmt( $12-01-01-0044.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0044.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0044.Button + StringFmt( $12-01-02-0044.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12010100441201020044 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12010100441201020044 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0044.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0044.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum12010100441201020044 + + 000013 + + center-vertical-horizontal + ; parallel - - - ; ==================> Len = 3 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 5e79e058..5a12e7d7 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -245,8 +245,9 @@ ;If CupChecking = "true" Then ; Var CountStepForCupFlagDelay = 3 ;EndIf + If HaveCup = "true" Then - Var CountStepForCupFlagDelay = 3 + ;Var CountStepForCupFlagDelay = 3 EndIf If ReadyForBrew = "false" Then diff --git a/xml/page_topping_select6.lxml b/xml/page_topping_select6.lxml index 42df631c..adff05f1 100644 --- a/xml/page_topping_select6.lxml +++ b/xml/page_topping_select6.lxml @@ -292,6 +292,8 @@ Var showname = aliasName[LanguageShowByIndex] Var showdesc = aliasName[LanguageShowByIndex] + BackslashNToEnter showname + BackslashNToEnter showdesc 1000 @@ -469,11 +471,17 @@ 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 + CRLFToSpace showdesc Var Timeout = 0 @@ -1203,6 +1211,15 @@ DEBUGVAR TOPPING2 Refresh EndIf + If TOPPING2 = "add-show-1106" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Invisible" + Var ExtraTopping = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf If ShotCoffeePremium = "Enable" Then Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow) @@ -2561,6 +2578,15 @@ 0 "ROOT/taobin_project/image/topping_inter/bg_top_shot2.png" + + 120 + 4 + + 000102 + + 800 + 65 + +