diff --git a/adv/taobin_adv_menu_08.mp4 b/adv/taobin_adv_menu_08.mp4 old mode 100644 new mode 100755 index 00d5d21d..bd382cbe 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_16.mp4 b/adv/taobin_adv_menu_16.mp4 index 9a192825..e5933868 100644 Binary files a/adv/taobin_adv_menu_16.mp4 and b/adv/taobin_adv_menu_16.mp4 differ diff --git a/animation01/last-cmd b/animation01/last-cmd index 525ce539..af2855cb 100644 --- a/animation01/last-cmd +++ b/animation01/last-cmd @@ -1 +1,2 @@ -cp /mnt/sdcard/coffeevending/taobin_project/animation01/TaoBinShowCoffeeProcess.mp4 /mnt/sdcard/coffeevending/taobin_project/animation01/TaoBin2_draft02_art2.mp4; \ No newline at end of file +cp /mnt/sdcard/coffeevending/taobin_project/animation01/TaoBinShowCoffeeProcess.mp4 /mnt/sdcard/coffeevending/taobin_project/animation01/TaoBin2_draft02_art2.mp4; +cp /mnt/sdcard/coffeevending/taobin_project/animation01/TaoBinShowCoffeeProcess.mp4 /mnt/sdcard/coffeevending/taobin_project/animation01/TaoBin2_draft02_art3.mp4; diff --git a/animation01/sync_1.file b/animation01/sync_1.file index 870fb809..ce33e949 100644 --- a/animation01/sync_1.file +++ b/animation01/sync_1.file @@ -1,5 +1,4 @@ -total 253108 --rw-rw---- 1 root sdcard_rw 21845 2023-07-27 16:15 Menu Description - Sheet1.tsv +total 241268 -rw-rw---- 1 root sdcard_rw 948282 2023-09-18 18:44 TaoBin2_draft02_art1.mp4 -rw-rw---- 1 root sdcard_rw 3603060 2023-09-18 18:44 TaoBin2_draft02_art10.mp4 -rw-rw---- 1 root sdcard_rw 3166935 2023-09-18 18:44 TaoBin2_draft02_art11.mp4 @@ -11,7 +10,6 @@ total 253108 -rw-rw---- 1 root sdcard_rw 3221745 2023-09-18 18:44 TaoBin2_draft02_art17.mp4 -rw-rw---- 1 root sdcard_rw 1375111 2023-09-18 18:44 TaoBin2_draft02_art18.mp4 -rw-rw---- 1 root sdcard_rw 1478218 2023-09-18 18:44 TaoBin2_draft02_art19.mp4 --rw-rw---- 1 root sdcard_rw 4333281 2023-09-18 18:44 TaoBin2_draft02_art2.mp4 -rw-rw---- 1 root sdcard_rw 1416127 2023-09-18 18:44 TaoBin2_draft02_art20.mp4 -rw-rw---- 1 root sdcard_rw 1495680 2023-09-18 18:44 TaoBin2_draft02_art21.mp4 -rw-rw---- 1 root sdcard_rw 1469930 2023-09-18 18:44 TaoBin2_draft02_art22.mp4 @@ -21,7 +19,6 @@ total 253108 -rw-rw---- 1 root sdcard_rw 3161811 2023-09-18 18:44 TaoBin2_draft02_art26.mp4 -rw-rw---- 1 root sdcard_rw 5410752 2023-09-18 18:44 TaoBin2_draft02_art27.mp4 -rw-rw---- 1 root sdcard_rw 6889815 2023-09-18 18:44 TaoBin2_draft02_art28.mp4 --rw-rw---- 1 root sdcard_rw 1966646 2023-09-18 18:44 TaoBin2_draft02_art3.mp4 -rw-rw---- 1 root sdcard_rw 1876379 2023-09-18 18:44 TaoBin2_draft02_art31.mp4 -rw-rw---- 1 root sdcard_rw 1796407 2023-09-18 18:44 TaoBin2_draft02_art32.mp4 -rw-rw---- 1 root sdcard_rw 1840993 2023-09-18 18:44 TaoBin2_draft02_art33.mp4 @@ -57,12 +54,8 @@ total 253108 -rw-rw---- 1 root sdcard_rw 3740266 2023-09-18 18:44 TaoBin2_draft02_art7.mp4 -rw-rw---- 1 root sdcard_rw 3740266 2023-09-18 18:44 TaoBin2_draft02_art70.mp4 -rw-rw---- 1 root sdcard_rw 3998856 2023-09-18 18:44 TaoBin2_draft02_art8.mp4 --rw-rw---- 1 root sdcard_rw 4850649 2023-06-23 11:30 TaoBin2_draft02_art81.mp4 --rw-rw---- 1 root sdcard_rw 4438509 2023-06-23 11:33 TaoBin2_draft02_art82.mp4 --rw-rw---- 1 root sdcard_rw 4541601 2023-06-23 11:34 TaoBin2_draft02_art83.mp4 --rw-rw---- 1 root sdcard_rw 7357876 2023-06-23 11:35 TaoBin2_draft02_art84.mp4 -rw-rw---- 1 root sdcard_rw 3616423 2023-09-18 18:44 TaoBin2_draft02_art9.mp4 --rw-rw---- 1 root sdcard_rw 65714 2024-06-06 16:29 play_list.tsv --rw-rw---- 1 root sdcard_rw 0 2021-03-18 14:57 sync_0.file --rw-rw---- 1 root sdcard_rw 0 2021-03-18 15:05 sync_1.file --rw-rw---- 1 root sdcard_rw 3905 2022-04-26 17:47 sync_2.file +-rw-rw---- 1 root sdcard_rw 9159102 2024-08-19 12:59 TaoBinShowCoffeeProcess.mp4 +-rw-rw---- 1 root sdcard_rw 326 2024-08-26 13:31 last-cmd +-rw-rw---- 1 root sdcard_rw 69541 2024-08-24 18:46 play_list.tsv +-rw-rw---- 1 root sdcard_rw 0 2024-08-26 13:32 sync_1.file diff --git a/image/page2/bn_coffee.png b/image/page2/bn_coffee.png index d9ba467e..f346ee31 100644 Binary files a/image/page2/bn_coffee.png and b/image/page2/bn_coffee.png differ diff --git a/image/page2/bp_coffee.png b/image/page2/bp_coffee.png index 3e935cec..13913051 100644 Binary files a/image/page2/bp_coffee.png and b/image/page2/bp_coffee.png differ diff --git a/image/page3/bp_coffee.png b/image/page3/bp_coffee.png index eb749462..2775fa5e 100644 Binary files a/image/page3/bp_coffee.png and b/image/page3/bp_coffee.png differ diff --git a/image/page3_2/bn_coffee2.png b/image/page3_2/bn_coffee2.png index 96edea75..cedc48cb 100644 Binary files a/image/page3_2/bn_coffee2.png and b/image/page3_2/bn_coffee2.png differ diff --git a/image/page3_2/bp_coffee2.png b/image/page3_2/bp_coffee2.png index ad4c7f6e..c92116f4 100644 Binary files a/image/page3_2/bp_coffee2.png and b/image/page3_2/bp_coffee2.png differ diff --git a/image/page_doing/txt_2.png b/image/page_doing/txt_2.png index 20069a36..5bd197ff 100644 Binary files a/image/page_doing/txt_2.png and b/image/page_doing/txt_2.png differ diff --git a/image/page_doing/txt_2_en.png b/image/page_doing/txt_2_en.png index 5842adfd..d5ce80b2 100644 Binary files a/image/page_doing/txt_2_en.png and b/image/page_doing/txt_2_en.png differ diff --git a/image/page_doing/txt_3.png b/image/page_doing/txt_3.png index 3268f9d6..e951ff1c 100644 Binary files a/image/page_doing/txt_3.png and b/image/page_doing/txt_3.png differ diff --git a/image/page_doing/txt_3_en.png b/image/page_doing/txt_3_en.png index 301ab8af..739a0f8b 100644 Binary files a/image/page_doing/txt_3_en.png and b/image/page_doing/txt_3_en.png differ diff --git a/image/sync_1.file b/image/sync_1.file index e69de29b..95df1c7f 100644 --- a/image/sync_1.file +++ b/image/sync_1.file @@ -0,0 +1,322 @@ +./page2: +total 904 +-rw-rw---- 1 root sdcard_rw 2275 2023-10-27 09:46 Boonterm.png +-rw-rw---- 1 root sdcard_rw 54171 2023-10-27 09:46 DrinkFree.png +-rw-rw---- 1 root sdcard_rw 133 2023-10-27 09:46 ad_blank1.png +-rw-rw---- 1 root sdcard_rw 6944 2023-10-27 09:46 bd_main_page_topup.png +-rw-rw---- 1 root sdcard_rw 24665 2023-10-27 09:46 bn_HealthyOption.png +-rw-rw---- 1 root sdcard_rw 22216 2023-10-27 09:46 bn_Healthymenu.png +-rw-rw---- 1 root sdcard_rw 19993 2024-05-30 09:41 bn_Pepsi_7up.png +-rw-rw---- 1 root sdcard_rw 23947 2023-10-27 09:46 bn_appfast.png +-rw-rw---- 1 root sdcard_rw 898 2023-10-27 09:46 bn_back_arrow.png +-rw-rw---- 1 root sdcard_rw 1246 2023-10-27 09:46 bn_back_arrow_2.png +-rw-rw---- 1 root sdcard_rw 11637 2023-10-27 09:46 bn_cho_caramel.png +-rw-rw---- 1 root sdcard_rw 13656 2023-10-27 09:46 bn_cocktail.png +-rw-rw---- 1 root sdcard_rw 9444 2024-08-26 22:26 bn_coffee.png +-rw-rw---- 1 root sdcard_rw 9026 2023-10-27 09:46 bn_diy.png +-rw-rw---- 1 root sdcard_rw 1660 2023-10-27 09:46 bn_eng_lang.png +-rw-rw---- 1 root sdcard_rw 1610 2023-10-27 09:46 bn_eng_lang_2.png +-rw-rw---- 1 root sdcard_rw 8788 2023-10-27 09:46 bn_fruit.png +-rw-rw---- 1 root sdcard_rw 3905 2023-10-27 09:46 bn_iced_cola.png +-rw-rw---- 1 root sdcard_rw 10216 2023-10-27 09:46 bn_iced_lemonade_soda.png +-rw-rw---- 1 root sdcard_rw 12579 2023-10-27 09:46 bn_iced_ume_soda.png +-rw-rw---- 1 root sdcard_rw 21215 2023-10-27 09:46 bn_kidmenu.png +-rw-rw---- 1 root sdcard_rw 7553 2024-07-26 07:03 bn_main_page_member.png +-rw-rw---- 1 root sdcard_rw 7278 2023-10-27 09:46 bn_main_page_topup.png +-rw-rw---- 1 root sdcard_rw 14086 2023-10-27 09:46 bn_protein.png +-rw-rw---- 1 root sdcard_rw 25797 2023-10-27 09:46 bn_soda.png +-rw-rw---- 1 root sdcard_rw 24540 2023-10-27 09:46 bn_soda_coke.png +-rw-rw---- 1 root sdcard_rw 8686 2023-10-27 09:46 bn_tea.png +-rw-rw---- 1 root sdcard_rw 1160 2023-10-27 09:46 bn_thai_lang_2.png +-rw-rw---- 1 root sdcard_rw 10097 2023-10-27 09:46 bn_vending_machine.png +-rw-rw---- 1 root sdcard_rw 25998 2023-10-27 09:46 bp_HealthyOption.png +-rw-rw---- 1 root sdcard_rw 21733 2024-05-30 09:54 bp_Pepsi_7up.png +-rw-rw---- 1 root sdcard_rw 25638 2023-10-27 09:46 bp_appfast.png +-rw-rw---- 1 root sdcard_rw 12772 2023-10-27 09:46 bp_cho_caramel.png +-rw-rw---- 1 root sdcard_rw 15084 2023-10-27 09:46 bp_cocktail.png +-rw-rw---- 1 root sdcard_rw 10317 2024-08-26 22:27 bp_coffee.png +-rw-rw---- 1 root sdcard_rw 10256 2023-10-27 09:46 bp_diy.png +-rw-rw---- 1 root sdcard_rw 9566 2023-10-27 09:46 bp_fruit.png +-rw-rw---- 1 root sdcard_rw 22402 2023-10-27 09:46 bp_kidmenu.png +-rw-rw---- 1 root sdcard_rw 7250 2024-07-26 07:03 bp_main_page_member.png +-rw-rw---- 1 root sdcard_rw 6943 2023-10-27 09:46 bp_main_page_topup.png +-rw-rw---- 1 root sdcard_rw 15422 2023-10-27 09:46 bp_protein.png +-rw-rw---- 1 root sdcard_rw 19279 2023-10-27 09:46 bp_soda.png +-rw-rw---- 1 root sdcard_rw 25796 2023-10-27 09:46 bp_soda_coke.png +-rw-rw---- 1 root sdcard_rw 9628 2023-10-27 09:46 bp_tea.png +-rw-rw---- 1 root sdcard_rw 11175 2023-10-27 09:46 bp_vending_machine.png +-rw-rw---- 1 root sdcard_rw 18404 2023-10-27 09:46 text1.png +-rw-rw---- 1 root sdcard_rw 3056 2023-10-27 09:46 text2.png + +./page2_en/page2: +total 784 +-rw-rw---- 1 root sdcard_rw 2610 2023-09-18 18:44 Coffee page.png +-rw-rw---- 1 root sdcard_rw 55447 2023-09-18 18:44 DrinkFree.png +-rw-rw---- 1 root sdcard_rw 6994 2023-09-18 18:44 bd_main_page_topup.png +-rw-rw---- 1 root sdcard_rw 22790 2023-09-18 18:44 bn_HealthyOption.png +-rw-rw---- 1 root sdcard_rw 19234 2024-05-30 09:58 bn_Pepsi_7up.png +-rw-rw---- 1 root sdcard_rw 23862 2023-09-18 18:44 bn_appfast.png +-rw-rw---- 1 root sdcard_rw 1054 2023-09-18 18:44 bn_back_arrow.png +-rw-rw---- 1 root sdcard_rw 12432 2023-09-18 18:44 bn_cho_caramel.png +-rw-rw---- 1 root sdcard_rw 13964 2023-09-18 18:44 bn_cocktail.png +-rw-rw---- 1 root sdcard_rw 9754 2023-09-18 18:44 bn_coffee.png +-rw-rw---- 1 root sdcard_rw 10154 2023-09-18 18:44 bn_diy.png +-rw-rw---- 1 root sdcard_rw 1769 2023-09-18 18:44 bn_eng_lang.png +-rw-rw---- 1 root sdcard_rw 9713 2023-09-18 18:44 bn_fruit.png +-rw-rw---- 1 root sdcard_rw 21460 2023-09-18 18:44 bn_kidmenu.png +-rw-rw---- 1 root sdcard_rw 7306 2024-07-26 07:05 bn_main_page_member.png +-rw-rw---- 1 root sdcard_rw 7159 2023-09-18 18:44 bn_main_page_topup.png +-rw-rw---- 1 root sdcard_rw 14893 2023-09-18 18:44 bn_protein.png +-rw-rw---- 1 root sdcard_rw 18666 2023-09-18 18:44 bn_soda.png +-rw-rw---- 1 root sdcard_rw 24897 2023-09-18 18:44 bn_soda_coke.png +-rw-rw---- 1 root sdcard_rw 8870 2023-09-18 18:44 bn_tea.png +-rw-rw---- 1 root sdcard_rw 11580 2023-09-18 18:44 bn_vending_machine.png +-rw-rw---- 1 root sdcard_rw 15349 2023-09-18 18:44 bp_Cocktail.png +-rw-rw---- 1 root sdcard_rw 24033 2023-09-18 18:44 bp_HealthyOption.png +-rw-rw---- 1 root sdcard_rw 20558 2024-05-30 09:58 bp_Pepsi_7up.png +-rw-rw---- 1 root sdcard_rw 25529 2023-09-18 18:44 bp_appfast.png +-rw-rw---- 1 root sdcard_rw 13791 2023-09-18 18:44 bp_cho_caramel.png +-rw-rw---- 1 root sdcard_rw 10859 2023-09-18 18:44 bp_coffee.png +-rw-rw---- 1 root sdcard_rw 11539 2023-09-18 18:44 bp_diy.png +-rw-rw---- 1 root sdcard_rw 10741 2023-09-18 18:44 bp_fruit.png +-rw-rw---- 1 root sdcard_rw 22599 2023-09-18 18:44 bp_kidmenu.png +-rw-rw---- 1 root sdcard_rw 6406 2024-07-26 07:05 bp_main_page_member.png +-rw-rw---- 1 root sdcard_rw 16073 2023-09-18 18:44 bp_protein.png +-rw-rw---- 1 root sdcard_rw 19772 2023-09-18 18:44 bp_soda.png +-rw-rw---- 1 root sdcard_rw 26286 2023-09-18 18:44 bp_soda_coke.png +-rw-rw---- 1 root sdcard_rw 9829 2023-09-18 18:44 bp_tea.png +-rw-rw---- 1 root sdcard_rw 12685 2023-09-18 18:44 bp_vending_machine.png +-rw-rw---- 1 root sdcard_rw 18908 2023-09-18 18:44 text1.png +-rw-rw---- 1 root sdcard_rw 4029 2023-09-18 18:44 text2.png + +./page3: +total 436 +-rw-rw---- 1 root sdcard_rw 5230 2023-10-27 09:46 ad_main.png +-rw-rw---- 1 root sdcard_rw 993 2023-10-27 09:46 bg1.png +-rw-rw---- 1 root sdcard_rw 3319 2024-06-04 10:58 bn_Pepsi_7up.png +-rw-rw---- 1 root sdcard_rw 2705 2023-10-27 09:46 bn_appfast.png +-rw-rw---- 1 root sdcard_rw 2192 2023-10-27 09:46 bn_appfast2.png +-rw-rw---- 1 root sdcard_rw 1059 2023-10-27 09:46 bn_back_arrow.png +-rw-rw---- 1 root sdcard_rw 2094 2023-10-27 09:46 bn_bestseller.png +-rw-rw---- 1 root sdcard_rw 3403 2023-10-27 09:46 bn_cho_ca.png +-rw-rw---- 1 root sdcard_rw 2886 2023-10-27 09:46 bn_cho_ca2.png +-rw-rw---- 1 root sdcard_rw 2195 2023-10-27 09:46 bn_cocktail.png +-rw-rw---- 1 root sdcard_rw 1846 2023-10-27 09:46 bn_coffee.png +-rw-rw---- 1 root sdcard_rw 1694 2023-10-27 09:46 bn_coffee2.png +-rw-rw---- 1 root sdcard_rw 1625 2023-10-27 09:46 bn_eng_lang.png +-rw-rw---- 1 root sdcard_rw 2002 2023-10-27 09:46 bn_forkid.png +-rw-rw---- 1 root sdcard_rw 1937 2023-10-27 09:46 bn_forkid2.png +-rw-rw---- 1 root sdcard_rw 2154 2023-10-27 09:46 bn_fruit.png +-rw-rw---- 1 root sdcard_rw 2362 2023-10-27 09:46 bn_protein.png +-rw-rw---- 1 root sdcard_rw 1876 2023-10-27 09:46 bn_protein2.png +-rw-rw---- 1 root sdcard_rw 1979 2023-10-27 09:46 bn_recommend2.png +-rw-rw---- 1 root sdcard_rw 3178 2023-10-27 09:46 bn_sodada.png +-rw-rw---- 1 root sdcard_rw 2397 2023-10-27 09:46 bn_sodada2.png +-rw-rw---- 1 root sdcard_rw 3737 2023-10-27 09:46 bn_sugar_and_energy.png +-rw-rw---- 1 root sdcard_rw 1365 2023-10-27 09:46 bn_tea.png +-rw-rw---- 1 root sdcard_rw 1315 2023-10-27 09:46 bn_tea2.png +-rw-rw---- 1 root sdcard_rw 2119 2023-10-27 09:46 bn_vending.png +-rw-rw---- 1 root sdcard_rw 2104 2023-10-27 09:46 bn_vending2.png +-rw-rw---- 1 root sdcard_rw 3275 2024-06-04 10:58 bp_Pepsi_7up.png +-rw-rw---- 1 root sdcard_rw 2567 2023-10-27 09:46 bp_appfast.png +-rw-rw---- 1 root sdcard_rw 2134 2023-10-27 09:46 bp_appfast2.png +-rw-rw---- 1 root sdcard_rw 2059 2023-10-27 09:46 bp_bestseller.png +-rw-rw---- 1 root sdcard_rw 3148 2023-10-27 09:46 bp_cho_ca.png +-rw-rw---- 1 root sdcard_rw 2631 2023-10-27 09:46 bp_cho_ca2.png +-rw-rw---- 1 root sdcard_rw 2125 2023-10-27 09:46 bp_cocktail.png +-rw-rw---- 1 root sdcard_rw 1995 2024-08-26 22:04 bp_coffee.png +-rw-rw---- 1 root sdcard_rw 1639 2023-10-27 09:46 bp_coffee2.png +-rw-rw---- 1 root sdcard_rw 1924 2023-10-27 09:46 bp_forkid.png +-rw-rw---- 1 root sdcard_rw 1867 2023-10-27 09:46 bp_forkid2.png +-rw-rw---- 1 root sdcard_rw 2130 2023-10-27 09:46 bp_fruit.png +-rw-rw---- 1 root sdcard_rw 2361 2023-10-27 09:46 bp_protein.png +-rw-rw---- 1 root sdcard_rw 1812 2023-10-27 09:46 bp_protein2.png +-rw-rw---- 1 root sdcard_rw 1996 2023-10-27 09:46 bp_recommend2.png +-rw-rw---- 1 root sdcard_rw 3090 2023-10-27 09:46 bp_sodada.png +-rw-rw---- 1 root sdcard_rw 2310 2023-10-27 09:46 bp_sodada2.png +-rw-rw---- 1 root sdcard_rw 3468 2023-10-27 09:46 bp_sugar_and_energy.png +-rw-rw---- 1 root sdcard_rw 1320 2023-10-27 09:46 bp_tea.png +-rw-rw---- 1 root sdcard_rw 1290 2023-10-27 09:46 bp_tea2.png +-rw-rw---- 1 root sdcard_rw 2053 2023-10-27 09:46 bp_vending.png +-rw-rw---- 1 root sdcard_rw 2053 2023-10-27 09:46 bp_vending2.png +-rw-rw---- 1 root sdcard_rw 147 2023-10-27 09:46 tab_line_bottom.png +-rw-rw---- 1 root sdcard_rw 10150 2023-10-27 09:46 touch_less_order.png +-rw-rw---- 1 root sdcard_rw 20422 2023-10-27 09:46 touch_less_order_db.png + +./page3_2: +total 192 +-rw-rw---- 1 root sdcard_rw 3319 2024-06-04 10:58 bn_Pepsi_7up.png +-rw-rw---- 1 root sdcard_rw 2191 2023-10-27 09:46 bn_appfast2.png +-rw-rw---- 1 root sdcard_rw 2875 2023-10-27 09:46 bn_cho_ca2.png +-rw-rw---- 1 root sdcard_rw 2056 2023-10-27 09:46 bn_cocktail.png +-rw-rw---- 1 root sdcard_rw 2038 2024-08-26 22:04 bn_coffee2.png +-rw-rw---- 1 root sdcard_rw 1948 2023-10-27 09:46 bn_forkid2.png +-rw-rw---- 1 root sdcard_rw 3178 2023-10-27 09:46 bn_health.png +-rw-rw---- 1 root sdcard_rw 1846 2023-10-27 09:46 bn_protein2.png +-rw-rw---- 1 root sdcard_rw 1983 2023-10-27 09:46 bn_recommend2.png +-rw-rw---- 1 root sdcard_rw 2390 2023-10-27 09:46 bn_sodada2.png +-rw-rw---- 1 root sdcard_rw 1315 2023-10-27 09:46 bn_tea2.png +-rw-rw---- 1 root sdcard_rw 2130 2023-10-27 09:46 bn_vending2.png +-rw-rw---- 1 root sdcard_rw 3275 2024-06-04 10:58 bp_Pepsi_7up.png +-rw-rw---- 1 root sdcard_rw 2125 2023-10-27 09:46 bp_appfast2.png +-rw-rw---- 1 root sdcard_rw 2621 2023-10-27 09:46 bp_cho_ca2.png +-rw-rw---- 1 root sdcard_rw 2014 2023-10-27 09:46 bp_cocktail.png +-rw-rw---- 1 root sdcard_rw 1998 2024-08-26 22:25 bp_coffee2.png +-rw-rw---- 1 root sdcard_rw 1868 2023-10-27 09:46 bp_forkid2.png +-rw-rw---- 1 root sdcard_rw 2974 2023-10-27 09:46 bp_health.png +-rw-rw---- 1 root sdcard_rw 1820 2023-10-27 09:46 bp_protein2.png +-rw-rw---- 1 root sdcard_rw 1999 2023-10-27 09:46 bp_recommend2.png +-rw-rw---- 1 root sdcard_rw 2310 2023-10-27 09:46 bp_sodada2.png +-rw-rw---- 1 root sdcard_rw 1287 2023-10-27 09:46 bp_tea2.png +-rw-rw---- 1 root sdcard_rw 2059 2023-10-27 09:46 bp_vending2.png + +./page_doing: +total 4500 +-rw-rw---- 1 root sdcard_rw 21318 2023-09-18 18:44 6.png +-rw-rw---- 1 root sdcard_rw 3693 2023-09-18 18:44 bn_game_cnt_down.png +-rw-rw---- 1 root sdcard_rw 1988 2024-06-20 17:38 bn_get_lid.png +-rw-rw---- 1 root sdcard_rw 3983 2023-09-18 18:44 bn_get_lid_en.png +-rw-rw---- 1 root sdcard_rw 2250 2024-06-20 17:38 bn_get_more_straw.png +-rw-rw---- 1 root sdcard_rw 4660 2023-09-18 18:44 bn_get_more_straw_en.png +-rw-rw---- 1 root sdcard_rw 3851 2023-09-18 18:44 bn_send_report_lid.png +-rw-rw---- 1 root sdcard_rw 3519 2023-09-18 18:44 bn_send_report_lid_en.png +-rw-rw---- 1 root sdcard_rw 4375 2023-09-18 18:44 bn_send_report_straw.png +-rw-rw---- 1 root sdcard_rw 4343 2023-09-18 18:44 bn_send_report_straw_en.png +-rw-rw---- 1 root sdcard_rw 1736 2024-06-20 17:38 bp_get_lid.png +-rw-rw---- 1 root sdcard_rw 3457 2023-09-18 18:44 bp_get_lid_en.png +-rw-rw---- 1 root sdcard_rw 1945 2024-06-20 17:38 bp_get_more_straw.png +-rw-rw---- 1 root sdcard_rw 4349 2023-09-18 18:44 bp_get_more_straw_en.png +-rw-rw---- 1 root sdcard_rw 3659 2023-09-18 18:44 bp_send_report_lid.png +-rw-rw---- 1 root sdcard_rw 3341 2023-09-18 18:44 bp_send_report_lid_en.png +-rw-rw---- 1 root sdcard_rw 4145 2023-09-18 18:44 bp_send_report_straw.png +-rw-rw---- 1 root sdcard_rw 4126 2023-09-18 18:44 bp_send_report_straw_en.png +-rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png +-rw-rw---- 1 root sdcard_rw 28097 2023-09-18 18:44 brewing_txt_adv1_en.png +-rw-rw---- 1 root sdcard_rw 30982 2023-09-18 18:44 brewing_txt_adv3.png +-rw-rw---- 1 root sdcard_rw 35550 2023-09-18 18:44 brewing_txt_adv3_en.png +-rw-rw---- 1 root sdcard_rw 52622 2024-07-19 18:16 brewing_txt_adv4.png +-rw-rw---- 1 root sdcard_rw 42967 2024-07-19 18:16 brewing_txt_adv4_en.png +-rw-rw---- 1 root sdcard_rw 34923 2023-09-18 18:44 image_bottom1.png +-rw-rw---- 1 root sdcard_rw 5473 2023-09-18 18:44 img2.png +-rw-rw---- 1 root sdcard_rw 4680 2023-09-18 18:44 img2_eng.png +-rw-rw---- 1 root sdcard_rw 138236 2023-09-18 18:44 tao_adv1.png +-rw-rw---- 1 root sdcard_rw 7660 2023-09-18 18:44 text1.png +-rw-rw---- 1 root sdcard_rw 49135 2023-09-18 18:44 text2.png +-rw-rw---- 1 root sdcard_rw 39922 2023-09-18 18:44 text_bottom_eng.png +-rw-rw---- 1 root sdcard_rw 35163 2023-09-18 18:44 text_bottom_thai.png +-rw-rw---- 1 root sdcard_rw 34960 2023-09-18 18:44 text_bottom_thai2.png +-rw-rw---- 1 root sdcard_rw 32061 2023-09-18 18:44 txt_1.png +-rw-rw---- 1 root sdcard_rw 18549 2023-09-18 18:44 txt_10.png +-rw-rw---- 1 root sdcard_rw 18335 2023-09-18 18:44 txt_10_en.png +-rw-rw---- 1 root sdcard_rw 24992 2023-09-18 18:44 txt_11.png +-rw-rw---- 1 root sdcard_rw 23868 2023-09-18 18:44 txt_11_en.png +-rw-rw---- 1 root sdcard_rw 22395 2023-09-18 18:44 txt_12.png +-rw-rw---- 1 root sdcard_rw 20037 2023-09-18 18:44 txt_12_en.png +-rw-rw---- 1 root sdcard_rw 23171 2023-09-18 18:44 txt_13.png +-rw-rw---- 1 root sdcard_rw 24728 2023-09-18 18:44 txt_13_en.png +-rw-rw---- 1 root sdcard_rw 23644 2023-09-18 18:44 txt_14.png +-rw-rw---- 1 root sdcard_rw 22085 2023-09-18 18:44 txt_14_en.png +-rw-rw---- 1 root sdcard_rw 17382 2023-09-18 18:44 txt_15.png +-rw-rw---- 1 root sdcard_rw 21535 2023-09-18 18:44 txt_15_en.png +-rw-rw---- 1 root sdcard_rw 21304 2023-09-18 18:44 txt_16.png +-rw-rw---- 1 root sdcard_rw 23166 2023-09-18 18:44 txt_16_en.png +-rw-rw---- 1 root sdcard_rw 20442 2023-09-18 18:44 txt_17.png +-rw-rw---- 1 root sdcard_rw 16556 2023-09-18 18:44 txt_17_en.png +-rw-rw---- 1 root sdcard_rw 24904 2023-09-18 18:44 txt_18.png +-rw-rw---- 1 root sdcard_rw 20747 2023-09-18 18:44 txt_18_en.png +-rw-rw---- 1 root sdcard_rw 28389 2023-09-18 18:44 txt_19.png +-rw-rw---- 1 root sdcard_rw 25617 2023-09-18 18:44 txt_19_en.png +-rw-rw---- 1 root sdcard_rw 34020 2023-09-18 18:44 txt_1_en.png +-rw-rw---- 1 root sdcard_rw 29904 2024-08-26 14:41 txt_2.png +-rw-rw---- 1 root sdcard_rw 26853 2023-09-18 18:44 txt_20.png +-rw-rw---- 1 root sdcard_rw 24455 2023-09-18 18:44 txt_20_en.png +-rw-rw---- 1 root sdcard_rw 25258 2023-09-18 18:44 txt_21.png +-rw-rw---- 1 root sdcard_rw 23722 2023-09-18 18:44 txt_21_en.png +-rw-rw---- 1 root sdcard_rw 24050 2023-09-18 18:44 txt_22.png +-rw-rw---- 1 root sdcard_rw 26467 2023-09-18 18:44 txt_22_en.png +-rw-rw---- 1 root sdcard_rw 22771 2023-09-18 18:44 txt_23.png +-rw-rw---- 1 root sdcard_rw 17516 2023-09-18 18:44 txt_23_en.png +-rw-rw---- 1 root sdcard_rw 28030 2023-09-18 18:44 txt_25.png +-rw-rw---- 1 root sdcard_rw 29867 2023-09-18 18:44 txt_25_en.png +-rw-rw---- 1 root sdcard_rw 24099 2023-09-18 18:44 txt_26.png +-rw-rw---- 1 root sdcard_rw 23135 2023-09-18 18:44 txt_26_en.png +-rw-rw---- 1 root sdcard_rw 28478 2024-08-26 14:41 txt_2_en.png +-rw-rw---- 1 root sdcard_rw 26771 2024-08-26 14:49 txt_3.png +-rw-rw---- 1 root sdcard_rw 25362 2023-09-18 18:44 txt_31.png +-rw-rw---- 1 root sdcard_rw 23964 2023-09-18 18:44 txt_31_en.png +-rw-rw---- 1 root sdcard_rw 23174 2023-09-18 18:44 txt_32.png +-rw-rw---- 1 root sdcard_rw 24719 2023-09-18 18:44 txt_32_en.png +-rw-rw---- 1 root sdcard_rw 24190 2023-09-18 18:44 txt_33.png +-rw-rw---- 1 root sdcard_rw 22246 2023-09-18 18:44 txt_33_en.png +-rw-rw---- 1 root sdcard_rw 27359 2023-09-18 18:44 txt_34.png +-rw-rw---- 1 root sdcard_rw 20670 2023-11-23 16:36 txt_34_en.png +-rw-rw---- 1 root sdcard_rw 22812 2023-09-18 18:44 txt_35.png +-rw-rw---- 1 root sdcard_rw 22285 2023-09-18 18:44 txt_35_en.png +-rw-rw---- 1 root sdcard_rw 34780 2023-09-18 18:44 txt_36.png +-rw-rw---- 1 root sdcard_rw 33707 2023-09-18 18:44 txt_36_en.png +-rw-rw---- 1 root sdcard_rw 21847 2023-09-18 18:44 txt_37.png +-rw-rw---- 1 root sdcard_rw 22144 2023-09-18 18:44 txt_37_en.png +-rw-rw---- 1 root sdcard_rw 30490 2024-08-26 14:49 txt_3_en.png +-rw-rw---- 1 root sdcard_rw 17562 2023-09-18 18:44 txt_4.png +-rw-rw---- 1 root sdcard_rw 25925 2023-09-18 18:44 txt_40.png +-rw-rw---- 1 root sdcard_rw 29796 2023-09-18 18:44 txt_40_en.png +-rw-rw---- 1 root sdcard_rw 27625 2023-09-18 18:44 txt_41.png +-rw-rw---- 1 root sdcard_rw 27415 2023-09-18 18:44 txt_41_en.png +-rw-rw---- 1 root sdcard_rw 33251 2023-09-18 18:44 txt_42.png +-rw-rw---- 1 root sdcard_rw 33734 2023-09-18 18:44 txt_42_en.png +-rw-rw---- 1 root sdcard_rw 42700 2023-09-18 18:44 txt_43.png +-rw-rw---- 1 root sdcard_rw 35567 2023-09-18 18:44 txt_43_en.png +-rw-rw---- 1 root sdcard_rw 18419 2023-09-18 18:44 txt_44.png +-rw-rw---- 1 root sdcard_rw 37091 2023-09-18 18:44 txt_44_en.png +-rw-rw---- 1 root sdcard_rw 39388 2023-09-18 18:44 txt_45.png +-rw-rw---- 1 root sdcard_rw 40946 2023-09-18 18:44 txt_45_en.png +-rw-rw---- 1 root sdcard_rw 24705 2023-09-18 18:44 txt_46.png +-rw-rw---- 1 root sdcard_rw 27055 2023-09-18 18:44 txt_46_en.png +-rw-rw---- 1 root sdcard_rw 36845 2023-09-18 18:44 txt_47.png +-rw-rw---- 1 root sdcard_rw 37112 2023-09-18 18:44 txt_47_en.png +-rw-rw---- 1 root sdcard_rw 39786 2023-09-18 18:44 txt_48.png +-rw-rw---- 1 root sdcard_rw 41312 2023-09-18 18:44 txt_48_en.png +-rw-rw---- 1 root sdcard_rw 37113 2023-09-18 18:44 txt_49.png +-rw-rw---- 1 root sdcard_rw 27060 2023-09-18 18:44 txt_49_en.png +-rw-rw---- 1 root sdcard_rw 23513 2023-09-18 18:44 txt_4_en.png +-rw-rw---- 1 root sdcard_rw 24655 2023-09-18 18:44 txt_5.png +-rw-rw---- 1 root sdcard_rw 33184 2023-09-18 18:44 txt_50.png +-rw-rw---- 1 root sdcard_rw 38394 2023-09-18 18:44 txt_50_en.png +-rw-rw---- 1 root sdcard_rw 33426 2023-09-18 18:44 txt_51.png +-rw-rw---- 1 root sdcard_rw 30214 2023-09-18 18:44 txt_51_en.png +-rw-rw---- 1 root sdcard_rw 25190 2023-09-18 18:44 txt_52.png +-rw-rw---- 1 root sdcard_rw 23394 2023-09-18 18:44 txt_52_en.png +-rw-rw---- 1 root sdcard_rw 25234 2023-09-18 18:44 txt_53.png +-rw-rw---- 1 root sdcard_rw 22382 2023-09-18 18:44 txt_53_en.png +-rw-rw---- 1 root sdcard_rw 18549 2023-09-18 18:44 txt_55.png +-rw-rw---- 1 root sdcard_rw 18299 2023-09-18 18:44 txt_55_en.png +-rw-rw---- 1 root sdcard_rw 26500 2024-06-11 18:03 txt_56.png +-rw-rw---- 1 root sdcard_rw 21994 2024-06-11 18:04 txt_56_en.png +-rw-rw---- 1 root sdcard_rw 32552 2023-09-18 18:44 txt_57.png +-rw-rw---- 1 root sdcard_rw 33291 2023-09-18 18:44 txt_57_en.png +-rw-rw---- 1 root sdcard_rw 21067 2023-12-12 11:25 txt_59.png +-rw-rw---- 1 root sdcard_rw 27646 2023-12-12 11:25 txt_59_en.png +-rw-rw---- 1 root sdcard_rw 32717 2023-09-18 18:44 txt_5_en.png +-rw-rw---- 1 root sdcard_rw 20474 2023-09-18 18:44 txt_6.png +-rw-rw---- 1 root sdcard_rw 24936 2023-12-12 11:25 txt_60.png +-rw-rw---- 1 root sdcard_rw 24702 2023-12-12 11:25 txt_60_en.png +-rw-rw---- 1 root sdcard_rw 25288 2024-05-23 23:35 txt_61_en.png +-rw-rw---- 1 root sdcard_rw 26859 2024-05-29 16:13 txt_62.png +-rw-rw---- 1 root sdcard_rw 28832 2024-05-23 23:35 txt_62_en.png +-rw-rw---- 1 root sdcard_rw 16556 2023-09-18 18:44 txt_6_en.png +-rw-rw---- 1 root sdcard_rw 20203 2023-09-18 18:44 txt_7.png +-rw-rw---- 1 root sdcard_rw 20203 2023-09-18 18:44 txt_70.png +-rw-rw---- 1 root sdcard_rw 20068 2023-09-18 18:44 txt_70_en.png +-rw-rw---- 1 root sdcard_rw 20068 2023-09-18 18:44 txt_7_en.png +-rw-rw---- 1 root sdcard_rw 20339 2023-09-18 18:44 txt_8.png +-rw-rw---- 1 root sdcard_rw 33140 2023-09-18 18:44 txt_81.png +-rw-rw---- 1 root sdcard_rw 32387 2023-09-18 18:44 txt_81_en.png +-rw-rw---- 1 root sdcard_rw 33140 2023-09-18 18:44 txt_82.png +-rw-rw---- 1 root sdcard_rw 32387 2023-09-18 18:44 txt_82_en.png +-rw-rw---- 1 root sdcard_rw 33140 2023-09-18 18:44 txt_83.png +-rw-rw---- 1 root sdcard_rw 32387 2023-09-18 18:44 txt_83_en.png +-rw-rw---- 1 root sdcard_rw 33140 2023-09-18 18:44 txt_84.png +-rw-rw---- 1 root sdcard_rw 32387 2023-09-18 18:44 txt_84_en.png +-rw-rw---- 1 root sdcard_rw 21965 2023-09-18 18:44 txt_8_en.png +-rw-rw---- 1 root sdcard_rw 19244 2023-09-18 18:44 txt_9.png +-rw-rw---- 1 root sdcard_rw 19707 2023-09-18 18:44 txt_9_en.png diff --git a/inc/video.inc b/inc/video.inc index b25e6414..194b6e2c 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -4,6 +4,7 @@ 1080 380 "true" + "Reload" If showMultiAds = "true" Then @@ -62,5 +63,53 @@ EndIf + + + If showMultiAds = "true" Then + + + + + Var ads_idx = ads_idx + 1 + If ads_idx = 30 Then + Var ads_idx = 0 + EndIf + + If a_video_menu[ads_idx] = "" Then + DEBUGVAR a_video_menu[ads_idx] + Var ads_idx = 0 + EndIf + + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + + If CountryName = "Malaysia" Then + If PromotionOreoToppingFreeEnable = 1 Then + Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4" + EndIf + If UseSlideShowVideo = 1 Then + Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4" + EndIf + EndIf + + + Else + DEBUGVAR a_video_menu[ads_idx] + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + + DEBUGVAR DisplayAds + + If CountryName = "Malaysia" Then + If PromotionOreoToppingFreeEnable = 1 Then + Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4" + EndIf + If UseSlideShowVideo = 1 Then + Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4" + EndIf + EndIf + + DisplayAds diff --git a/inter/tha/hardware/exhaust_fan_schedule.ev b/inter/tha/hardware/exhaust_fan_schedule.ev index 5d94c42a..aac1d48e 100644 --- a/inter/tha/hardware/exhaust_fan_schedule.ev +++ b/inter/tha/hardware/exhaust_fan_schedule.ev @@ -15,6 +15,10 @@ DEBUGVAR ExhaustFanMode1 DEBUGVAR ExhaustFanMode2 DEBUGVAR ExhaustFanMode3 +DEBUGVAR AirTemperature +DEBUGVAR AirHumidity + + Var fan_mode_str = "set-fan-mode=" If ExhaustFanTime1Enable = "true" Then diff --git a/ui/lang.tsv b/ui/lang.tsv index 1179c03b..19f8b9a7 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -834,7 +834,7 @@ 800770 Ice Module ชุดหัวน้ำแข็ง 800771 Type number. ใส่ตัวเลข 800772 -800773 +800773 Exhaust Fan Test ทดสอบพัดลมดูดอากาศ 800774 800775 800776 @@ -896,7 +896,7 @@ 810100 Waste Water Tank ถังน้ำทิ้ง -810101 Coffee Grounds กากกาแฟ +810101 Coffee Grounds Compressor เครื่องอัดกาแฟ 810102 Ice Module ชุดทำน้ำแข็ง 810103 Whipper Module ชุดหัวชง 810104 Washing Cup ถ้วยล้าง @@ -910,7 +910,7 @@ 810112 Powder Canister กล่องผง 810113 Syrup Buffer ถังไซรับ 810114 Bean Canister กล่องเมล็ด -810115 Maintenance การซ่อมบำรุง +810115 Maintenance Maintenance (ซ่อมบำรุง) 810116 BACK BACK / กลับสู่เมนู 810117 WORK ORDER MAINTAIN / ใบงาน 810118 SAVE SAVE / บันทึก @@ -936,18 +936,18 @@ 810138 Detail Detail\n(ข้อมูล) 810139 Last Action Last Action\n(เวลาที่ทำล่าสุด) 810140 Status Status\n(สถานะ) -810141 -810142 -810143 -810144 -810145 -810146 -810147 -810148 -810149 -810150 -810151 -810152 +810141 SUBMIT SUBMIT / ยืนยัน +810142 clean ทำความสะอาด +810143 change เปลี่่ยน +810144 normal ปกติ +810145 abnormal ไม่ปกติ +810146 YES YES / ใช่ +810147 NO NO / ไม่ใช่ +810148 Alert ตรวจสอบใบงาน +810149 Please check the last 4 digits of refill order before press submit. ตรวจสอบเลขท้าย4ตัวของใบงานแล้วกดยืนยัน +810150 Volume ปริมาณ +810151 Water Tank ถังน้ำดี +810152 Day วันที่ 810153 810154 810155 diff --git a/video/script3_brew.ev b/video/script3_brew.ev index 95f7e16f..0c06d586 100644 --- a/video/script3_brew.ev +++ b/video/script3_brew.ev @@ -22,3 +22,9 @@ If 7UpLuckyDrawX2Pro = 1 Then ; comment for change this file size EndIf + +Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 16 +Var brew_vdo2 = "ROOT/taobin_project/video/video_test1.mp4" +Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv4.png" + diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index fb7c5c70..ed3ddf79 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -394,6 +394,10 @@ Var adver_brewing_count_down = 10 Var VideoPlayFile = "ROOT/taobin_project/image/page_doing/tao_adv1.png" Var PictureFile = brew_txt1 + + TRY "ROOT/taobin_project/video/script3_frist_brewing.ev" + + EndIf Var CampaignEnable = 0 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 38f6b016..1ce5fcff 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.83" - Var XMLPageVersionInt = 883 + Var XMLPageVersion = "8.84" + Var XMLPageVersionInt = 884 ;Oreo Var OreoGuarantee = 0