Merge
This commit is contained in:
commit
9c264a6213
16 changed files with 233 additions and 61 deletions
|
|
@ -599,10 +599,24 @@
|
|||
EndIf
|
||||
|
||||
If ConnectWithPOSMachine = 1 Then
|
||||
OpenInst 0 "ROOT/taobin_project/xml/page_network_down_pos_machine.xml"
|
||||
OpenInst 0 "ROOT/taobin_project/xml/page_pos_machine_network_down.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If ConnectWithPOSMachine = 1 Then
|
||||
DEBUGVAR POS_SELL_MODE
|
||||
Var POSSellCountdown = 5
|
||||
If POS_SELL_MODE = "NORMAL" Then
|
||||
|
||||
Else
|
||||
Var BackgroundColor = "0x2C2F4E"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR ButtontoTopupMenu
|
||||
STRCONTAIN "taobin_notopup" XMLProfile taobin_notopup
|
||||
STRCONTAIN "taobin_notopping" XMLProfile taobin_notopping
|
||||
|
|
@ -1127,7 +1141,7 @@
|
|||
EnableLanguage "MTC"
|
||||
EnableLanguage "MSC"
|
||||
EnableLanguage "ENG"
|
||||
|
||||
|
||||
Var LanguageShow = "MTC"
|
||||
SetLanguage "MTC"
|
||||
LanguageControl "UpdateList" "-"
|
||||
|
|
@ -1361,10 +1375,10 @@
|
|||
|
||||
Var CatalogLayoutV3 = 1
|
||||
|
||||
|
||||
|
||||
If BoxID = 123456 Then
|
||||
Var SpiralOnline = "true"
|
||||
|
||||
|
||||
Var InternationalShow = 0
|
||||
EndIf
|
||||
|
||||
|
|
@ -1711,7 +1725,7 @@
|
|||
|
||||
Machine NewPaymentOpenBrewingXMLEnable
|
||||
|
||||
|
||||
|
||||
|
||||
If EnablePepsiFullscreen = 1 Then
|
||||
DEBUGVAR EnablePepsiFullscreen
|
||||
|
|
@ -1893,7 +1907,7 @@ PRICE "Reset" "-"
|
|||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
||||
|
||||
If CNTDOWN_PROTECT_SCREEN_BLANK > 0 Then
|
||||
|
|
@ -2125,7 +2139,7 @@ PRICE "Reset" "-"
|
|||
|
||||
DEBUGVAR InternationalEnable
|
||||
DEBUGVAR CountryName
|
||||
|
||||
|
||||
If CurrHelpCenter = 1 Then
|
||||
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
|
||||
Else
|
||||
|
|
@ -2294,6 +2308,22 @@ PRICE "Reset" "-"
|
|||
Open "ROOT/taobin_project/xml/page_sleepmode.xml"
|
||||
EndIf
|
||||
|
||||
If ConnectWithPOSMachine = 1 Then
|
||||
If POSSellCountdown > 0 Then
|
||||
Var POSSellCountdown = POSSellCountdown - 1
|
||||
Else
|
||||
DEBUGVAR POS_SELL_MODE
|
||||
Var POSSellCountdown = 5
|
||||
If POS_SELL_MODE = "NORMAL" Then
|
||||
|
||||
Else
|
||||
Var BackgroundColor = "0x2C2F4E"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
Open "ROOT/taobin_project/xml/page_pos_machine_midnight_close.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
; for count helper show
|
||||
If EnableHelperShow = 1 Then
|
||||
If FromDrinkOk = 1 Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue