diff --git a/adv/sync_4.file b/adv/sync_4.file new file mode 100644 index 00000000..c96abb54 --- /dev/null +++ b/adv/sync_4.file @@ -0,0 +1,36 @@ +total 83088 +-rw-rw---- 1 root sdcard_rw 2667 2022-02-03 17:02 sync_0.file +-rw-rw---- 1 root sdcard_rw 0 2022-02-03 17:03 sync_4.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 +-rw-rw---- 1 root sdcard_rw 4349971 2021-04-21 11:53 taobin_adv_03.mp4 +-rw-rw---- 1 root sdcard_rw 3064661 2021-09-27 13:44 taobin_adv_04.mp4 +-rw-rw---- 1 root sdcard_rw 2211917 2021-09-23 10:57 taobin_adv_05.mp4 +-rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_06.mp4 +-rw-rw---- 1 root sdcard_rw 1637056 2021-09-21 09:57 taobin_adv_07.mp4 +-rw-rw---- 1 root sdcard_rw 1962660 2021-09-17 16:42 taobin_adv_08.mp4 +-rw-rw---- 1 root sdcard_rw 1598810 2021-09-23 11:27 taobin_adv_09.mp4 +-rw-rw---- 1 root sdcard_rw 2769257 2022-02-02 17:17 taobin_adv_10.mp4 +-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_00.mp4 +-rw-rw---- 1 root sdcard_rw 2755962 2021-07-07 15:35 taobin_adv_menu2_01.mp4 +-rw-rw---- 1 root sdcard_rw 2814749 2021-07-07 14:44 taobin_adv_menu2_02.mp4 +-rw-rw---- 1 root sdcard_rw 3111677 2021-04-21 14:21 taobin_adv_menu2_03.mp4 +-rw-rw---- 1 root sdcard_rw 2809964 2021-09-27 13:43 taobin_adv_menu2_04.mp4 +-rw-rw---- 1 root sdcard_rw 1809071 2021-09-23 10:57 taobin_adv_menu2_05.mp4 +-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_06.mp4 +-rw-rw---- 1 root sdcard_rw 1653061 2021-09-21 10:00 taobin_adv_menu2_07.mp4 +-rw-rw---- 1 root sdcard_rw 2098002 2021-09-17 16:42 taobin_adv_menu2_08.mp4 +-rw-rw---- 1 root sdcard_rw 1970490 2021-09-23 11:27 taobin_adv_menu2_09.mp4 +-rw-rw---- 1 root sdcard_rw 2414534 2022-02-02 17:16 taobin_adv_menu2_10.mp4 +-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_00.mp4 +-rw-rw---- 1 root sdcard_rw 2587515 2021-07-07 15:35 taobin_adv_menu_01.mp4 +-rw-rw---- 1 root sdcard_rw 2645861 2021-07-07 14:44 taobin_adv_menu_02.mp4 +-rw-rw---- 1 root sdcard_rw 3117015 2021-04-21 14:21 taobin_adv_menu_03.mp4 +-rw-rw---- 1 root sdcard_rw 2929148 2021-09-27 13:44 taobin_adv_menu_04.mp4 +-rw-rw---- 1 root sdcard_rw 1885128 2021-09-23 10:57 taobin_adv_menu_05.mp4 +-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_06.mp4 +-rw-rw---- 1 root sdcard_rw 1805549 2021-09-21 10:00 taobin_adv_menu_07.mp4 +-rw-rw---- 1 root sdcard_rw 1873183 2021-09-17 16:42 taobin_adv_menu_08.mp4 +-rw-rw---- 1 root sdcard_rw 1967036 2021-09-23 11:27 taobin_adv_menu_09.mp4 +-rw-rw---- 1 root sdcard_rw 2133414 2022-02-02 17:16 taobin_adv_menu_10.mp4 diff --git a/adv/taobin_adv_10.mp4 b/adv/taobin_adv_10.mp4 old mode 100644 new mode 100755 index bf42e901..76215a0c Binary files a/adv/taobin_adv_10.mp4 and b/adv/taobin_adv_10.mp4 differ diff --git a/adv/taobin_adv_menu2_10.mp4 b/adv/taobin_adv_menu2_10.mp4 old mode 100644 new mode 100755 index ae26eb95..054e3761 Binary files a/adv/taobin_adv_menu2_10.mp4 and b/adv/taobin_adv_menu2_10.mp4 differ diff --git a/adv/taobin_adv_menu_10.mp4 b/adv/taobin_adv_menu_10.mp4 old mode 100644 new mode 100755 index ea84e592..3386bf5d Binary files a/adv/taobin_adv_menu_10.mp4 and b/adv/taobin_adv_menu_10.mp4 differ diff --git a/image/page2/bd_main_page_topup.png b/image/page2/bd_main_page_topup.png new file mode 100644 index 00000000..453bbc9b Binary files /dev/null and b/image/page2/bd_main_page_topup.png differ diff --git a/image/page2_en/page2/bd_main_page_topup.png b/image/page2_en/page2/bd_main_page_topup.png new file mode 100644 index 00000000..7715247e Binary files /dev/null and b/image/page2_en/page2/bd_main_page_topup.png differ diff --git a/image/page_drink/bn_hot_matcha_milk_tea_sing.png b/image/page_drink/bn_hot_matcha_milk_tea_sing.png new file mode 100644 index 00000000..6f45bd71 Binary files /dev/null and b/image/page_drink/bn_hot_matcha_milk_tea_sing.png differ diff --git a/image/page_drink/bn_hot_matcha_tea_sing.png b/image/page_drink/bn_hot_matcha_tea_sing.png new file mode 100644 index 00000000..d3f86600 Binary files /dev/null and b/image/page_drink/bn_hot_matcha_tea_sing.png differ diff --git a/image/page_drink/bn_hot_taiwan_milk_tea_Jason.png b/image/page_drink/bn_hot_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..7f5d376c Binary files /dev/null and b/image/page_drink/bn_hot_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink/bn_hot_thai_milk_tea_tacc.png b/image/page_drink/bn_hot_thai_milk_tea_tacc.png new file mode 100644 index 00000000..ac46f47e Binary files /dev/null and b/image/page_drink/bn_hot_thai_milk_tea_tacc.png differ diff --git a/image/page_drink/bn_iced_matcha_milk_tea_sing.png b/image/page_drink/bn_iced_matcha_milk_tea_sing.png new file mode 100644 index 00000000..40ff2dd7 Binary files /dev/null and b/image/page_drink/bn_iced_matcha_milk_tea_sing.png differ diff --git a/image/page_drink/bn_iced_taiwan_milk_tea_Jason.png b/image/page_drink/bn_iced_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..2bbe8759 Binary files /dev/null and b/image/page_drink/bn_iced_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink/bn_iced_thai_milk_tea_tacc.png b/image/page_drink/bn_iced_thai_milk_tea_tacc.png new file mode 100644 index 00000000..b00be78c Binary files /dev/null and b/image/page_drink/bn_iced_thai_milk_tea_tacc.png differ diff --git a/image/page_drink/bn_lime_tea_tacc.png b/image/page_drink/bn_lime_tea_tacc.png new file mode 100644 index 00000000..04e19412 Binary files /dev/null and b/image/page_drink/bn_lime_tea_tacc.png differ diff --git a/image/page_drink/bn_matcha_tea_sing.png b/image/page_drink/bn_matcha_tea_sing.png new file mode 100644 index 00000000..dbe7f07d Binary files /dev/null and b/image/page_drink/bn_matcha_tea_sing.png differ diff --git a/image/page_drink_disable/bn_hot_matcha_milk_tea_sing.png b/image/page_drink_disable/bn_hot_matcha_milk_tea_sing.png new file mode 100644 index 00000000..69f9ef4f Binary files /dev/null and b/image/page_drink_disable/bn_hot_matcha_milk_tea_sing.png differ diff --git a/image/page_drink_disable/bn_hot_matcha_tea_sing.png b/image/page_drink_disable/bn_hot_matcha_tea_sing.png new file mode 100644 index 00000000..4d4deb5e Binary files /dev/null and b/image/page_drink_disable/bn_hot_matcha_tea_sing.png differ diff --git a/image/page_drink_disable/bn_hot_taiwan_milk_tea_Jason.png b/image/page_drink_disable/bn_hot_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..00b4a2be Binary files /dev/null and b/image/page_drink_disable/bn_hot_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink_disable/bn_hot_thai_milk_tea_tacc.png b/image/page_drink_disable/bn_hot_thai_milk_tea_tacc.png new file mode 100644 index 00000000..8baf160b Binary files /dev/null and b/image/page_drink_disable/bn_hot_thai_milk_tea_tacc.png differ diff --git a/image/page_drink_disable/bn_iced_matcha_milk_tea_sing.png b/image/page_drink_disable/bn_iced_matcha_milk_tea_sing.png new file mode 100644 index 00000000..3c3eea89 Binary files /dev/null and b/image/page_drink_disable/bn_iced_matcha_milk_tea_sing.png differ diff --git a/image/page_drink_disable/bn_iced_taiwan_milk_tea_Jason.png b/image/page_drink_disable/bn_iced_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..83e2a683 Binary files /dev/null and b/image/page_drink_disable/bn_iced_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink_disable/bn_iced_thai_milk_tea_tacc.png b/image/page_drink_disable/bn_iced_thai_milk_tea_tacc.png new file mode 100644 index 00000000..e4d0e712 Binary files /dev/null and b/image/page_drink_disable/bn_iced_thai_milk_tea_tacc.png differ diff --git a/image/page_drink_disable/bn_lime_tea_tacc.png b/image/page_drink_disable/bn_lime_tea_tacc.png new file mode 100644 index 00000000..82c52393 Binary files /dev/null and b/image/page_drink_disable/bn_lime_tea_tacc.png differ diff --git a/image/page_drink_disable/bn_matcha_tea_sing.png b/image/page_drink_disable/bn_matcha_tea_sing.png new file mode 100644 index 00000000..3d4f5c1c Binary files /dev/null and b/image/page_drink_disable/bn_matcha_tea_sing.png differ diff --git a/image/page_drink_press/bn_hot_matcha_milk_tea_sing.png b/image/page_drink_press/bn_hot_matcha_milk_tea_sing.png new file mode 100644 index 00000000..fc24f877 Binary files /dev/null and b/image/page_drink_press/bn_hot_matcha_milk_tea_sing.png differ diff --git a/image/page_drink_press/bn_hot_matcha_tea_sing.png b/image/page_drink_press/bn_hot_matcha_tea_sing.png new file mode 100644 index 00000000..2a21da0a Binary files /dev/null and b/image/page_drink_press/bn_hot_matcha_tea_sing.png differ diff --git a/image/page_drink_press/bn_hot_taiwan_milk_tea_Jason.png b/image/page_drink_press/bn_hot_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..98bebd3f Binary files /dev/null and b/image/page_drink_press/bn_hot_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink_press/bn_hot_thai_milk_tea_tacc.png b/image/page_drink_press/bn_hot_thai_milk_tea_tacc.png new file mode 100644 index 00000000..0c8e6dea Binary files /dev/null and b/image/page_drink_press/bn_hot_thai_milk_tea_tacc.png differ diff --git a/image/page_drink_press/bn_iced_matcha_milk_tea_sing.png b/image/page_drink_press/bn_iced_matcha_milk_tea_sing.png new file mode 100644 index 00000000..fd02b179 Binary files /dev/null and b/image/page_drink_press/bn_iced_matcha_milk_tea_sing.png differ diff --git a/image/page_drink_press/bn_iced_taiwan_milk_tea_Jason.png b/image/page_drink_press/bn_iced_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..dda63237 Binary files /dev/null and b/image/page_drink_press/bn_iced_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink_press/bn_iced_thai_milk_tea_tacc.png b/image/page_drink_press/bn_iced_thai_milk_tea_tacc.png new file mode 100644 index 00000000..67718239 Binary files /dev/null and b/image/page_drink_press/bn_iced_thai_milk_tea_tacc.png differ diff --git a/image/page_drink_press/bn_lime_tea_tacc.png b/image/page_drink_press/bn_lime_tea_tacc.png new file mode 100644 index 00000000..83746261 Binary files /dev/null and b/image/page_drink_press/bn_lime_tea_tacc.png differ diff --git a/image/page_drink_press/bn_matcha_tea_sing.png b/image/page_drink_press/bn_matcha_tea_sing.png new file mode 100644 index 00000000..f16bdd1a Binary files /dev/null and b/image/page_drink_press/bn_matcha_tea_sing.png differ diff --git a/image/page_drink_select/bn_hot_matcha_milk_tea_sing.png b/image/page_drink_select/bn_hot_matcha_milk_tea_sing.png new file mode 100644 index 00000000..86fa789c Binary files /dev/null and b/image/page_drink_select/bn_hot_matcha_milk_tea_sing.png differ diff --git a/image/page_drink_select/bn_hot_matcha_tea_sing.png b/image/page_drink_select/bn_hot_matcha_tea_sing.png new file mode 100644 index 00000000..d43a7c1f Binary files /dev/null and b/image/page_drink_select/bn_hot_matcha_tea_sing.png differ diff --git a/image/page_drink_select/bn_hot_taiwan_milk_tea_Jason.png b/image/page_drink_select/bn_hot_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..0a3e0666 Binary files /dev/null and b/image/page_drink_select/bn_hot_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink_select/bn_hot_thai_milk_tea_tacc.png b/image/page_drink_select/bn_hot_thai_milk_tea_tacc.png new file mode 100644 index 00000000..9dfbc8e7 Binary files /dev/null and b/image/page_drink_select/bn_hot_thai_milk_tea_tacc.png differ diff --git a/image/page_drink_select/bn_iced_matcha_milk_tea_sing.png b/image/page_drink_select/bn_iced_matcha_milk_tea_sing.png new file mode 100644 index 00000000..417ff5f4 Binary files /dev/null and b/image/page_drink_select/bn_iced_matcha_milk_tea_sing.png differ diff --git a/image/page_drink_select/bn_iced_taiwan_milk_tea_Jason.png b/image/page_drink_select/bn_iced_taiwan_milk_tea_Jason.png new file mode 100644 index 00000000..1f020ebc Binary files /dev/null and b/image/page_drink_select/bn_iced_taiwan_milk_tea_Jason.png differ diff --git a/image/page_drink_select/bn_iced_thai_milk_tea_tacc.png b/image/page_drink_select/bn_iced_thai_milk_tea_tacc.png new file mode 100644 index 00000000..8ae6d12b Binary files /dev/null and b/image/page_drink_select/bn_iced_thai_milk_tea_tacc.png differ diff --git a/image/page_drink_select/bn_lime_tea_tacc.png b/image/page_drink_select/bn_lime_tea_tacc.png new file mode 100644 index 00000000..f5e83b0c Binary files /dev/null and b/image/page_drink_select/bn_lime_tea_tacc.png differ diff --git a/image/page_drink_select/bn_matcha_tea_sing.png b/image/page_drink_select/bn_matcha_tea_sing.png new file mode 100644 index 00000000..e614ad49 Binary files /dev/null and b/image/page_drink_select/bn_matcha_tea_sing.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index b46f5c65..e7730dc4 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -341,40 +341,15 @@ EndIf - If CAMPAIGN1 = "true" Then - Var video_menu_1 = "ROOT/taobin_project/campaign1/page_catalog_menu.mp4" - Var video_menu_0 = "ROOT/taobin_project/campaign1/page_catalog.mp4" - - Var video_main_2 = "/mnt/sdcard/coffeevending/taobin_project/campaign1/page_main.mp4" - Var video_main_count = 3 - - EndIf - Var showCart = "Invisible" + + Var LedLidBlink = "no" - Var web_app_str = "" - READ_FILE "/mnt/sdcard/web_app_enable" web_app_str - STRCONTAIN "1" web_app_str WebAppEnable - - DEBUGVAR WebAppEnable - If WebAppEnable = "true" Then - - Var WebAppShow = "Enable" - Else - Var WebAppShow = "Invisible" - EndIf - - Var can_select_menu = "" - READ_FILE "/mnt/sdcard/can_select_menu" can_select_menu - - DEBUGVAR can_select_menu - If can_select_menu = "1" Then - Var EnableSelectMenuBetweenBrew = "Enable" - Else - Var EnableSelectMenuBetweenBrew = "Invisible" - EndIf + Var WebAppShow = "Enable" + Var EnableSelectMenuBetweenBrew = "Enable" + DEBUGVAR XMLProfile @@ -399,7 +374,7 @@ DEBUGVAR AdvertiseProfile If XMLProfile = "taobin_notopup" Then - Var ButtontoTopupMenu = "Invisible" + Var ButtontoTopupMenu = "Disable" Else Var ButtontoTopupMenu = "Enable" EndIf diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index b78d4a25..2b4756f8 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -135,6 +135,10 @@ EndIf + If XMLProfile = "taobin_notopup" Then + Var ButtontoTopupMenu = "Disable" + + EndIf 1000 @@ -356,6 +360,7 @@ ButtontoTopupMenu Var(DirImage + "/bn_main_page_topup.png") Var(DirImage + "/bp_main_page_topup.png") + Var(DirImage + "/bp_main_page_topup.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml index 31361794..bf10e60b 100644 --- a/xml/page_catalog_choose_drink6.pml +++ b/xml/page_catalog_choose_drink6.pml @@ -49,8 +49,12 @@ product_code.append('12-05-02-0030') + product_code.append('12-05-02-0002') product_code.append('12-05-02-0003') + + product_code.append('12-06-01-0001') + product_code.append('12-05-02-0016') product_code.append('12-05-02-0017') product_code.append('12-05-02-0018') diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 1828ab14..9fa50e26 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -3896,7 +3896,113 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=35 12-05-02-0016 + ; button i=35 12-06-01-0001 + + 33 + 22 + 225 + 296 + $12-06-01-0001.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-06-01-0001.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-06-01-0001.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-06-01-0001.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-06-01-0001.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-06-01-0001.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-06-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=36 12-05-02-0016 33 22 @@ -4002,7 +4108,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=36 12-05-02-0017 + ; button i=37 12-05-02-0017 33 22 @@ -4108,7 +4214,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=37 12-05-02-0018 + ; button i=38 12-05-02-0018 33 22 @@ -4214,7 +4320,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=38 12-05-01-0002 + ; button i=39 12-05-01-0002 33 22 diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 616f06e7..83085111 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -93,9 +93,16 @@ Var SaveTheWorldCount = SaveTheWorldCount + 1 EndIf + DEBUGVAR LedLidBlink + DEBUGVAR SaveTheWorldCount + If SaveTheWorldCount = 2 Then - Var SaveTheWorldST = "Enable" + + If LedLidBlink = "no" Then + Var SaveTheWorldST = "Enable" + EndIf EndIf + diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index 3bf3c97c..b9f8de34 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -1519,24 +1519,22 @@ DEBUGVAR UserSelectProductCode DEBUGVAR HAVE_UV_DOOR_LID - If HAVE_UV_DOOR_LID = "true" Then - If StrawState = "Press" Then - Machine StrawOrder - Var LedLidBlink = "true" - EndIf - - If LidState = "Press" Then - Machine LidOrder - Var LedLidBlink = "true" - EndIf - - Var StrawState = "Enable" - Var LidState = "Enable" - ; - + If StrawState = "Press" Then + Machine StrawOrder + Var LedLidBlink = "true" EndIf + If LidState = "Press" Then + Machine LidOrder + Var LedLidBlink = "true" + EndIf + + Var StrawState = "Enable" + Var LidState = "Enable" + ; + + Var SelectDrink = UserSelectProductCode ; Set drink Topping "Select" UserSelectProductCode diff --git a/xml_main/startup.xml b/xml_main/startup.xml index d509452b..3f185178 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.00" - Var XMLPageVersionInt = 600 + Var XMLPageVersion = "6.01" + Var XMLPageVersionInt = 601