diff --git a/adv/sync_1.file b/adv/sync_1.file index 722423eb..03276c4a 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,15 +1,21 @@ -total 341484 --rw-rw---- 1 root sdcard_rw 0 2024-01-04 21:41 sync_1.file +total 336312 +-rw-rw---- 1 root sdcard_rw 2671 2022-01-13 17:36 sync_0.file +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 15:38 sync_1.file +-rw-rw---- 1 root sdcard_rw 2671 2022-01-13 17:24 sync_2.file +-rw-rw---- 1 root sdcard_rw 2606 2022-02-03 17:03 sync_4.file +-rw-rw---- 1 root sdcard_rw 3028 2022-03-15 10:42 sync_5.file +-rw-rw---- 1 root sdcard_rw 3093 2022-03-31 23:56 sync_6.file +-rw-rw---- 1 root sdcard_rw 3379 2022-04-26 18:02 sync_7.file -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 3647528 2023-09-18 18:44 taobin_adv_01.mp4 -rw-rw---- 1 root sdcard_rw 6947194 2024-01-24 14:01 taobin_adv_02.mp4 -rw-rw---- 1 root sdcard_rw 8019718 2023-09-24 22:02 taobin_adv_03.mp4 --rw-rw---- 1 root sdcard_rw 8156825 2023-11-17 12:07 taobin_adv_04.mp4 +-rw-rw---- 1 root sdcard_rw 7138742 2024-02-21 14:55 taobin_adv_04.mp4 -rw-rw---- 1 root sdcard_rw 2686245 2023-09-18 18:44 taobin_adv_05.mp4 -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_06.mp4 -rw-rw---- 1 root sdcard_rw 12701242 2023-11-06 22:08 taobin_adv_07.mp4 --rw-rw---- 1 root sdcard_rw 16769985 2023-10-31 17:15 taobin_adv_08.mp4 --rw-rw---- 1 root sdcard_rw 2461527 2023-09-18 18:44 taobin_adv_09.mp4 +-rw-rw---- 1 root sdcard_rw 8538147 2024-02-21 14:53 taobin_adv_08.mp4 +-rw-rw---- 1 root sdcard_rw 7003766 2024-02-21 13:03 taobin_adv_09.mp4 -rw-rw---- 1 root sdcard_rw 2722307 2023-09-18 18:44 taobin_adv_10.mp4 -rw-rw---- 1 root sdcard_rw 532214 2023-11-16 16:48 taobin_adv_11.mp4 -rw-rw---- 1 root sdcard_rw 257107 2023-09-18 18:44 taobin_adv_12.mp4 @@ -25,12 +31,12 @@ total 341484 -rw-rw---- 1 root sdcard_rw 2755962 2023-09-18 18:44 taobin_adv_menu2_01.mp4 -rw-rw---- 1 root sdcard_rw 8022474 2024-01-24 10:48 taobin_adv_menu2_02.mp4 -rw-rw---- 1 root sdcard_rw 8002769 2023-09-24 22:02 taobin_adv_menu2_03.mp4 --rw-rw---- 1 root sdcard_rw 5304348 2023-11-17 12:08 taobin_adv_menu2_04.mp4 +-rw-rw---- 1 root sdcard_rw 7063775 2024-02-21 14:58 taobin_adv_menu2_04.mp4 -rw-rw---- 1 root sdcard_rw 1920381 2023-09-18 18:44 taobin_adv_menu2_05.mp4 -rw-rw---- 1 root sdcard_rw 2622440 2023-09-18 18:44 taobin_adv_menu2_06.mp4 -rw-rw---- 1 root sdcard_rw 13185829 2023-11-06 22:07 taobin_adv_menu2_07.mp4 --rw-rw---- 1 root sdcard_rw 15379402 2023-10-31 17:15 taobin_adv_menu2_08.mp4 --rw-rw---- 1 root sdcard_rw 2197656 2023-09-18 18:44 taobin_adv_menu2_09.mp4 +-rw-rw---- 1 root sdcard_rw 8582604 2024-02-21 14:51 taobin_adv_menu2_08.mp4 +-rw-rw---- 1 root sdcard_rw 7172128 2024-02-21 13:00 taobin_adv_menu2_09.mp4 -rw-rw---- 1 root sdcard_rw 2444223 2023-09-18 18:44 taobin_adv_menu2_10.mp4 -rw-rw---- 1 root sdcard_rw 370018 2023-11-16 16:48 taobin_adv_menu2_11.mp4 -rw-rw---- 1 root sdcard_rw 187326 2023-09-18 18:44 taobin_adv_menu2_12.mp4 @@ -46,12 +52,12 @@ total 341484 -rw-rw---- 1 root sdcard_rw 2587515 2023-09-18 18:44 taobin_adv_menu_01.mp4 -rw-rw---- 1 root sdcard_rw 8414409 2024-01-12 11:41 taobin_adv_menu_02.mp4 -rw-rw---- 1 root sdcard_rw 7959926 2023-09-24 22:02 taobin_adv_menu_03.mp4 --rw-rw---- 1 root sdcard_rw 5567835 2023-11-17 12:07 taobin_adv_menu_04.mp4 +-rw-rw---- 1 root sdcard_rw 7200596 2024-02-21 14:56 taobin_adv_menu_04.mp4 -rw-rw---- 1 root sdcard_rw 1959800 2023-09-18 18:44 taobin_adv_menu_05.mp4 -rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_06.mp4 -rw-rw---- 1 root sdcard_rw 13259746 2023-11-06 22:07 taobin_adv_menu_07.mp4 --rw-rw---- 1 root sdcard_rw 16345079 2023-10-31 17:15 taobin_adv_menu_08.mp4 --rw-rw---- 1 root sdcard_rw 1954754 2023-09-18 18:44 taobin_adv_menu_09.mp4 +-rw-rw---- 1 root sdcard_rw 8661651 2024-02-21 14:52 taobin_adv_menu_08.mp4 +-rw-rw---- 1 root sdcard_rw 7351406 2024-02-21 13:02 taobin_adv_menu_09.mp4 -rw-rw---- 1 root sdcard_rw 2457487 2023-09-18 18:44 taobin_adv_menu_10.mp4 -rw-rw---- 1 root sdcard_rw 377210 2023-11-16 16:48 taobin_adv_menu_11.mp4 -rw-rw---- 1 root sdcard_rw 190457 2023-09-18 18:44 taobin_adv_menu_12.mp4 diff --git a/adv/taobin_adv_04.mp4 b/adv/taobin_adv_04.mp4 index 035a98e8..17ea6766 100644 Binary files a/adv/taobin_adv_04.mp4 and b/adv/taobin_adv_04.mp4 differ diff --git a/adv/taobin_adv_08.mp4 b/adv/taobin_adv_08.mp4 index a83f1690..90c84cfb 100644 Binary files a/adv/taobin_adv_08.mp4 and b/adv/taobin_adv_08.mp4 differ diff --git a/adv/taobin_adv_09.mp4 b/adv/taobin_adv_09.mp4 index 69be8013..bf32ce00 100644 Binary files a/adv/taobin_adv_09.mp4 and b/adv/taobin_adv_09.mp4 differ diff --git a/adv/taobin_adv_menu2_04.mp4 b/adv/taobin_adv_menu2_04.mp4 index e6902ea3..bdb08e8e 100644 Binary files a/adv/taobin_adv_menu2_04.mp4 and b/adv/taobin_adv_menu2_04.mp4 differ diff --git a/adv/taobin_adv_menu2_08.mp4 b/adv/taobin_adv_menu2_08.mp4 index 7e3ce84f..0c6d5146 100644 Binary files a/adv/taobin_adv_menu2_08.mp4 and b/adv/taobin_adv_menu2_08.mp4 differ diff --git a/adv/taobin_adv_menu2_09.mp4 b/adv/taobin_adv_menu2_09.mp4 index 47dd559a..44ee505e 100644 Binary files a/adv/taobin_adv_menu2_09.mp4 and b/adv/taobin_adv_menu2_09.mp4 differ diff --git a/adv/taobin_adv_menu_04.mp4 b/adv/taobin_adv_menu_04.mp4 index af2588f8..6e99edff 100644 Binary files a/adv/taobin_adv_menu_04.mp4 and b/adv/taobin_adv_menu_04.mp4 differ diff --git a/adv/taobin_adv_menu_08.mp4 b/adv/taobin_adv_menu_08.mp4 index 82acf69f..574819ac 100644 Binary files a/adv/taobin_adv_menu_08.mp4 and b/adv/taobin_adv_menu_08.mp4 differ diff --git a/adv/taobin_adv_menu_09.mp4 b/adv/taobin_adv_menu_09.mp4 index d40d2e16..36722da1 100644 Binary files a/adv/taobin_adv_menu_09.mp4 and b/adv/taobin_adv_menu_09.mp4 differ diff --git a/inc/video_no_eventopen.inc b/inc/video_no_eventopen.inc new file mode 100644 index 00000000..091d6410 --- /dev/null +++ b/inc/video_no_eventopen.inc @@ -0,0 +1,8 @@ + diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index ecb20a01..8ffec63c 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -557,18 +557,18 @@ Name=BadValentine,file=page_catalog_group_pro_bad_valentine.skt Name=pepsi ซื้อคู่ถูกกว่า,file=page_catalog_group_pro_pepsi_second_cup_30.skt วันนี้ลื้อดูร้อน Today, you're\nmelting in the heat! เป๊ปซี่ น้ำเชื่อมลิ้นจี่ และโซดา Pepsi, Lychee syrup and Soda - 12-99-02-0008 - bn_iced_pepsi_lychee_second_cup_30.png - - - posi1 วันนี้ร้อนนิดหน่อย Today is heat MEH เป๊ปซี่ นม Pepsi, Milk - 12-99-02-0003 - bn_iced_pepsi_milk_second_cup_30.png - - - posi1 - วันนี้ร้อนสุด ๆ Today is sizzling masterpiece เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา Pepsi, Plum Syrup and Soda - 12-05-02-0046 - bn_iced_pepsi_plum_lime_second_cup_30.png - - - posi1 - วันนี้ร้อนกว่าเมื่อวาน Today is hotter than\nyesterday (not) เป๊ปซี่ น้ำเชื่อมสละ มะนาว และโซดา Pepsi, Salak Syrup, Lime and Soda - 12-99-05-0058 - bn_iced_pepsi_salak_lime_second_cup_30.png - - - posi1 + วันนี้ร้อนสุด ๆ Today is sizzling\nmasterpiece เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา Pepsi, Plum Syrup and Soda - 12-05-02-0046 - bn_iced_pepsi_plum_lime_second_cup_30.png - - - posi1 + วันนี้ร้อนกว่าเมื่อวาน Today is hotter than\nyesterday (not) เป๊ปซี่ น้ำเชื่อมสละ มะนาว และโซดา Pepsi, Salak Syrup, Lime\nand Soda - 12-99-05-0058 - bn_iced_pepsi_salak_lime_second_cup_30.png - - - posi1 วันนี้ร้อนพอทนไหว Today is warmth is\njust bearable เป๊ปซี่ มัทฉะ และโซดา Pepsi, Matcha and Soda - 12-99-05-0060 - bn_iced_pepsi_matcha_second_cup_30.png - - - posi1 วันนี้ร้อนพอหายใจได้ Today is heat:\nBreathe-able เป๊ปซี่ Pepsi, Ice and Soda - 12-05-02-0007 - bn_iced_pepsi_second_cup_30.png - - - posi1 - วันนี้ร้อนแบบพอดี Today is 'just right'\nsauna เป๊ปซี่ น้ำเชื่อมสตรอเบอร์รี่ มะนาว และโซดา Pepsi, Strawberry Syrup, Limenade\nand Soda - 12-99-05-0053 - bn_iced_pepsi_strawberry_limenade_second_cup_30.png - - - posi1 - วันนี้ร้อนแบบมีลม Today is warmth\nwith a breeze เป๊ปซี่ น้ำเชื่อมบ๊วย มะนาว และโซดา Pepsi, Plum Syrup, Lime and Soda - 12-99-05-0064 - bn_iced_pepsi_plum_lime_second_cup_30.png - - - posi1 + วันนี้ร้อนแบบพอดี Today is 'just right'\nsauna เป๊ปซี่ น้ำเชื่อมสตรอเบอร์รี่ มะนาว\nและโซดา Pepsi, Strawberry Syrup,\nLimenade and Soda - 12-99-05-0053 - bn_iced_pepsi_strawberry_limenade_second_cup_30.png - - - posi1 + วันนี้ร้อนแบบมีลม Today is warmth\nwith a breeze เป๊ปซี่ น้ำเชื่อมบ๊วย มะนาว และโซดา Pepsi, Plum Syrup,\nLime and Soda - 12-99-05-0064 - bn_iced_pepsi_plum_lime_second_cup_30.png - - - posi1 วันนี้ร้อนตับแตก Today is liver-frying\nhot เป๊ปซี่ น้ำเชื่อมกล้วย โซดา Pepsi, Banana Syrup and Soda - 12-99-02-0007 - bn_iced_pepsi_banana_second_cup_30.png - - - posi1 วันนี้ร้อนเกินไป Today is scorchiness\nOVERDONE เป๊ปซี่ น้ำเชื่อมสละ น้ำเชื่อมลิ้นจี่ และโซดา Pepsi, Salak Syrup, Lychee syrup and Soda - 12-05-02-0084 - bn_iced_pepsi_salak_lychee_second_cup_30.png - - - posi1 - วันนี้ร้อนเท่าไหร่ Today is heat?\nHow much? เป๊ปซี่ ชามะลิ ผงมะนาว และโซดา Pepsi, Jasmine Tea, Limenade and Soda - 12-99-05-0052 - bn_iced_pepsi_jasmine_tea_limenade_second_cup_30.png - - - posi1 + วันนี้ร้อนเท่าไหร่ Today is heat?\nHow much? เป๊ปซี่ ชามะลิ ผงมะนาว และโซดา Pepsi, Jasmine Tea, Limenade\nand Soda - 12-99-05-0052 - bn_iced_pepsi_jasmine_tea_limenade_second_cup_30.png - - - posi1 วันนี้ร้อนเหมือนแดด\nโกรธ Today is heat:\nANGRY sun mode เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา Pepsi, Mint Syrup and Soda - 12-05-02-0067 - bn_iced_pepsi_mint_second_cup_30.png - - - posi1 วันนี้ร้อนจนเดือด Today is boiling\npoint reached เป๊ปซี่ Pepsi and Soda - - 12-05-03-0007 bn_iced_pepsi_smoothie.png - - - posi1 - วันนี้ร้อนจนผิวจะ\nเกรียม Today is heat:\nSkin crisping เป๊ปซี่ น้ำเชื่อมชูกำลัง มะนาว และโซดา Pepsi Energy Syrup, Lime and Soda - 12-99-05-0057 - bn_iced_pepsi_energy_lime_second_cup_30.png - - - posi1 + วันนี้ร้อนจนผิวจะ\nเกรียม Today is heat:\nSkin crisping เป๊ปซี่ น้ำเชื่อมชูกำลัง มะนาว และโซดา Pepsi Energy Syrup, Lime\nand Soda - 12-99-05-0057 - bn_iced_pepsi_energy_lime_second_cup_30.png - - - posi1 Name=Lip It diff --git a/xml/multi_ads/ads_path.ev b/xml/multi_ads/ads_path.ev index 4ab94d76..552769db 100644 --- a/xml/multi_ads/ads_path.ev +++ b/xml/multi_ads/ads_path.ev @@ -15,15 +15,162 @@ Var DisplayAds = video_menu_0 If XMLLiveInfo = "" Then Var showMultiAds = "false" -Else - Var showMultiAds = "true" + SPLIT AdvertiseProfile "/" 1 AdvertiseProfile1 + SPLIT AdvertiseProfile "/" 2 AdvertiseProfile2 + SPLIT AdvertiseProfile "/" 3 AdvertiseProfile3 + SPLIT AdvertiseProfile "/" 4 AdvertiseProfile4 + SPLIT AdvertiseProfile "/" 5 AdvertiseProfile5 + SPLIT AdvertiseProfile "/" 6 AdvertiseProfile6 + SPLIT AdvertiseProfile "/" 7 AdvertiseProfile7 + SPLIT AdvertiseProfile "/" 8 AdvertiseProfile8 + SPLIT AdvertiseProfile "/" 9 AdvertiseProfile9 + SPLIT AdvertiseProfile "/" 10 AdvertiseProfile10 + SPLIT AdvertiseProfile "/" 11 AdvertiseProfile11 + SPLIT AdvertiseProfile "/" 12 AdvertiseProfile12 + SPLIT AdvertiseProfile "/" 13 AdvertiseProfile13 + SPLIT AdvertiseProfile "/" 14 AdvertiseProfile14 + SPLIT AdvertiseProfile "/" 15 AdvertiseProfile15 + SPLIT AdvertiseProfile "/" 16 AdvertiseProfile16 + SPLIT AdvertiseProfile "/" 17 AdvertiseProfile17 + SPLIT AdvertiseProfile "/" 18 AdvertiseProfile18 - DEBUGVAR video_main_0 - DEBUGVAR video_menu_0 + ; Default + Var AdvTaobinHome = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + Var AdvTaobinMenu2 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu2_" + Var video_main_0 = AdvTaobinHome + AdvertiseProfile7 + Var video_main_0 = video_main_0 + ".mp4" + Var video_main_1 = AdvTaobinHome + AdvertiseProfile8 + Var video_main_1 = video_main_1 + ".mp4" + Var video_main_2 = AdvTaobinHome + AdvertiseProfile9 + Var video_main_2 = video_main_2 + ".mp4" + Var video_main_3 = AdvTaobinHome + AdvertiseProfile10 + Var video_main_3 = video_main_3 + ".mp4" + Var video_main_4 = AdvTaobinHome + AdvertiseProfile11 + Var video_main_4 = video_main_4 + ".mp4" + Var video_main_5 = AdvTaobinHome + AdvertiseProfile12 + Var video_main_5 = video_main_5 + ".mp4" + Var video_main_6 = AdvTaobinHome + AdvertiseProfile13 + Var video_main_6 = video_main_6 + ".mp4" + Var video_main_7 = AdvTaobinHome + AdvertiseProfile14 + Var video_main_7 = video_main_7 + ".mp4" + Var video_main_8 = AdvTaobinHome + AdvertiseProfile15 + Var video_main_8 = video_main_8 + ".mp4" + Var video_main_9 = AdvTaobinHome + AdvertiseProfile16 + Var video_main_9 = video_main_9 + ".mp4" - ; split from adv profile + If AdvertiseProfile7 = "00" Then + Var video_main_count = 1 + Else + If AdvertiseProfile8 = "00" Then + Var video_main_count = 1 + Else + If AdvertiseProfile9 = "00" Then + Var video_main_count = 2 + Else + If AdvertiseProfile10 = "00" Then + Var video_main_count = 3 + Else + If AdvertiseProfile11 = "00" Then + Var video_main_count = 4 + Else + If AdvertiseProfile12 = "00" Then + Var video_main_count = 5 + Else + Var video_main_count = 6 + EndIf + EndIf + EndIf + EndIf + EndIf + EndIf + If VideoAdvIndex = 0 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile7 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 1 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile8 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 2 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile9 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 3 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile10 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 4 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile11 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 5 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile12 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 6 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile13 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 7 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile14 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 8 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile15 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 9 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile16 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + + + If VideoAdvIndex = 0 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile7 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 1 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile8 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 2 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile9 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 3 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile10 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 4 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile11 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 5 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile12 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 6 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile13 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 7 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile14 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 8 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile15 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 9 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile16 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + + + DEBUGVAR video_menu2_1 Var video_menu[0] = video_menu_0 @@ -59,4 +206,204 @@ Else DEBUGVAR video_menu[0] +Else + + Var showMultiAds = "true" + + SPLIT AdvertiseProfile "/" 1 AdvertiseProfile1 + SPLIT AdvertiseProfile "/" 2 AdvertiseProfile2 + SPLIT AdvertiseProfile "/" 3 AdvertiseProfile3 + SPLIT AdvertiseProfile "/" 4 AdvertiseProfile4 + SPLIT AdvertiseProfile "/" 5 AdvertiseProfile5 + SPLIT AdvertiseProfile "/" 6 AdvertiseProfile6 + SPLIT AdvertiseProfile "/" 7 AdvertiseProfile7 + SPLIT AdvertiseProfile "/" 8 AdvertiseProfile8 + SPLIT AdvertiseProfile "/" 9 AdvertiseProfile9 + SPLIT AdvertiseProfile "/" 10 AdvertiseProfile10 + SPLIT AdvertiseProfile "/" 11 AdvertiseProfile11 + SPLIT AdvertiseProfile "/" 12 AdvertiseProfile12 + SPLIT AdvertiseProfile "/" 13 AdvertiseProfile13 + SPLIT AdvertiseProfile "/" 14 AdvertiseProfile14 + SPLIT AdvertiseProfile "/" 15 AdvertiseProfile15 + SPLIT AdvertiseProfile "/" 16 AdvertiseProfile16 + SPLIT AdvertiseProfile "/" 17 AdvertiseProfile17 + SPLIT AdvertiseProfile "/" 18 AdvertiseProfile18 + +; Default + Var AdvTaobinHome = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + Var AdvTaobinMenu2 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu2_" + Var video_main_0 = AdvTaobinHome + AdvertiseProfile7 + Var video_main_0 = video_main_0 + ".mp4" + Var video_main_1 = AdvTaobinHome + AdvertiseProfile8 + Var video_main_1 = video_main_1 + ".mp4" + Var video_main_2 = AdvTaobinHome + AdvertiseProfile9 + Var video_main_2 = video_main_2 + ".mp4" + Var video_main_3 = AdvTaobinHome + AdvertiseProfile10 + Var video_main_3 = video_main_3 + ".mp4" + Var video_main_4 = AdvTaobinHome + AdvertiseProfile11 + Var video_main_4 = video_main_4 + ".mp4" + Var video_main_5 = AdvTaobinHome + AdvertiseProfile12 + Var video_main_5 = video_main_5 + ".mp4" + Var video_main_6 = AdvTaobinHome + AdvertiseProfile13 + Var video_main_6 = video_main_6 + ".mp4" + Var video_main_7 = AdvTaobinHome + AdvertiseProfile14 + Var video_main_7 = video_main_7 + ".mp4" + Var video_main_8 = AdvTaobinHome + AdvertiseProfile15 + Var video_main_8 = video_main_8 + ".mp4" + Var video_main_9 = AdvTaobinHome + AdvertiseProfile16 + Var video_main_9 = video_main_9 + ".mp4" + + If AdvertiseProfile7 = "00" Then + Var video_main_count = 1 + Else + If AdvertiseProfile8 = "00" Then + Var video_main_count = 1 + Else + If AdvertiseProfile9 = "00" Then + Var video_main_count = 2 + Else + If AdvertiseProfile10 = "00" Then + Var video_main_count = 3 + Else + If AdvertiseProfile11 = "00" Then + Var video_main_count = 4 + Else + If AdvertiseProfile12 = "00" Then + Var video_main_count = 5 + Else + Var video_main_count = 6 + EndIf + EndIf + EndIf + EndIf + EndIf + EndIf + + If VideoAdvIndex = 0 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile7 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 1 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile8 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 2 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile9 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 3 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile10 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 4 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile11 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 5 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile12 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 6 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile13 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 7 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile14 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 8 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile15 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + If VideoAdvIndex = 9 Then + Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile16 + Var video_menu_0 = video_menu_0 + ".mp4" + EndIf + + + If VideoAdvIndex = 0 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile7 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 1 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile8 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 2 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile9 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 3 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile10 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 4 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile11 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 5 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile12 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 6 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile13 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 7 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile14 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 8 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile15 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + If VideoAdvIndex = 9 Then + Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile16 + Var video_menu2_1 = video_menu2_1 + ".mp4" + EndIf + + + DEBUGVAR video_menu2_1 + + DEBUGVAR video_main_0 + DEBUGVAR video_menu_0 + + ; split from adv profile + + + Var video_menu[0] = video_menu_0 + Var video_menu[1] = video_menu_0 + Var video_menu[2] = video_menu_0 + Var video_menu[3] = video_menu_0 + Var video_menu[4] = video_menu_0 + Var video_menu[5] = video_menu_0 + Var video_menu[6] = video_menu_0 + Var video_menu[7] = video_menu_0 + Var video_menu[8] = video_menu_0 + Var video_menu[9] = video_menu_0 + Var video_menu[10] = video_menu_0 + Var video_menu[11] = video_menu_0 + Var video_menu[12] = video_menu_0 + Var video_menu[13] = video_menu_0 + Var video_menu[14] = video_menu_0 + Var video_menu[15] = video_menu_0 + Var video_menu[16] = video_menu_0 + Var video_menu[17] = video_menu_0 + Var video_menu[18] = video_menu_0 + Var video_menu[19] = video_menu_0 + Var video_menu[20] = video_menu_0 + Var video_menu[21] = video_menu_0 + Var video_menu[22] = video_menu_0 + Var video_menu[23] = video_menu_0 + Var video_menu[24] = video_menu_0 + Var video_menu[25] = video_menu_0 + Var video_menu[26] = video_menu_0 + Var video_menu[27] = video_menu_0 + Var video_menu[28] = video_menu_0 + Var video_menu[29] = video_menu_0 + + DEBUGVAR video_menu[0] + + EndIf \ No newline at end of file diff --git a/xml/page_board.xml b/xml/page_board.xml index e2c50441..53100169 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -386,162 +386,8 @@ EndIf - SPLIT AdvertiseProfile "/" 1 AdvertiseProfile1 - SPLIT AdvertiseProfile "/" 2 AdvertiseProfile2 - SPLIT AdvertiseProfile "/" 3 AdvertiseProfile3 - SPLIT AdvertiseProfile "/" 4 AdvertiseProfile4 - SPLIT AdvertiseProfile "/" 5 AdvertiseProfile5 - SPLIT AdvertiseProfile "/" 6 AdvertiseProfile6 - SPLIT AdvertiseProfile "/" 7 AdvertiseProfile7 - SPLIT AdvertiseProfile "/" 8 AdvertiseProfile8 - SPLIT AdvertiseProfile "/" 9 AdvertiseProfile9 - SPLIT AdvertiseProfile "/" 10 AdvertiseProfile10 - SPLIT AdvertiseProfile "/" 11 AdvertiseProfile11 - SPLIT AdvertiseProfile "/" 12 AdvertiseProfile12 - SPLIT AdvertiseProfile "/" 13 AdvertiseProfile13 - SPLIT AdvertiseProfile "/" 14 AdvertiseProfile14 - SPLIT AdvertiseProfile "/" 15 AdvertiseProfile15 - SPLIT AdvertiseProfile "/" 16 AdvertiseProfile16 - SPLIT AdvertiseProfile "/" 17 AdvertiseProfile17 - SPLIT AdvertiseProfile "/" 18 AdvertiseProfile18 - -; Default - Var AdvTaobinHome = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" - Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" - Var AdvTaobinMenu2 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu2_" - Var video_main_0 = AdvTaobinHome + AdvertiseProfile7 - Var video_main_0 = video_main_0 + ".mp4" - Var video_main_1 = AdvTaobinHome + AdvertiseProfile8 - Var video_main_1 = video_main_1 + ".mp4" - Var video_main_2 = AdvTaobinHome + AdvertiseProfile9 - Var video_main_2 = video_main_2 + ".mp4" - Var video_main_3 = AdvTaobinHome + AdvertiseProfile10 - Var video_main_3 = video_main_3 + ".mp4" - Var video_main_4 = AdvTaobinHome + AdvertiseProfile11 - Var video_main_4 = video_main_4 + ".mp4" - Var video_main_5 = AdvTaobinHome + AdvertiseProfile12 - Var video_main_5 = video_main_5 + ".mp4" - Var video_main_6 = AdvTaobinHome + AdvertiseProfile13 - Var video_main_6 = video_main_6 + ".mp4" - Var video_main_7 = AdvTaobinHome + AdvertiseProfile14 - Var video_main_7 = video_main_7 + ".mp4" - Var video_main_8 = AdvTaobinHome + AdvertiseProfile15 - Var video_main_8 = video_main_8 + ".mp4" - Var video_main_9 = AdvTaobinHome + AdvertiseProfile16 - Var video_main_9 = video_main_9 + ".mp4" - - If AdvertiseProfile7 = "00" Then - Var video_main_count = 1 - Else - If AdvertiseProfile8 = "00" Then - Var video_main_count = 1 - Else - If AdvertiseProfile9 = "00" Then - Var video_main_count = 2 - Else - If AdvertiseProfile10 = "00" Then - Var video_main_count = 3 - Else - If AdvertiseProfile11 = "00" Then - Var video_main_count = 4 - Else - If AdvertiseProfile12 = "00" Then - Var video_main_count = 5 - Else - Var video_main_count = 6 - EndIf - EndIf - EndIf - EndIf - EndIf - EndIf - - If VideoAdvIndex = 0 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile7 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 1 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile8 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 2 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile9 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 3 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile10 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 4 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile11 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 5 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile12 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 6 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile13 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 7 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile14 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 8 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile15 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 9 Then - Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile16 - Var video_menu_0 = video_menu_0 + ".mp4" - EndIf - If VideoAdvIndex = 0 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile7 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 1 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile8 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 2 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile9 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 3 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile10 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 4 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile11 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 5 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile12 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 6 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile13 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 7 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile14 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 8 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile15 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - If VideoAdvIndex = 9 Then - Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile16 - Var video_menu2_1 = video_menu2_1 + ".mp4" - EndIf - - - DEBUGVAR video_menu2_1 - ; if enable TRY "ROOT/taobin_project/xml/multi_ads/ads_path.ev" @@ -1737,7 +1583,7 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - +4 Var OpenFromPageBoard = 1 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index d0f11960..45376f6c 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -591,6 +591,7 @@ 1750 1080 Center + KanitLightTTF 48 0x513C2F diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 5f54a907..9e4fcf63 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -483,7 +483,7 @@ VendingCreditRemain -;include="ROOT/taobin_project/inc/video.inc" +;include="ROOT/taobin_project/inc/video_no_eventopen.inc" ; diff --git a/xml_main/startup.xml b/xml_main/startup.xml index b3b90430..8f70a112 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.21" - Var XMLPageVersionInt = 821 + Var XMLPageVersion = "8.22" + Var XMLPageVersionInt = 822 ;Oreo Var OreoGuarantee = 0