Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

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

image/event/image_template3

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/pro_rerun.png
-normal_thai=ROOT/taobin_project/image/event/pro_rerun.png
-press_eng=ROOT/taobin_project/image/event/pro_rerun.png
-press_thai=ROOT/taobin_project/image/event/pro_rerun.png
-disable_eng=ROOT/taobin_project/image/event/pro_rerun.png
-disable_thai=ROOT/taobin_project/image/event/pro_rerun.png
+normal_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+normal_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+press_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+press_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+disable_eng=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png
+disable_thai=ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png