diff --git a/image/sync_1.file b/image/sync_1.file index 11573ac9..7fd4e86a 100644 --- a/image/sync_1.file +++ b/image/sync_1.file @@ -1,5 +1,5 @@ ./page_doing: -total 3424 +total 3420 -rw-rw---- 1 root sdcard_rw 21318 2022-06-13 18:43 6.png -rw-rw---- 1 root sdcard_rw 3268 2022-12-05 21:41 bn_get_lid.png -rw-rw---- 1 root sdcard_rw 3806 2022-12-05 21:41 bn_get_lid_en.png @@ -36,8 +36,8 @@ total 3424 -rw-rw---- 1 root sdcard_rw 24728 2022-06-13 18:43 txt_13_en.png -rw-rw---- 1 root sdcard_rw 23644 2022-06-13 18:43 txt_14.png -rw-rw---- 1 root sdcard_rw 22085 2022-06-13 18:43 txt_14_en.png --rw-rw---- 1 root sdcard_rw 20734 2022-06-13 18:43 txt_15.png --rw-rw---- 1 root sdcard_rw 21447 2022-06-13 18:43 txt_15_en.png +-rw-rw---- 1 root sdcard_rw 17382 2022-12-19 19:42 txt_15.png +-rw-rw---- 1 root sdcard_rw 21535 2022-12-19 19:41 txt_15_en.png -rw-rw---- 1 root sdcard_rw 21304 2022-06-13 18:43 txt_16.png -rw-rw---- 1 root sdcard_rw 23166 2022-06-13 18:43 txt_16_en.png -rw-rw---- 1 root sdcard_rw 20442 2022-12-19 10:33 txt_17.png @@ -121,7 +121,7 @@ total 3424 -rw-rw---- 1 root sdcard_rw 19707 2022-06-13 18:43 txt_9_en.png ./page_drink_press_n: -total 3068 +total 3076 -rw-rw---- 1 root sdcard_rw 9060 2022-07-04 10:47 CHOCO & CARAMEL.png -rw-rw---- 1 root sdcard_rw 2746 2022-07-04 10:47 COFFEE.png -rw-rw---- 1 root sdcard_rw 7748 2022-09-11 01:33 Group 945_Healthy.png @@ -322,3 +322,4 @@ total 3068 -rw-rw---- 1 root sdcard_rw 5250 2022-07-04 10:47 bn_soda.png -rw-rw---- 1 root sdcard_rw 15584 2022-07-04 10:47 bn_strawberry_lime_soda.png -rw-rw---- 1 root sdcard_rw 2643 2022-07-04 10:47 bn_water_roomtemp.png +drwxrwx--x 2 root sdcard_rw 4096 2021-03-19 17:41 page_drink_press_n diff --git a/image/warning/image_warning_energy_drink_en.png b/image/warning/image_warning_energy_drink_en.png new file mode 100644 index 00000000..a85048cd Binary files /dev/null and b/image/warning/image_warning_energy_drink_en.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 610c801b..96b7fc61 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -644,8 +644,13 @@ EndIf ; Set default lang - SetLanguage LanguageInit - + If JXMLVersionInt > 428 Then + SetLanguage LanguageInit + EnableLanguage "THAI" + EnableLanguage "CHINA" + EnableLanguage "JAPAN" + + EndIf 1000 diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index d065c776..95d04cde 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -40,7 +40,7 @@ EndIf Var GetPayInfoFlag = 0 - Var countDownRetrun = 30 + Var countDownRetrun = 300 CoinVending OFF @@ -271,12 +271,6 @@ 990 438 - - ; eng - SetLanguage "TOGGLE" - RefreshAll - ;Open CurrentXMLFileName2 - diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 09faca11..cdde891f 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -1105,6 +1105,11 @@ EndIf + DEBUGVAR Timeout + DEBUGVAR PayOK + DEBUGVAR ChangeOK + DEBUGVAR CancelFlag + If CamFlag = 1 Then Var CamCount = CamCount + 1 @@ -1675,9 +1680,19 @@ 91 1180 MenuCautionImageStage0 - "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" + eval( + If show_eng = "true" Then + Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_en.png" + Else + Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" + + EndIf +) + +; +