diff --git a/adv/sync_1.file b/adv/sync_1.file index 2052a03d..cefc7c55 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,13 +1,13 @@ -total 183276 +total 196820 -rw-rw---- 1 root sdcard_rw 2671 2022-01-13 17:36 sync_0.file --rw-rw---- 1 root sdcard_rw 0 2022-08-05 11:41 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2022-08-21 17:37 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 4406 2022-07-17 22:16 sync_7.file --rw-rw---- 1 root sdcard_rw 4406 2022-07-17 22:16 sync_8.file --rw-rw---- 1 root sdcard_rw 4406 2022-07-17 22:16 sync_9.file +-rw-rw---- 1 root sdcard_rw 4920 2022-08-05 11:41 sync_7.file +-rw-rw---- 1 root sdcard_rw 4920 2022-08-05 11:41 sync_8.file +-rw-rw---- 1 root sdcard_rw 4920 2022-08-05 11:41 sync_9.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 @@ -23,10 +23,11 @@ total 183276 -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 208784 2022-07-06 09:45 taobin_adv_14.mp4 --rw-rw---- 1 root sdcard_rw 2907488 2022-07-11 16:23 taobin_adv_15.mp4 --rw-rw---- 1 root sdcard_rw 4852834 2022-07-10 07:07 taobin_adv_16.mp4 +-rw-rw---- 1 root sdcard_rw 3195246 2022-08-17 15:52 taobin_adv_15.mp4 +-rw-rw---- 1 root sdcard_rw 6747742 2022-08-16 13:13 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 2239316 2022-07-19 13:24 taobin_adv_18.mp4 +-rw-rw---- 1 root sdcard_rw 3360723 2022-08-18 13:45 taobin_adv_19.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 @@ -42,10 +43,11 @@ total 183276 -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 156793 2022-07-06 11:10 taobin_adv_menu2_14.mp4 --rw-rw---- 1 root sdcard_rw 2305955 2022-07-11 16:22 taobin_adv_menu2_15.mp4 --rw-rw---- 1 root sdcard_rw 3619412 2022-07-10 07:07 taobin_adv_menu2_16.mp4 +-rw-rw---- 1 root sdcard_rw 2881687 2022-08-17 15:52 taobin_adv_menu2_15.mp4 +-rw-rw---- 1 root sdcard_rw 4788879 2022-08-18 16:54 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 1914593 2022-07-19 13:24 taobin_adv_menu2_18.mp4 +-rw-rw---- 1 root sdcard_rw 2767750 2022-08-18 13:45 taobin_adv_menu2_19.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 @@ -61,7 +63,8 @@ total 183276 -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 161566 2022-07-06 10:54 taobin_adv_menu_14.mp4 --rw-rw---- 1 root sdcard_rw 2252497 2022-07-11 16:23 taobin_adv_menu_15.mp4 --rw-rw---- 1 root sdcard_rw 3619394 2022-07-10 07:07 taobin_adv_menu_16.mp4 +-rw-rw---- 1 root sdcard_rw 2604682 2022-08-17 15:52 taobin_adv_menu_15.mp4 +-rw-rw---- 1 root sdcard_rw 4554236 2022-08-16 13:13 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 1867713 2022-07-19 13:24 taobin_adv_menu_18.mp4 +-rw-rw---- 1 root sdcard_rw 2500307 2022-08-18 13:45 taobin_adv_menu_19.mp4 diff --git a/adv/taobin_adv_15.mp4 b/adv/taobin_adv_15.mp4 index ae3dffca..54ead948 100644 Binary files a/adv/taobin_adv_15.mp4 and b/adv/taobin_adv_15.mp4 differ diff --git a/adv/taobin_adv_16.mp4 b/adv/taobin_adv_16.mp4 index 0dcc9cf8..eaade225 100644 Binary files a/adv/taobin_adv_16.mp4 and b/adv/taobin_adv_16.mp4 differ diff --git a/adv/taobin_adv_19.mp4 b/adv/taobin_adv_19.mp4 new file mode 100644 index 00000000..85a3506b Binary files /dev/null and b/adv/taobin_adv_19.mp4 differ diff --git a/adv/taobin_adv_menu2_15.mp4 b/adv/taobin_adv_menu2_15.mp4 index 56491162..122aab0c 100644 Binary files a/adv/taobin_adv_menu2_15.mp4 and b/adv/taobin_adv_menu2_15.mp4 differ diff --git a/adv/taobin_adv_menu2_16.mp4 b/adv/taobin_adv_menu2_16.mp4 index 3ba7ecc5..255c9d9b 100644 Binary files a/adv/taobin_adv_menu2_16.mp4 and b/adv/taobin_adv_menu2_16.mp4 differ diff --git a/adv/taobin_adv_menu2_19.mp4 b/adv/taobin_adv_menu2_19.mp4 new file mode 100644 index 00000000..9bcb4e8e Binary files /dev/null and b/adv/taobin_adv_menu2_19.mp4 differ diff --git a/adv/taobin_adv_menu_15.mp4 b/adv/taobin_adv_menu_15.mp4 index 26333583..9581fe5d 100644 Binary files a/adv/taobin_adv_menu_15.mp4 and b/adv/taobin_adv_menu_15.mp4 differ diff --git a/adv/taobin_adv_menu_16.mp4 b/adv/taobin_adv_menu_16.mp4 index b367791e..c82add26 100644 Binary files a/adv/taobin_adv_menu_16.mp4 and b/adv/taobin_adv_menu_16.mp4 differ diff --git a/adv/taobin_adv_menu_19.mp4 b/adv/taobin_adv_menu_19.mp4 new file mode 100644 index 00000000..708cb43c Binary files /dev/null and b/adv/taobin_adv_menu_19.mp4 differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 2a815db2..1aa96bf3 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -201,14 +201,15 @@ EndIf - + DEBUGVAR LastMakeDrinkResult If LastMakeDrinkResult = "success" Then Var MachineState_Result = 1 EndIf If LastMakeDrinkResult = "fail" Then - Var MachineState_Result = 2 + SAVELOG "LastMakeDrinkResult is 2" + Var MachineState_Result = 2 EndIf @@ -374,6 +375,8 @@ Var Timeout = Timeout + 1 + DEBUGVAR MachineState_Result + If MOVE_CUP_TO_DOOR = "true" Then Var MOVE_CUP_TO_DOOR = "false" @@ -426,6 +429,7 @@ If Timeout > 480 Then + SAVELOG " Timeout > 480" Var MachineState_Result = 2 EndIf @@ -548,6 +552,7 @@ Var waitAckPay = 2 Var Timeout = 5 Var ActionOKCase = 1 + SAVELOG "ActionOKCase = change OK 2" EndIf EndIf @@ -608,6 +613,7 @@ Var waitAckPay = 2 Var Timeout = 5 Var ActionOKCase = 1 + SAVELOG "ActionOKCase = change time out" EndIf EndIf @@ -652,6 +658,7 @@ PAYEXT SVT ACC VendingTSIDTmp DEE Var ActionOKCase = 1 + SAVELOG "ActionOKCase = change OK 3" If Seeker.CodeChannel = 0 Then SAVELOG "back_to_main from line > 391." Open "ROOT/taobin_project/xml/page_drinkfail2.xml" @@ -667,7 +674,7 @@ EndIf If MachineState_Result = 1 Then - ;Var MachineState_Result = 2 + EndIf If MachineState_Result = 1 Then @@ -884,6 +891,7 @@ If RoadShow = "true" Then Open "ROOT/taobin_project/xml/page_back_to_error.xml" Else + SAVELOG " drink-failed...." Var MachineState_Result = 2 EndIf EndIf @@ -1009,10 +1017,14 @@ Var MachineState_Result = 1 EndIf + + DEBUGVAR MachineStage + If MachineStage = "drink-failed" Then If RoadShow = "true" Then Open "ROOT/taobin_project/xml/page_back_to_error.xml" Else + SAVELOG "Event Machine drink fail" Var MachineState_Result = 2 EndIf EndIf diff --git a/xml/page_camera.xml b/xml/page_camera.xml index b54acc98..d8efc377 100644 --- a/xml/page_camera.xml +++ b/xml/page_camera.xml @@ -44,15 +44,21 @@ - 0 - 381 + 753 + 1394 "usbfront" -; 1280 -; 720 - 700 - 394 + 326 + 236 +; +; 0 +; 381 +;"usbfront" +; 700 +; 394 +; + DEBUGVAR BugFlag If BugFlag = 0 Then diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index b98eae4b..7e6eb407 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -396,11 +396,13 @@ CRLFToSpace showname CRLFToSpace showdesc - If SelectDrinkType = 1 Then - If show_eng = "true" Then - Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" - Else - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + If BGSugar = "Enable" Then + If SelectDrinkType = 1 Then + If show_eng = "true" Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" + Else + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + EndIf EndIf EndIf