diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml index 0fded35b..b33b42ad 100644 --- a/xml/menu_catalog_new.xml +++ b/xml/menu_catalog_new.xml @@ -179,7 +179,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_board.xml b/xml/page_board.xml index c512f7b4..ec472a3c 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -158,6 +158,7 @@ STRCONTAIN "1046" MaterialAvailable WheyEnable STRCONTAIN "1208" MaterialAvailable PromoteYuzuEnable + STRCONTAIN "1058" MaterialAvailable OreoEnable DEBUGVAR PromoteYuzuEnable @@ -665,7 +666,7 @@ EndIf EndIf - Var ShowPromoitonOreo = 1 + Var PromotionOreoVolcanoEnable = 0 @@ -726,15 +727,34 @@ EndIf EndIf + + Var ShowPromoitonOreo = 1 + + If SystemDateMonthInt = 3 Then + If SystemDateDayInt = 30 Then + Var ShowPromoitonOreo = 0 + EndIf + If SystemDateDayInt = 31 Then + Var ShowPromoitonOreo = 0 + EndIf + EndIf + If SystemDateMonthInt = 4 Then Var ShowPromoitonOreo = 0 + EndIf If SystemDateMonthInt = 5 Then Var ShowPromoitonOreo = 0 EndIf - - + ;Var ShowPromoitonOreo = 0 + + If ShowPromoitonOreo = 0 Then + Var PromotionOreoVolcanoEnable = 0 + Var PromotionOreoToppingFreeEnable = 0 + EndIf + + DEBUGVAR $12-03-03-0009.Button If PromotionOreoVolcanoEnable = 1 Then @@ -753,10 +773,21 @@ Var PromotionIDCurrentOrder = 0 - DEBUGVAR PromotionOreoToppingFreeEnable - DEBUGVAR PromotionOreoVolcanoEnable + If OreoEnable = "true" Then + + Else + Var PromotionOreoVolcanoEnable = 0 + Var PromotionOreoToppingFreeEnable = 0 + Var ShowPromoitonOreo = 0 + EndIf + DEBUGVAR PromotionOreoToppingFreeEnable + DEBUGVAR PromotionOreoVolcanoEnable + DEBUGVAR OreoEnable + + DEBUGVAR $12-03-03-0026.Button + RootLayoutVisible 3 "hide" @@ -882,9 +913,9 @@ If ShowPromoitonOreo = 1 Then - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml" - Else OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml" EndIf Machine DoorClose diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 2d0c69ff..a7afd79f 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -1096,6 +1096,7 @@ EndIf If adver_brewing_count_down = 0 Then + GetFileSizeK "taobin_project/video/brewing_adv3.mp4" brewing_adv_size DEBUGVAR brewing_adv_size If brewing_adv_size = 8321419 Then @@ -1105,6 +1106,13 @@ Var adver_brewing_play_index = 1 Var adver_brewing_count_down = 0 EndIf + + If ShowPromoitonOreo = 1 Then + + Else + Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 0 + EndIf EndIf EndIf diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index fd627825..cccaf002 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -89,6 +89,23 @@ DEBUGVAR PromotionOreoVolcanoEnable + If SystemDateMonthInt = 3 Then + If SystemDateDayInt = 30 Then + Var ShowPromoitonOreo = 0 + EndIf + If SystemDateDayInt = 31 Then + Var ShowPromoitonOreo = 0 + EndIf + EndIf + + If SystemDateMonthInt = 4 Then + Var ShowPromoitonOreo = 0 + EndIf + If SystemDateMonthInt = 5 Then + Var ShowPromoitonOreo = 0 + EndIf + + If SpiralOnline = "true" Then If Seeker = "next" Then Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index 0f5374a4..11b8c45e 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -336,9 +336,11 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - - Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" - + If ShowPromoitonOreo = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index a3dd96cf..27936687 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -326,7 +326,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 6323e1f0..68f63c48 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -318,7 +318,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index cd8d3d70..e577985e 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -318,7 +318,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index f8d21237..5d14e764 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -327,7 +327,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 5433a6de..d8d55cb0 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -318,7 +318,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 90534d39..b4161f64 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -316,7 +316,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml index 4e67f318..834d470c 100644 --- a/xml/page_catalog_group_oreo.xml +++ b/xml/page_catalog_group_oreo.xml @@ -314,7 +314,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index eedd4ff8..34d9a852 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -317,7 +317,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 0fa911a4..be0aac77 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -324,7 +324,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 8452b1b5..6e72fd78 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -318,7 +318,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 62042760..28868b53 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -323,7 +323,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 222a3f4c..1e944051 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -321,6 +321,13 @@ EndIf + If ShowPromoitonOreo = 1 Then + + Else + Var oreo_topping_wed_free = "Invisible" + Var oreo_topping_wed_topping = "Invisible" + EndIf + DEBUGVAR PromotionIDCurrentOrder diff --git a/xml_main/startup.xml b/xml_main/startup.xml index e971950b..6b753c78 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.03" - Var XMLPageVersionInt = 703 + Var XMLPageVersion = "7.04" + Var XMLPageVersionInt = 704