diff --git a/video/main_page.mp4 b/video/main_page.mp4 deleted file mode 100644 index 83417206..00000000 Binary files a/video/main_page.mp4 and /dev/null differ diff --git a/video/script1.ev b/video/script1.ev index 388d01b0..d86b0c1d 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -4,20 +4,26 @@ GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize DEBUGVAR MainfileSize If MainfileSize = 10598934 Then - If SystemDateMonth = 11 Then + If SystemDateMonthInt = 11 Then Var EventTurnOn = 1 EndIf - If SystemDateMonth = 12 Then + If SystemDateMonthInt = 12 Then Var EventTurnOn = 1 - If SystemDateDay < 7 Then + DEBUGVAR SystemTimeHourInt + DEBUGVAR SystemDateDayInt + + If SystemDateDayInt > 7 Then Var EventTurnOn = 0 EndIf - If SystemDateDay = 6 Then - Var EventTurnOn = 0 + If SystemDateDayInt = 6 Then + + If SystemTimeHourInt > 9 Then + Var EventTurnOn = 0 + EndIf EndIf EndIf diff --git a/video/sync_1.file b/video/sync_1.file index 3b59eb4a..5d73e376 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,9 +1,8 @@ -total 42772 --rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 +total 51828 -rw-rw---- 1 root sdcard_rw 10598934 2022-11-22 13:59 main_page_event.mp4 --rw-rw---- 1 root sdcard_rw 572 2022-11-22 15:16 script1.ev --rw-rw---- 1 root sdcard_rw 265 2022-11-22 15:19 script2.ev --rw-rw---- 1 root sdcard_rw 0 2022-11-22 12:01 sync_1.file +-rw-rw---- 1 root sdcard_rw 686 2022-11-22 17:01 script1.ev +-rw-rw---- 1 root sdcard_rw 265 2022-11-22 17:01 script2.ev +-rw-rw---- 1 root sdcard_rw 0 2022-11-22 17:01 sync_1.file -rw-rw---- 1 root sdcard_rw 557065 2021-02-18 15:05 taobin_brewing.mov -rw-rw---- 1 root sdcard_rw 920095 2021-02-18 15:05 taobin_drink_ok.mov -rw-rw---- 1 root sdcard_rw 4806758 2022-06-13 18:43 taobin_save_world1.mp4 diff --git a/xml/page_board.xml b/xml/page_board.xml index 7cc7c52e..3228a279 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -206,22 +206,22 @@ Var ShowButtonClickFull = "Invisible" Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4" - DEBUGVAR SystemDateMonth - DEBUGVAR SystemDateDay + DEBUGVAR SystemDateMonthInt + DEBUGVAR SystemDateDayInt ; Zone set video main page. Var CampaignEnableStr = "false" - If SystemDateMonth = 11 Then + If SystemDateMonthInt = 11 Then Var CampaignEnableStr = "true" EndIf - If SystemDateMonth = 12 Then + If SystemDateMonthInt = 12 Then Var CampaignEnableStr = "true" EndIf - If SystemDateMonth = 1 Then - If SystemDateDay = 1 Then + If SystemDateMonthInt = 1 Then + If SystemDateDayInt = 1 Then WRITE_FILE "/mnt/sdcard/coffeevending/CampaignEnable" "off" EndIf EndIf @@ -233,11 +233,6 @@ DEBUGVAR EventTurnOn DEBUGVAR CampaignEnableStr EndIf - If TermTemOnline = "true" Then - Var CountDownShowButton = 28 - Var ShowButtonClickFull = "Enable" - Var VideoMainPage = "ROOT/termtem_project/video/termtem01.mp4" - EndIf If TaobinOnlineX = "false" Then If TermTemOnline = "false" Then diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 85e9a57c..bd5ef0c4 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -15,7 +15,6 @@ DEBUGVAR Seeker Var BGSugarNew = "Invisible" - ;Var BGSugar = "Enable" DEBUGVAR video_menu_0 @@ -295,6 +294,10 @@ Var MAT_ID_9701 = StrawState Var SubMenuGroupIDSlot6_1 = 0 + + + + 1000 @@ -427,6 +430,8 @@ EndIf EndIf + + Function 2 @@ -790,16 +795,17 @@ EndIf EndIf + DEBUGVAR RecipeTag2 ; If TOPPING1 = "Sugar" Then - If sugarKeto = "true" Then - Var StateImgKeto = "Enable" + If RecipeTag2 = "Topping6Step" Then Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" Else Var BGSugar = "Enable" - Endif - + EndIf + Var ShiftSugarStep = 1 Var SugarState1 = "Enable" Var SugarState2 = "Enable" @@ -835,18 +841,19 @@ If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" EndIf + + EndIf If TOPPING1 = "Powder Sugar" Then - If sugarKeto = "true" Then - Var StateImgKeto = "Enable" - Var BGSugar = "Enable" - Var h_block_of_sugar = 262 + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" Else Var BGSugar = "Enable" EndIf - ;Var BGSugar = "Enable" + Var ShiftSugarStep = 1 Var SugarState1 = "Enable" Var SugarState2 = "Enable" @@ -1924,6 +1931,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index1 EndIf @@ -1962,6 +1970,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index2 EndIf @@ -1971,6 +1980,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index1 EndIf @@ -1989,7 +1999,7 @@ 79 SugarState3 Var( DirImage + "/bn_sugarlevel3.png" ) - Var( DirImage + "/bn_sugarlevel3.png" ) + Var( DirImage + "/bp_sugarlevel3.png" ) Var( DirImage + "/bu_sugarlevel3.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2007,6 +2017,7 @@ Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index3 EndIf @@ -2015,6 +2026,7 @@ Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index2 EndIf @@ -2023,6 +2035,7 @@ Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index1 EndIf @@ -2041,7 +2054,7 @@ 79 SugarState4 Var( DirImage + "/bn_sugarlevel4.png" ) - Var( DirImage + "/bn_sugarlevel4.png" ) + Var( DirImage + "/bp_sugarlevel4.png" ) Var( DirImage + "/bu_sugarlevel4.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2059,6 +2072,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index4 EndIf @@ -2067,6 +2081,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index3 EndIf @@ -2075,6 +2090,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" + Var SugarState6 = "Enable" Var topping1 = toppingID1index2 EndIf @@ -2092,7 +2108,7 @@ 79 SugarState5 Var( DirImage + "/bn_sugarlevel5.png" ) - Var( DirImage + "/bn_sugarlevel5.png" ) + Var( DirImage + "/bp_sugarlevel5.png" ) Var( DirImage + "/bu_sugarlevel5.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2110,6 +2126,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" + Var SugarState6 = "Enable" Var topping1 = toppingID1index5 EndIf @@ -2118,6 +2135,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" + Var SugarState6 = "Enable" Var topping1 = toppingID1index4 EndIf @@ -2126,6 +2144,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" + Var SugarState6 = "Enable" Var topping1 = toppingID1index3 EndIf @@ -2143,7 +2162,7 @@ 79 SugarState6 Var( DirImage + "/bn_sugarlevel6.png" ) - Var( DirImage + "/bn_sugarlevel6.png" ) + Var( DirImage + "/bp_sugarlevel6.png" ) Var( DirImage + "/bu_sugarlevel6.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2160,24 +2179,27 @@ Var SugarState2 = "Enable" Var SugarState3 = "Enable" Var SugarState4 = "Enable" - Var SugarState5 = "PressForever" - Var topping1 = toppingID1index5 + Var SugarState5 = "Enable" + Var SugarState6 = "PressForever" + Var topping1 = toppingID1index6 EndIf If ShiftSugarStep = 2 Then Var SugarState2 = "Enable" Var SugarState3 = "Enable" Var SugarState4 = "Enable" - Var SugarState5 = "PressForever" - Var topping1 = toppingID1index4 + Var SugarState5 = "Enable" + Var SugarState6 = "PressForever" + Var topping1 = toppingID1index5 EndIf If ShiftSugarStep = 3 Then Var SugarState3 = "Enable" Var SugarState4 = "Enable" - Var SugarState5 = "PressForever" - Var topping1 = toppingID1index3 + Var SugarState5 = "Enable" + Var SugarState6 = "PressForever" + Var topping1 = toppingID1index4 EndIf Var UserSeletedSugar = 1 @@ -3349,6 +3371,10 @@ DEBUGVAR CustomerFilterEnable DEBUGVAR CustomerFilterType + + GetLongTimeInMinute LastTimeClickOrder + DEBUGVAR LastTimeClickOrder + If CART_COUNT = 0 Then If SelectDrinkType = 1 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" @@ -3377,6 +3403,9 @@ EndIf + Var LastTimeClickOrder = 0 + + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 4ba1cd94..dd10b3b1 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.77" - Var XMLPageVersionInt = 677 + Var XMLPageVersion = "6.78" + Var XMLPageVersionInt = 678