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

Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Kenta420 2024-01-29 09:20:51 +07:00
commit 5584375e57
1523 changed files with 2863 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

29
xml/page_board.xml
View file

@ -1224,7 +1224,7 @@
If MachineStage = "drink-failed" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
@ -1236,6 +1236,33 @@
EndIf
If BrewTimeoutExtend = 1 Then
DEBUGVAR BrewTimeoutExtend
DEBUGVAR DoorLidPosition
If DoorLidPosition = "bottom" Then
SAVELOG "BrewTimeoutExtend = 0 Clear Error Flag"
Var BrewTimeoutExtend = 0
; clear stage
Else
Var stop_now = "true"
Var stop_now_from_door_cup = 1
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Else
If DoorLidPosition = "Bottom" Then
Var BrewTimeoutExtend = 0
Else
Var BrewTimeoutExtend = 0
EndIf
EndIf
If NeedUpgrade = "true" Then

1
xml/page_payment.xml
View file

@ -245,6 +245,7 @@
Var NOCashFlag = 0
DEBUGVAR SELLSTATUS
If SELLSTATUS = "SELLNOCASH" Then
Var NOCashFlag = 1
EndIf

50
xml/page_payment_cash-SGP.xml
View file

@ -328,11 +328,11 @@
EndIf
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Coin CARD
EndIf
EndIf
;If CoinInFlag = 0 Then
; If CancelFlag = 0 Then
; Coin CARD
; EndIf
;EndIf
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@ -1497,6 +1497,44 @@ EndIf
</EventClick>
</Button>
; cash Singapore
<Button>
<X> 439 </X>
<Y> 1499 </Y>
<State> PayState1</State>
<Filename> FilenameShowbuttonCashBN </Filename>
<FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
<FilenameDisable> FilenameShowbuttonCashBP </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If alphaState = "Invisible" Then
If EnoughChange = "yes" Then
Var alphaState2 = "Enable"
Var alphaState2t = alphaState2
If RoadShow = "true" Then
Var MachineStage = "make-drink"
Var BrewingTextThai = "เตรียมแก้ว"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
Else
Var alphaState3 = "Enable"
Refresh
EndIf
EndIf
</EventClick>
</Button>
<Button>
<X> 360 </X>
<Y> 1781 </Y>
@ -1643,7 +1681,7 @@ EndIf
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-MYR.png" )</Filename>
<Filename> Var( DirImage2 + "/img_popup11-SGP.png" )</Filename>
</Image>

8
xml/page_show_error.lxml
View file

@ -109,6 +109,12 @@
Var stop_now_from_netcore_event = 0
EndIf
If stop_now_from_door_cup = 1 Then
Var stop_now = "false"
SAVELOG "stop_now_from_door_cup is set"
Var stop_now_from_door_cup = 0
EndIf
If MachineStage = "" Then
Var LEDSet = "false"
@ -157,7 +163,7 @@
DEBUGVAR show_error_normal
DEBUGVAR show_error_sp1
DEBUGVAR TimeOut
Var TimeOut = TimeOut + 1
If TimeOut > 30 Then
Var TimeOut = 0

9
xml/page_show_error.xml
View file

@ -216,6 +216,7 @@
Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " #"
EndIf
Else
; zone all ok
If stop_now_from_netcore_event = 1 Then
Var stop_now = "false"
@ -223,6 +224,14 @@
Var stop_now_from_netcore_event = 0
EndIf
If stop_now_from_door_cup = 1 Then
Var stop_now = "false"
SAVELOG "stop_now_from_door_cup is set"
Var stop_now_from_door_cup = 0
Var MachineErrorDetailAll = " --- "
EndIf
If MachineStage = "" Then
Var LEDSet = "false"

8
xml/page_topping_select7.xml
View file

@ -488,6 +488,7 @@
READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
DEBUGVAR menu_blend_free
DEBUGVAR blend_button_state
DEBUGVAR DoorCupPosition
If menu_blend_free = "true" Then
If blend_button_state = "PressForever" Then
@ -505,9 +506,10 @@
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
If DoorCupPosition = "bottom" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf

52
xml/vending_info.xml
View file

@ -147,10 +147,18 @@
Var strCountryName = " " + CountryName
DEBUGVAR AndroidTouchScreenHeartBeat
Var CanResetTouch = 0
Var strTouchScreen = " Reset Touch : disable."
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 15 Then
Open "ROOT/taobin_project/xml/page_board.xml"
@ -231,6 +239,12 @@
Var Text2_9 = Text2_9 + android_text3_2
If AndroidTouchScreenHeartBeat = "-" Then
Var strTouchScreen = " Reset Touch : Disable."
Else
Var strTouchScreen = " Reset Touch : " + AndroidTouchScreenHeartBeat
Var CanResetTouch = 1
EndIf
Refresh
TimerReset
@ -298,7 +312,17 @@
<EventClick>
READ_FILE "/mnt/sdcard/coffeevending/sim_on" str_sim_on
DEBUGVAR str_sim_on
If str_sim_on = "1" Then
If str_sim_on = "1" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
If CountTouchButton = 7 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
@ -724,6 +748,8 @@
<Value> "NDF Taobin 1.2.1" </Value>
</Text>
<Image>
<X> info1_startX </X>
<Y> info_11Y </Y>
@ -745,6 +771,30 @@
</Text>
<Image>
<X> info1_startX </X>
<Y> info_12Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
If CanResetTouch = 1 Then
ResetTouch
EndIf
</EventClick>
</Image>
<Text>
<X> info1_text_startX </X>
<Y> info_text_12Y </Y>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> strTouchScreen </Value>
</Text>
;<QRCode>
;<X> 930 </X>
;<Y> info_cancel_y </Y>