diff --git a/image/page_payment_en/page_payment/bn_pay_with_ccard_AUS.png b/image/page_payment_en/page_payment/bn_pay_with_ccard_AUS.png new file mode 100644 index 00000000..f9cabe0f Binary files /dev/null and b/image/page_payment_en/page_payment/bn_pay_with_ccard_AUS.png differ diff --git a/image/page_payment_en/page_payment/bn_pay_with_credit_AUS.png b/image/page_payment_en/page_payment/bn_pay_with_credit_AUS.png index 4443f7ae..30b08234 100644 Binary files a/image/page_payment_en/page_payment/bn_pay_with_credit_AUS.png and b/image/page_payment_en/page_payment/bn_pay_with_credit_AUS.png differ diff --git a/image/page_payment_en/page_payment/bp_pay_with_ccard_AUS.png b/image/page_payment_en/page_payment/bp_pay_with_ccard_AUS.png new file mode 100644 index 00000000..ee877e52 Binary files /dev/null and b/image/page_payment_en/page_payment/bp_pay_with_ccard_AUS.png differ diff --git a/image/page_payment_en/page_payment/bp_pay_with_credit_AUS.png b/image/page_payment_en/page_payment/bp_pay_with_credit_AUS.png index 52391567..86e77ec9 100644 Binary files a/image/page_payment_en/page_payment/bp_pay_with_credit_AUS.png and b/image/page_payment_en/page_payment/bp_pay_with_credit_AUS.png differ diff --git a/image/page_payment_en/page_payment/img_popup8-AUS.png b/image/page_payment_en/page_payment/img_popup8-AUS.png index fc936c29..375048a0 100644 Binary files a/image/page_payment_en/page_payment/img_popup8-AUS.png and b/image/page_payment_en/page_payment/img_popup8-AUS.png differ diff --git a/inter/aus/image/page_doing/txt_102_en.png b/inter/aus/image/page_doing/txt_102_en.png new file mode 100644 index 00000000..34c090e4 Binary files /dev/null and b/inter/aus/image/page_doing/txt_102_en.png differ diff --git a/inter/aus/image/page_doing/txt_16_en.png b/inter/aus/image/page_doing/txt_16_en.png index 5b01aede..28a34707 100644 Binary files a/inter/aus/image/page_doing/txt_16_en.png and b/inter/aus/image/page_doing/txt_16_en.png differ diff --git a/inter/aus/image/page_doing/txt_187_en.png b/inter/aus/image/page_doing/txt_187_en.png new file mode 100644 index 00000000..f5f7be6b Binary files /dev/null and b/inter/aus/image/page_doing/txt_187_en.png differ diff --git a/inter/aus/image/page_doing/txt_188_en.png b/inter/aus/image/page_doing/txt_188_en.png new file mode 100644 index 00000000..05786f35 Binary files /dev/null and b/inter/aus/image/page_doing/txt_188_en.png differ diff --git a/inter/aus/image/page_doing/txt_40_en-1.png b/inter/aus/image/page_doing/txt_40_en-1.png new file mode 100644 index 00000000..4f3aca64 Binary files /dev/null and b/inter/aus/image/page_doing/txt_40_en-1.png differ diff --git a/inter/aus/image/page_doing/txt_40_en.png b/inter/aus/image/page_doing/txt_40_en.png index 88b5552f..d91b5309 100644 Binary files a/inter/aus/image/page_doing/txt_40_en.png and b/inter/aus/image/page_doing/txt_40_en.png differ diff --git a/inter/aus/image/page_doing/txt_41_en.png b/inter/aus/image/page_doing/txt_41_en.png index e505c9c8..8d6fcbd8 100644 Binary files a/inter/aus/image/page_doing/txt_41_en.png and b/inter/aus/image/page_doing/txt_41_en.png differ diff --git a/inter/aus/image/page_doing/txt_59_en.png b/inter/aus/image/page_doing/txt_59_en.png new file mode 100644 index 00000000..237eaaf2 Binary files /dev/null and b/inter/aus/image/page_doing/txt_59_en.png differ diff --git a/inter/aus/image/page_doing/txt_62_en.png b/inter/aus/image/page_doing/txt_62_en.png new file mode 100644 index 00000000..e5383448 Binary files /dev/null and b/inter/aus/image/page_doing/txt_62_en.png differ diff --git a/inter/aus/xml/menu_catalog_new.lxml b/inter/aus/xml/menu_catalog_new.lxml index 8b00dbaa..518cd78c 100644 --- a/inter/aus/xml/menu_catalog_new.lxml +++ b/inter/aus/xml/menu_catalog_new.lxml @@ -112,6 +112,7 @@ EndIf Else Var buttonRemoveCup = "Invisible" + Refresh EndIf Var Timeout = Timeout + 1 diff --git a/inter/aus/xml/page_drinkfail_aus.lxml b/inter/aus/xml/page_drinkfail_aus.lxml index 5bbb0414..abfe3f31 100644 --- a/inter/aus/xml/page_drinkfail_aus.lxml +++ b/inter/aus/xml/page_drinkfail_aus.lxml @@ -40,30 +40,11 @@ If ERROR_PAY_TIMEOUT = "true" Then - If NumberFailed = "false" Then - - If show_eng = "true" Then - Var TextErrorShow = ERROR_BREW_CAUSE_ENG - Else - If show_japan = "true" Then - Var TextErrorShow = ERROR_BREW_CAUSE_JAPAN - Else - Var TextErrorShow = ERROR_BREW_CAUSE_THAI - EndIf - EndIf - - - Open "ROOT/taobin_project/xml/page_drinkfail4.xml" - + Var TextErrorShow = ERROR_BREW_CAUSE_ENG EndIf - - - Var ErrorPayTimeoutFlag = 1 - Else - Var ErrorPayTimeoutFlag = 1 EndIf - + Var ErrorPayTimeoutFlag = 1 EndIf @@ -72,12 +53,7 @@ - If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/collectiing_en/" - - Else - Var DirImage = "ROOT/taobin_project/image/collectiing/" - EndIf + Var DirImage = "ROOT/taobin_project/inter/aus/image/page_drink_fail/" Var Timeout = 0 @@ -158,7 +134,7 @@ Var Timeout = Timeout + 1 - If Timeout > 15 Then + If Timeout > 20 Then If MachineStage = "remove-cup" Then Open "ROOT/taobin_project/xml/page_drinkfail3.xml" diff --git a/inter/aus/xml/page_show_error.lxml b/inter/aus/xml/page_show_error.lxml index 6cf800cb..7353611d 100644 --- a/inter/aus/xml/page_show_error.lxml +++ b/inter/aus/xml/page_show_error.lxml @@ -17,7 +17,6 @@ ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" - Var show_error_normal = "Invisible" Var show_error_sp1 = "Enable" StopLongPlay @@ -34,14 +33,13 @@ Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en" DEBUGVAR MachineStage - + If MachineStage = "close-maintenance" Then DEBUGVAR stop_now If stop_now = "true" Then Else - Var show_error_normal = "Enable" - Var show_error_sp1 = "Invisible" + Var show_error_sp1 = "Enable" EndIf EndIf @@ -51,11 +49,10 @@ If stop_now = "true" Then Else - Var show_error_normal = "Enable" - Var show_error_sp1 = "Invisible" + Var show_error_sp1 = "Enable" EndIf EndIf - + If NETCORE_EVENT_CNT_X >= 30 Then Var NETCORE_EVENT_CNT_X = 0 @@ -84,13 +81,13 @@ 1000 - + Var EmergencyStop = "-" - - + + If EmergencyStop = "true" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var MachineErrorDetailAll = "Emergency stop!" @@ -115,7 +112,7 @@ Var MachineErrorDetailAll = MachineErrorDetailAll + " [ | ]" EndIf - Var textStep = textStep + 1 + Var textStep = textStep + 1 ;DEBUGVAR MachineErrorDetailAll ;DEBUGVAR textStep @@ -123,12 +120,12 @@ If NETCORE_LOST_CNT > 0 Then Else - + DEBUGVAR NCIC07_EVENT_CNT DEBUGVAR NETCORE_EVENT_CNT_TMP - If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then - + If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then + Var NETCORE_LOST_COUNT_UP = NETCORE_LOST_COUNT_UP + 1 DEBUGVAR NETCORE_LOST_COUNT_UP @@ -148,7 +145,7 @@ EndIf Else - + If stop_now_from_netcore_event = 1 Then Var stop_now = "false" SAVELOG "stop_now_from_netcore_event is set" @@ -162,26 +159,26 @@ EndIf If MachineStage = "" Then - + Var LEDSet = "false" Open "ROOT/taobin_project/xml/page_board.xml" EndIf If MachineStage = "show-menu" Then - + Var LEDSet = "false" Open "ROOT/taobin_project/xml/page_board.xml" EndIf If MachineStage = "remove-cup" Then - + Var LEDSet = "false" Open "ROOT/taobin_project/xml/page_remove_cup.xml" EndIf If MachineStage = "drink-failed" Then - Var FirstOpen = 1 + Var FirstOpen = 1 Var LEDSet = "true" ;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" Refresh @@ -190,7 +187,7 @@ If FirstOpen = 1 Then Var FirstOpen = 0 If MachineStage = "close-maintenance" Then - + Var LEDSet = "true" ;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" Refresh @@ -200,13 +197,14 @@ EndIf EndIf - + EndIf + DEBUGVAR MachineStage DEBUGVAR show_error_normal DEBUGVAR show_error_sp1 DEBUGVAR TimeOut @@ -245,10 +243,10 @@ 50 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var countClick = countClick + 1 If countClick = 3 Then - + EndIf If countClick = 10 Then @@ -268,8 +266,8 @@ 50 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - + + diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index f4f33cce..27ddc289 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -1607,10 +1607,10 @@