Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
c624f208f9
31 changed files with 50570 additions and 49870 deletions
|
|
@ -758,15 +758,21 @@
|
|||
DEBUGVAR CupPlastic9502Enable
|
||||
DEBUGVAR CupPaper9512Enable
|
||||
|
||||
SET-MENU-SHOW "Hot" 1
|
||||
SET-MENU-SHOW "Cold" 1
|
||||
SET-MENU-SHOW "Blend" 1
|
||||
|
||||
If CupPlastic9502Enable = "true" Then
|
||||
SET-MENU-SHOW 1
|
||||
SET-MENU-SHOW "Cold" 1
|
||||
Else
|
||||
If CupPaper9512Enable = "true" Then
|
||||
SET-MENU-SHOW 2
|
||||
SET-MENU-SHOW "Cold" 2
|
||||
EndIf
|
||||
Endif
|
||||
|
||||
DEBUGVAR XSlot
|
||||
DEBUGVAR XSlot[0]
|
||||
DEBUGVAR XSlot[1]
|
||||
DEBUGVAR XSlot[2]
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1178,7 +1178,6 @@
|
|||
If EnablingCountDown = 0 Then
|
||||
Var Timeout = 0
|
||||
Var UserChoosePayment = "QRCode"
|
||||
Var QRErrorState = "Enable"
|
||||
Var QR_POPUP = DirQR_popup + "/img_use_qr_code.png"
|
||||
Var VendingCashless = "-"
|
||||
Var LOADING_STATE = "Invisible"
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
Var HeadVideoFilename = AdvTaobinHome + video_menu_0
|
||||
DEBUGVAR video_main_5
|
||||
EndIf
|
||||
|
||||
|
||||
If HeadVideoFilename = "-" Then
|
||||
DEBUGVAR HeadVideoFilename
|
||||
Var HeadVideoFilename = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
|
||||
|
|
@ -47,6 +47,13 @@
|
|||
|
||||
Var HeadVideoFilename = HeadVideoFilename + ".mp4"
|
||||
|
||||
If CountryName = "Singapore" Then
|
||||
If UsePepsiTheme = 1 Then
|
||||
Var HeadVideoFilename = DefaultLargeBanner + ".mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR VideoAdvIndex
|
||||
DEBUGVAR HeadVideoFilename
|
||||
|
||||
|
|
@ -57,15 +64,15 @@
|
|||
|
||||
If VideoAdvIndex >= video_main_count Then
|
||||
Var VideoAdvIndex = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/video_loop2.xml"
|
||||
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 5000 </Timeout>
|
||||
<EventSecurity>
|
||||
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
|
||||
<EventSecurity>
|
||||
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
|
||||
</EventSecurity>
|
||||
|
||||
|
||||
|
|
@ -77,7 +84,7 @@
|
|||
<Height> 200 </Height>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClickLong>
|
||||
<EventClickLong>
|
||||
OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
|
||||
</EventClickLong>
|
||||
|
||||
|
|
|
|||
|
|
@ -279,6 +279,18 @@
|
|||
|
||||
DEBUGVAR EnableNewBrewUI
|
||||
|
||||
DEBUGVAR GPRSStatus
|
||||
DEBUGVAR GPRSState
|
||||
|
||||
Var GPRSStr = ""
|
||||
Var GPRSStr = GPRSStr + GPRSStatus
|
||||
Var GPRSStr = GPRSStr + ", "
|
||||
Var GPRSStr = GPRSStr + GPRSState
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
||||
|
|
@ -962,6 +974,27 @@
|
|||
</Text>
|
||||
|
||||
|
||||
;GPRS
|
||||
<Image>
|
||||
<X> info1_startX </X>
|
||||
<Y> info_13Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
DEBUGVAR GPRSStatus
|
||||
DEBUGVAR GPRSState
|
||||
</EventClick>
|
||||
</Image>
|
||||
|
||||
<Text>
|
||||
<X> info1_text_startX </X>
|
||||
<Y> info_text_13Y </Y>
|
||||
<Size> 30 </Size>
|
||||
<Font> fontType1 </Font>
|
||||
<Color> 0x000000 </Color>
|
||||
<Value> GPRSStr </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 431 </X>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue