diff --git a/adv/taobin_adv_10.mp4 b/adv/taobin_adv_10.mp4 old mode 100755 new mode 100644 index cb1a8b3e..bf42e901 Binary files a/adv/taobin_adv_10.mp4 and b/adv/taobin_adv_10.mp4 differ diff --git a/adv/taobin_adv_menu2_10.mp4 b/adv/taobin_adv_menu2_10.mp4 old mode 100755 new mode 100644 index 51564926..ae26eb95 Binary files a/adv/taobin_adv_menu2_10.mp4 and b/adv/taobin_adv_menu2_10.mp4 differ diff --git a/adv/taobin_adv_menu_10.mp4 b/adv/taobin_adv_menu_10.mp4 old mode 100755 new mode 100644 index d718797f..ea84e592 Binary files a/adv/taobin_adv_menu_10.mp4 and b/adv/taobin_adv_menu_10.mp4 differ diff --git a/image/page_doing/txt_15_en.png b/image/page_doing/txt_15_en.png index 80b2cc82..c715a3f3 100644 Binary files a/image/page_doing/txt_15_en.png and b/image/page_doing/txt_15_en.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index a018271c..eb14a1e5 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -219,7 +219,7 @@ LED LedDoorLid Off 255 255 255 255 - DEBUGVAR AdvertiseProfile + SPLIT AdvertiseProfile "/" 1 AdvertiseProfile1 SPLIT AdvertiseProfile "/" 2 AdvertiseProfile2 @@ -371,6 +371,25 @@ Machine CancelWepApp + + ;StrLen AdvertiseProfile AdvertiseProfileLen + ; + ;If AdvertiseProfileLen = 0 Then + ; CacheVarStr "get" AdvertiseProfile + ;Else + ; + ; STRCONTAIN "00/00" AdvertiseProfile advPro + ; + ; If advPro = "true" Then + ; CacheVarStr "get" AdvertiseProfile + ; Else + ; CacheVarStr "put" AdvertiseProfile + ; EndIf + ;EndIf + + DEBUGVAR AdvertiseProfile + + 1000 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 8f61cec7..acaa2de3 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -71,6 +71,9 @@ SAVELOG MachineStage + + READ_FILE "/mnt/sdcard/can_sell" ReadyForBrew + If ReadyForBrew = "false" Then Open "ROOT/taobin_project/xml/page_back_to_main.xml" Var ReadyForBrew = "false" diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index d7b51c1d..97169574 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -12,6 +12,7 @@ DEBUGVAR EnableSelectMenuBetweenBrew + If JXMLVersionInt >= 369 Then If EnableSelectMenuBetweenBrew = "Enable" Then Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index ee7cc43d..c8920880 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -13,6 +13,14 @@ DEBUGVAR SelectDrink DEBUGVAR PictureDrink + + If SelectDrinkLen = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + If PriceDrink = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf Var SaveProductCodeSelect = SelectDrink Var UserSelectProductCode = SelectDrink @@ -641,6 +649,23 @@ Refresh EndIf + If TOPPING2 = "add-show-1009" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "add-show-1101" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + ;-END If TOPPING3 = "Collagen" Then Var CollagenState = "Enable" @@ -1530,8 +1555,12 @@ ;Var Seeker = "curr" - - Var Seeker.PriceDrink = PriceDrinkTmp + DEBUGVAR PriceDrinkTmp + + ;Var Seeker.PriceDrink = PriceDrinkTmp + + Var PriceDrink = PriceDrinkTmp + SAVELOG "USER press next ( topping ) - new" Var Seeker.topping1 = topping1 diff --git a/xml/video_loop2.xml b/xml/video_loop2.xml index 1f666e62..dab64583 100644 --- a/xml/video_loop2.xml +++ b/xml/video_loop2.xml @@ -12,7 +12,7 @@ Var ClickCountMainTe = 0 - 20000 + 33000 Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_" Var AdvImageFile = AdvImageFile + FileNumber diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 5127f44d..f30ddb67 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.89" - Var XMLPageVersionInt = 589 + Var XMLPageVersion = "5.90" + Var XMLPageVersionInt = 590