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

adv/sync_1.file

@@ -1,5 +1,5 @@
-total 265980
--rw-rw---- 1 root sdcard_rw        0 2023-02-09 09:04 sync_1.file
+total 260156
+-rw-rw---- 1 root sdcard_rw        0 2021-03-18 16:47 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2021-07-07 16:02 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  3647528 2021-07-06 15:30 taobin_adv_01.mp4
 -rw-rw---- 1 root sdcard_rw  3184464 2021-06-22 14:08 taobin_adv_02.mp4
@@ -11,11 +11,12 @@ total 265980
 -rw-rw---- 1 root sdcard_rw  8448989 2023-01-17 11:44 taobin_adv_08.mp4
 -rw-rw---- 1 root sdcard_rw  2461527 2022-06-10 14:31 taobin_adv_09.mp4
 -rw-rw---- 1 root sdcard_rw 10011292 2022-12-19 15:25 taobin_adv_10.mp4
+-rw-rw---- 1 root sdcard_rw  4001486 2021-03-18 15:00 taobin_adv_10_.mp4
 -rw-rw---- 1 root sdcard_rw  2734331 2023-01-09 17:30 taobin_adv_11.mp4
 -rw-rw---- 1 root sdcard_rw  2671705 2022-06-10 17:22 taobin_adv_12.mp4
--rw-rw---- 1 root sdcard_rw  2756221 2022-06-10 14:32 taobin_adv_13.mp4
+-rw-rw---- 1 root sdcard_rw   381590 2023-03-17 17:43 taobin_adv_13.mp4
 -rw-rw---- 1 root sdcard_rw  3796147 2022-09-16 09:01 taobin_adv_14.mp4
--rw-rw---- 1 root sdcard_rw  2416471 2022-11-15 10:25 taobin_adv_15.mp4
+-rw-rw---- 1 root sdcard_rw   941300 2023-02-17 11:23 taobin_adv_15.mp4
 -rw-rw---- 1 root sdcard_rw  6086338 2022-10-10 11:29 taobin_adv_16.mp4
 -rw-rw---- 1 root sdcard_rw 18918525 2022-07-25 14:47 taobin_adv_17.mp4
 -rw-rw---- 1 root sdcard_rw  2691879 2022-10-10 11:32 taobin_adv_18.mp4
@@ -34,9 +35,9 @@ total 265980
 -rw-rw---- 1 root sdcard_rw  6392776 2022-12-19 15:25 taobin_adv_menu2_10.mp4
 -rw-rw---- 1 root sdcard_rw  2599149 2023-01-09 17:30 taobin_adv_menu2_11.mp4
 -rw-rw---- 1 root sdcard_rw  1801226 2022-06-10 17:21 taobin_adv_menu2_12.mp4
--rw-rw---- 1 root sdcard_rw  2264499 2022-06-10 14:36 taobin_adv_menu2_13.mp4
+-rw-rw---- 1 root sdcard_rw   251935 2023-03-17 17:41 taobin_adv_menu2_13.mp4
 -rw-rw---- 1 root sdcard_rw  3043427 2022-09-16 09:01 taobin_adv_menu2_14.mp4
--rw-rw---- 1 root sdcard_rw  1844290 2022-11-15 10:25 taobin_adv_menu2_15.mp4
+-rw-rw---- 1 root sdcard_rw   754668 2023-02-17 11:23 taobin_adv_menu2_15.mp4
 -rw-rw---- 1 root sdcard_rw  3897011 2022-10-10 11:29 taobin_adv_menu2_16.mp4
 -rw-rw---- 1 root sdcard_rw 18108788 2022-07-25 14:47 taobin_adv_menu2_17.mp4
 -rw-rw---- 1 root sdcard_rw  2277074 2022-10-10 11:32 taobin_adv_menu2_18.mp4
@@ -55,9 +56,9 @@ total 265980
 -rw-rw---- 1 root sdcard_rw  6688846 2022-12-19 15:25 taobin_adv_menu_10.mp4
 -rw-rw---- 1 root sdcard_rw  2201341 2023-01-09 17:30 taobin_adv_menu_11.mp4
 -rw-rw---- 1 root sdcard_rw  1911441 2022-06-10 17:21 taobin_adv_menu_12.mp4
--rw-rw---- 1 root sdcard_rw  2145648 2022-06-10 14:36 taobin_adv_menu_13.mp4
+-rw-rw---- 1 root sdcard_rw   258907 2023-03-17 17:45 taobin_adv_menu_13.mp4
 -rw-rw---- 1 root sdcard_rw  2782199 2022-09-16 09:01 taobin_adv_menu_14.mp4
--rw-rw---- 1 root sdcard_rw  1936375 2022-11-15 10:25 taobin_adv_menu_15.mp4
+-rw-rw---- 1 root sdcard_rw   800836 2023-02-17 11:23 taobin_adv_menu_15.mp4
 -rw-rw---- 1 root sdcard_rw  3964953 2022-10-10 11:29 taobin_adv_menu_16.mp4
 -rw-rw---- 1 root sdcard_rw 18310974 2022-07-25 14:47 taobin_adv_menu_17.mp4
 -rw-rw---- 1 root sdcard_rw  2176162 2022-10-10 11:32 taobin_adv_menu_18.mp4

xml/page_catalog_with_vending.xml

@@ -292,6 +292,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 	; eng
     Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"