diff --git a/video/main_page_event.mp4 b/video/main_page_event.mp4 index 6bbdbd50..608bde83 100644 Binary files a/video/main_page_event.mp4 and b/video/main_page_event.mp4 differ diff --git a/video/main_page_event_alter.mp4 b/video/main_page_event_alter.mp4 deleted file mode 100644 index fc9e3477..00000000 Binary files a/video/main_page_event_alter.mp4 and /dev/null differ diff --git a/video/script1.ev b/video/script1.ev new file mode 100644 index 00000000..388d01b0 --- /dev/null +++ b/video/script1.ev @@ -0,0 +1,29 @@ + +Var MainfileSize = 0 +GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize +DEBUGVAR MainfileSize + +If MainfileSize = 10598934 Then + If SystemDateMonth = 11 Then + Var EventTurnOn = 1 + EndIf + + If SystemDateMonth = 12 Then + + Var EventTurnOn = 1 + + If SystemDateDay < 7 Then + Var EventTurnOn = 0 + EndIf + + If SystemDateDay = 6 Then + Var EventTurnOn = 0 + EndIf + EndIf + + If EventTurnOn = 1 Then + Var CountDownShowButton = 0 + Var ShowButtonClickFull = "Invisible" + Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4" + EndIf +EndIf diff --git a/video/script2.ev b/video/script2.ev new file mode 100644 index 00000000..50a42eb3 --- /dev/null +++ b/video/script2.ev @@ -0,0 +1,11 @@ + +Var MainfileSize = 0 +GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize +DEBUGVAR MainfileSize + +If MainfileSize = 2786275 Then + + If EventTurnOn = 1 Then + Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4" + EndIf +EndIf diff --git a/video/sync_1.file b/video/sync_1.file index 82cf38e3..3b59eb4a 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,5 +1,14 @@ -total 12400 --rw-rw---- 1 root sdcard_rw 0 2021-11-01 15:13 sync_1.file -remove taobin_thank1_event_alter.mp4 -remove main_page_event_alter.mp4 - +total 42772 +-rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 +-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 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 +-rw-rw---- 1 root sdcard_rw 6428830 2022-06-13 18:43 taobin_save_world2.mp4 +-rw-rw---- 1 root sdcard_rw 4634942 2022-06-13 18:43 taobin_save_world3.mp4 +-rw-rw---- 1 root sdcard_rw 2084830 2022-06-13 18:43 taobin_thank1.mp4 +-rw-rw---- 1 root sdcard_rw 2786275 2022-11-22 13:59 taobin_thank1_event.mp4 +-rw-rw---- 1 root sdcard_rw 1631940 2022-06-13 18:43 taobin_thank2.mp4 diff --git a/video/taobin_thank1_event.mp4 b/video/taobin_thank1_event.mp4 index b1851e0f..3474020e 100644 Binary files a/video/taobin_thank1_event.mp4 and b/video/taobin_thank1_event.mp4 differ diff --git a/video/taobin_thank1_event_alter.mp4 b/video/taobin_thank1_event_alter.mp4 deleted file mode 100644 index c42ee89f..00000000 Binary files a/video/taobin_thank1_event_alter.mp4 and /dev/null differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 6e80526c..7cc7c52e 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -227,7 +227,10 @@ EndIf - ;DEBUGVAR EventTurnOn + TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev" + + + DEBUGVAR EventTurnOn DEBUGVAR CampaignEnableStr EndIf If TermTemOnline = "true" Then diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index be3eaa29..87d9ded5 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -192,6 +192,19 @@ EndIf + + ; + DEBUGVAR LangEng + If LangEng = "true" Then + + EndIf + + DEBUGVAR LangThai + If LangThai = "true" Then + + EndIf + + 1000 diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index f182b7c3..6bb708db 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -142,12 +142,9 @@ Var video_file_name = video_file_name + ".mp4" If SaveTheWorldCount < 2 Then - If EventTurnOn = 1 Then - Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4" - EndIf - If EventTurnOn = 2 Then - Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event_alter.mp4" - EndIf + + TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev" + EndIf diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 4271b0bd..85e9a57c 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -15,6 +15,7 @@ DEBUGVAR Seeker Var BGSugarNew = "Invisible" + ;Var BGSugar = "Enable" DEBUGVAR video_menu_0