pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

AUS: update page_payment_cash -> Changed Icon, page_drinkfail

Browse source
This commit is contained in:
Kenta420 2024-12-27 11:25:16 +07:00
parent 5eeb32683a
commit 791ef8ba0a
18 changed files with 39 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment_en/page_payment/bn_pay_with_ccard_AUS.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
image/page_payment_en/page_payment/bn_pay_with_credit_AUS.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Before After
Before After

BIN
image/page_payment_en/page_payment/bp_pay_with_ccard_AUS.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
image/page_payment_en/page_payment/bp_pay_with_credit_AUS.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Before After
Before After

BIN
image/page_payment_en/page_payment/img_popup8-AUS.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before After
Before After

BIN
inter/aus/image/page_doing/txt_102_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
inter/aus/image/page_doing/txt_16_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

BIN
inter/aus/image/page_doing/txt_187_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
inter/aus/image/page_doing/txt_188_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
inter/aus/image/page_doing/txt_40_en-1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
inter/aus/image/page_doing/txt_40_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

BIN
inter/aus/image/page_doing/txt_41_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

BIN
inter/aus/image/page_doing/txt_59_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
inter/aus/image/page_doing/txt_62_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

1
inter/aus/xml/menu_catalog_new.lxml
View file

@ -112,6 +112,7 @@
EndIf
Else
Var buttonRemoveCup = "Invisible"
Refresh
EndIf
Var Timeout = Timeout + 1

32
inter/aus/xml/page_drinkfail_aus.lxml
View file

@ -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"

50
inter/aus/xml/page_show_error.lxml
View file

@ -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 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
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 @@
<Height> 50 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var countClick = countClick + 1
If countClick = 3 Then
EndIf
If countClick = 10 Then
@ -268,8 +266,8 @@
<Height> 50 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
</EventClick>
</Button>

20
xml/page_payment_cash-AUS.xml
View file

@ -1607,10 +1607,10 @@
<Button>
<X> 216 </X>
<Y> 1276 </Y>
<Y> 1176 </Y>
<State> PayWithCreditCardState </State>
<Filename> Var( DirImage + "/bn_pay_with_ccard.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard.png") </FilenamePress>
<Filename> Var( DirImage + "/bn_pay_with_ccard_AUS.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard_AUS.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_pay_with_ccard.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -1635,7 +1635,7 @@ EndIf
<Button>
<X> 439 </X>
<Y> 1276 </Y>
<Y> 1176 </Y>
<State> PayWithTaoCreditState </State>
<Filename> Var( DirImage + "/bn_pay_with_credit_AUS.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_credit_AUS.png") </FilenamePress>
@ -1666,7 +1666,7 @@ EndIf
<Button>
<X> 664 </X>
<Y> 1276 </Y>
<Y> 1176 </Y>
<State> PayWithCouponState </State>
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
@ -1694,7 +1694,7 @@ EndIf
<Button>
<X> 552 </X>
<Y> 1499 </Y>
<Y> 1399 </Y>
;<State> PayWithFatzebraState </State>
<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename>
@ -1784,7 +1784,7 @@ EndIf
<Button>
<X> 552 </X>
<Y> 1499 </Y>
<Y> 1399 </Y>
<State> "Enable" </State>
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
@ -1798,7 +1798,7 @@ EndIf
<Button>
<X> 328 </X>
<Y> 1499 </Y>
<Y> 1399 </Y>
<State> PayWithAUBState </State>
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_ema.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
@ -2412,7 +2412,7 @@ EndIf
<Text>
<X> 0 </X>
<Y> 1590 </Y>
<Y> 1640 </Y>
<Size> 36 </Size>
<Align> Center </Align>
<Width> 1080 </Width>
@ -2424,7 +2424,7 @@ EndIf
<Text>
<X> 0 </X>
<Y> 1660 </Y>
<Y> 1700 </Y>
<Size> 20 </Size>
<Align> Center </Align>
<Width> 1080 </Width>