Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
b11e33eb57
16 changed files with 126 additions and 76 deletions
|
|
@ -8,3 +8,4 @@
|
||||||
|
|
||||||
|
|
||||||
Var SeasonPassMode = 0
|
Var SeasonPassMode = 0
|
||||||
|
Var CleanFeedbackFlag = 0
|
||||||
|
|
@ -571,7 +571,7 @@
|
||||||
;Open PreviseXMLFileName2
|
;Open PreviseXMLFileName2
|
||||||
DEBUGVAR OpenFromXML
|
DEBUGVAR OpenFromXML
|
||||||
|
|
||||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/event/tricker.ev"
|
||||||
|
|
||||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||||
|
|
||||||
|
|
@ -3578,7 +3578,7 @@
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
|
|
||||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/event/tricker.ev"
|
||||||
|
|
||||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
|
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
|
||||||
RootLayoutVisible 15 "show"
|
RootLayoutVisible 14 "show"
|
||||||
|
|
@ -89,7 +89,7 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
|
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
|
||||||
|
|
||||||
|
|
||||||
Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
|
Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
; On open
|
; On open
|
||||||
|
|
||||||
; helper
|
; helper
|
||||||
RootLayoutVisible 15 "hide"
|
RootLayoutVisible 14 "hide"
|
||||||
|
|
||||||
Machine WakeUp
|
Machine WakeUp
|
||||||
|
|
||||||
|
|
@ -277,7 +277,7 @@
|
||||||
|
|
||||||
DEBUGVAR SpiralOnline
|
DEBUGVAR SpiralOnline
|
||||||
|
|
||||||
RootLayoutVisible 13 "hide"
|
RootLayoutVisible 15 "hide"
|
||||||
|
|
||||||
|
|
||||||
</EventOpen>
|
</EventOpen>
|
||||||
|
|
@ -532,6 +532,10 @@
|
||||||
Play PlaySoundLag
|
Play PlaySoundLag
|
||||||
Var countDownRetrun = 120
|
Var countDownRetrun = 120
|
||||||
|
|
||||||
|
Var ButtonLanguageCurrentXPosition = 1015
|
||||||
|
Var ButtonLanguageCurrentYPosition = 458 - 38
|
||||||
|
Var ButtonLanguageListXPosition = 982
|
||||||
|
Var ButtonLanguageListYPosition = 450 - 38
|
||||||
Var LanguageButtonEnable = "Enable"
|
Var LanguageButtonEnable = "Enable"
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
|
|
||||||
|
|
@ -717,7 +721,7 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
RootLayoutVisible 3 "hide"
|
RootLayoutVisible 3 "hide"
|
||||||
RootLayoutVisible 13 "hide"
|
RootLayoutVisible 15 "hide"
|
||||||
|
|
||||||
; eng
|
; eng
|
||||||
Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
|
Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
|
||||||
|
|
@ -1043,7 +1047,7 @@
|
||||||
<Button>
|
<Button>
|
||||||
<X> 225 </X>
|
<X> 225 </X>
|
||||||
<Y> 424 </Y>
|
<Y> 424 </Y>
|
||||||
<State> ShowButtonClick2 </State>
|
<State> "Enable" </State>
|
||||||
<Filename> Var(DirImage + "/bn_main_page_member.png") </Filename>
|
<Filename> Var(DirImage + "/bn_main_page_member.png") </Filename>
|
||||||
<FilenamePress> Var(DirImage + "/bp_main_page_member.png") </FilenamePress>
|
<FilenamePress> Var(DirImage + "/bp_main_page_member.png") </FilenamePress>
|
||||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||||
|
|
@ -1067,7 +1071,7 @@
|
||||||
<Button>
|
<Button>
|
||||||
<X> 696 </X>
|
<X> 696 </X>
|
||||||
<Y> 424 </Y>
|
<Y> 424 </Y>
|
||||||
<State> ButtontoTopupMenu </State>
|
<State> "Enable" </State>
|
||||||
<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
|
<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
|
||||||
<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
|
<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
|
||||||
<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
|
<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,13 @@
|
||||||
|
|
||||||
Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
|
Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
|
||||||
|
|
||||||
|
Var ButtonLanguageCurrentXPosition = 1015
|
||||||
|
Var ButtonLanguageCurrentYPosition = 458 - 38
|
||||||
|
Var ButtonLanguageListXPosition = 990
|
||||||
|
Var ButtonLanguageListYPosition = 450 - 38
|
||||||
|
Var LanguageButtonEnable = "Enable"
|
||||||
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
|
|
||||||
TabMenuVisibleInst 10
|
TabMenuVisibleInst 10
|
||||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,12 @@
|
||||||
|
|
||||||
Var catalogFile = CountryRootPath + "/xml/page_catalog.lxml"
|
If EnableMultiInstanceFromBoxID = 1 Then
|
||||||
|
Var catalogFile = CountryRootPath + "/xml/multi/page_catalog.lxml"
|
||||||
|
Else
|
||||||
|
If InternationalEnable = 1 Then
|
||||||
|
Var catalogFile = "ROOT/taobin_project/xml/page_catalog.lxml"
|
||||||
|
Else
|
||||||
|
Var catalogFile = "ROOT/taobin_project/xml/page_catalog.xml"
|
||||||
|
EndIf
|
||||||
|
EndIf
|
||||||
DEBUGVAR catalogFile
|
DEBUGVAR catalogFile
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,10 @@
|
||||||
SAVELOG "======================================= Help Center ================================"
|
SAVELOG "======================================= Help Center ================================"
|
||||||
|
|
||||||
RootLayoutVisible 3 "show"
|
RootLayoutVisible 3 "show"
|
||||||
RootLayoutVisible 13 "hide"
|
RootLayoutVisible 15 "hide"
|
||||||
|
|
||||||
; helper
|
; helper
|
||||||
RootLayoutVisible 15 "show"
|
RootLayoutVisible 14 "show"
|
||||||
|
|
||||||
DEBUGVAR FromPaymentCash
|
DEBUGVAR FromPaymentCash
|
||||||
DEBUGVAR FromSmoothieProcess
|
DEBUGVAR FromSmoothieProcess
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
Var CurrHelpCenter = 1
|
Var CurrHelpCenter = 1
|
||||||
|
|
||||||
Var TimeoutHelperProccess = 0
|
Var TimeoutHelperProccess = 60
|
||||||
|
|
||||||
</EventOpen>
|
</EventOpen>
|
||||||
|
|
||||||
|
|
@ -49,7 +49,12 @@
|
||||||
<EventTimeout>
|
<EventTimeout>
|
||||||
DEBUGVAR TimeoutHelperProccess
|
DEBUGVAR TimeoutHelperProccess
|
||||||
|
|
||||||
If TimeoutHelperProccess > 70 Then
|
If TimeoutHelperProccess > 0 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess - 1
|
||||||
|
EndIf
|
||||||
|
|
||||||
|
If TimeoutHelperProccess = 0 Then
|
||||||
|
DEBUGVAR BaseOnPageBoard
|
||||||
SAVELOG "TimeoutHelperProccess"
|
SAVELOG "TimeoutHelperProccess"
|
||||||
Var CurrHelpCenter = 0
|
Var CurrHelpCenter = 0
|
||||||
If BaseOnPageBoard = 1 Then
|
If BaseOnPageBoard = 1 Then
|
||||||
|
|
@ -60,14 +65,11 @@
|
||||||
Var ButtonLanguageListXPosition = 970
|
Var ButtonLanguageListXPosition = 970
|
||||||
Var ButtonLanguageListYPosition = 590
|
Var ButtonLanguageListYPosition = 590
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
|
||||||
Else
|
Else
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
Var TimeoutHelperProccess = TimeoutHelperProccess + 1
|
|
||||||
|
|
||||||
Refresh
|
Refresh
|
||||||
TimerReset
|
TimerReset
|
||||||
|
|
@ -94,10 +96,10 @@
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
Var ButtonLanguageCurrentXPosition = 1015
|
Var ButtonLanguageCurrentXPosition = 1000
|
||||||
Var ButtonLanguageCurrentYPosition = 458 - 38
|
Var ButtonLanguageCurrentYPosition = 458 - 18
|
||||||
|
|
||||||
Var ButtonLanguageListXPosition = 990
|
Var ButtonLanguageListXPosition = 980
|
||||||
Var ButtonLanguageListYPosition = 450 - 38
|
Var ButtonLanguageListYPosition = 450 - 38
|
||||||
If FromPaymentCash = "Enable" Then
|
If FromPaymentCash = "Enable" Then
|
||||||
Var LanguageButtonEnable = "Invisible"
|
Var LanguageButtonEnable = "Invisible"
|
||||||
|
|
@ -131,10 +133,9 @@
|
||||||
Var ButtonLanguageListXPosition = 970
|
Var ButtonLanguageListXPosition = 970
|
||||||
Var ButtonLanguageListYPosition = 590
|
Var ButtonLanguageListYPosition = 590
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
|
||||||
Else
|
Else
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,10 @@
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventOpen>
|
<EventOpen>
|
||||||
|
|
||||||
SAVELOG "======================================= Help Center ================================"
|
SAVELOG "======================================= Help Center Sending ================================"
|
||||||
|
|
||||||
RootLayoutVisible 3 "show"
|
RootLayoutVisible 3 "show"
|
||||||
|
|
||||||
Var TimeoutHelperProccess = 0
|
|
||||||
|
|
||||||
Var TelephoneNumber = ""
|
Var TelephoneNumber = ""
|
||||||
|
|
||||||
Var ShowTextNumber = "Enable"
|
Var ShowTextNumber = "Enable"
|
||||||
|
|
@ -19,15 +17,19 @@
|
||||||
Var ShowErrorText2 = "Invisible"
|
Var ShowErrorText2 = "Invisible"
|
||||||
Var Tel_Confirm_State = "Invisible"
|
Var Tel_Confirm_State = "Invisible"
|
||||||
|
|
||||||
|
DEBUGVAR BaseOnPageBoard
|
||||||
|
|
||||||
</EventOpen>
|
</EventOpen>
|
||||||
<Timeout> 1000 </Timeout>
|
<Timeout> 1000 </Timeout>
|
||||||
<EventTimeout>
|
<EventTimeout>
|
||||||
DEBUGVAR TimeoutHelperProccess
|
DEBUGVAR TimeoutHelperProccess
|
||||||
SAVELOG MachineStage
|
SAVELOG MachineStage
|
||||||
|
|
||||||
Var TimeoutHelperProccess = TimeoutHelperProccess + 1
|
If TimeoutHelperProccess > 0 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess - 1
|
||||||
|
EndIf
|
||||||
|
|
||||||
If TimeoutHelperProccess > 300 Then
|
If TimeoutHelperProccess = 0 Then
|
||||||
Var CurrHelpCenter = 0
|
Var CurrHelpCenter = 0
|
||||||
If MachineStage = "remove-cup" Then
|
If MachineStage = "remove-cup" Then
|
||||||
OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml"
|
OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml"
|
||||||
|
|
@ -44,10 +46,9 @@
|
||||||
Var ButtonLanguageListXPosition = 970
|
Var ButtonLanguageListXPosition = 970
|
||||||
Var ButtonLanguageListYPosition = 590
|
Var ButtonLanguageListYPosition = 590
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
|
||||||
Else
|
Else
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
@ -78,10 +79,10 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
Var ButtonLanguageCurrentXPosition = 1015
|
Var ButtonLanguageCurrentXPosition = 1000
|
||||||
Var ButtonLanguageCurrentYPosition = 458 - 38
|
Var ButtonLanguageCurrentYPosition = 458 - 18
|
||||||
|
|
||||||
Var ButtonLanguageListXPosition = 990
|
Var ButtonLanguageListXPosition = 980
|
||||||
Var ButtonLanguageListYPosition = 450 - 38
|
Var ButtonLanguageListYPosition = 450 - 38
|
||||||
If FromPaymentCash = "Enable" Then
|
If FromPaymentCash = "Enable" Then
|
||||||
Var LanguageButtonEnable = "Invisible"
|
Var LanguageButtonEnable = "Invisible"
|
||||||
|
|
@ -106,7 +107,7 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
|
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
|
||||||
|
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
@ -168,7 +169,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "1"
|
Var TelephoneNumber = TelephoneNumber + "1"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -195,7 +198,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "2"
|
Var TelephoneNumber = TelephoneNumber + "2"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -224,7 +229,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "3"
|
Var TelephoneNumber = TelephoneNumber + "3"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -252,7 +259,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "4"
|
Var TelephoneNumber = TelephoneNumber + "4"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -281,7 +290,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "5"
|
Var TelephoneNumber = TelephoneNumber + "5"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -310,7 +321,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "6"
|
Var TelephoneNumber = TelephoneNumber + "6"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -339,7 +352,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "7"
|
Var TelephoneNumber = TelephoneNumber + "7"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -368,7 +383,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "8"
|
Var TelephoneNumber = TelephoneNumber + "8"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -396,7 +413,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "9"
|
Var TelephoneNumber = TelephoneNumber + "9"
|
||||||
Var ShowTextNumber = "Invisible"
|
Var ShowTextNumber = "Invisible"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
|
|
@ -424,7 +443,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Var TelephoneNumber = TelephoneNumber + "0"
|
Var TelephoneNumber = TelephoneNumber + "0"
|
||||||
Trim TelephoneNumber MaxPhoneNumber
|
Trim TelephoneNumber MaxPhoneNumber
|
||||||
StrLen TelephoneNumber TelNumLen
|
StrLen TelephoneNumber TelNumLen
|
||||||
|
|
@ -455,7 +476,9 @@
|
||||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
If TimeoutHelperProccess < 50 Then
|
||||||
|
Var TimeoutHelperProccess = TimeoutHelperProccess + 10
|
||||||
|
EndIf
|
||||||
Trim TelephoneNumber -1
|
Trim TelephoneNumber -1
|
||||||
|
|
||||||
StrLen TelephoneNumber TelNumLen
|
StrLen TelephoneNumber TelNumLen
|
||||||
|
|
@ -546,7 +569,7 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
|
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
|
||||||
|
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
||||||
|
|
@ -21,14 +21,18 @@
|
||||||
RootLayoutVisible 3 "hide"
|
RootLayoutVisible 3 "hide"
|
||||||
OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||||
Else
|
Else
|
||||||
Var LanguageButtonEnable = "Enable"
|
If BaseOnPageBoard = 1 Then
|
||||||
Var ButtonLanguageCurrentXPosition = 990
|
Var BaseOnPageBoard = 0
|
||||||
Var ButtonLanguageCurrentYPosition = 608
|
Var LanguageButtonEnable = "Enable"
|
||||||
Var ButtonLanguageListXPosition = 970
|
Var ButtonLanguageCurrentXPosition = 990
|
||||||
Var ButtonLanguageListYPosition = 590
|
Var ButtonLanguageCurrentYPosition = 608
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
Var ButtonLanguageListXPosition = 970
|
||||||
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
|
Var ButtonLanguageListYPosition = 590
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
|
Else
|
||||||
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
<EventOpen>
|
<EventOpen>
|
||||||
|
|
||||||
RootLayoutVisible 13 "hide"
|
RootLayoutVisible 15 "hide"
|
||||||
|
|
||||||
;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||||
Var CurrHelpCenter = 0
|
Var CurrHelpCenter = 0
|
||||||
|
|
|
||||||
|
|
@ -370,7 +370,7 @@
|
||||||
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||||
|
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
|
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
|
||||||
|
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
;include="ROOT/taobin_project/inter/tha/xml/helper_show_and_refresh.lxml"
|
;include="ROOT/taobin_project/inter/tha/xml/helper_show_and_refresh.lxml"
|
||||||
|
|
||||||
Var Timeout = 0
|
|
||||||
|
|
||||||
SetInstanceIgnoreTouch
|
SetInstanceIgnoreTouch
|
||||||
|
|
||||||
DEBUGVAR SlientRefreshIndex
|
DEBUGVAR SlientRefreshIndex
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@
|
||||||
; tab_menu hide
|
; tab_menu hide
|
||||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
||||||
|
|
||||||
|
RootLayoutVisible 3 "hide"
|
||||||
|
|
||||||
DEBUGVAR LangProcess
|
DEBUGVAR LangProcess
|
||||||
|
|
||||||
Var ToggleAfterEventProfileOff = 0
|
Var ToggleAfterEventProfileOff = 0
|
||||||
|
|
@ -1320,9 +1322,8 @@
|
||||||
|
|
||||||
|
|
||||||
; enable helper
|
; enable helper
|
||||||
Var EnableHelperShow = 0
|
Var EnableHelperShow = 1
|
||||||
;Var FromDrinkOk = 1
|
Var FromDrinkOk = 1
|
||||||
Var CurrHelpCenter = 0
|
|
||||||
If EnableHelperShow = 1 Then
|
If EnableHelperShow = 1 Then
|
||||||
; enable btn_change_langs
|
; enable btn_change_langs
|
||||||
Var EnableBtnLangWithHelper = 1
|
Var EnableBtnLangWithHelper = 1
|
||||||
|
|
@ -1341,10 +1342,14 @@
|
||||||
Var FromPaymentCash = "Invisible"
|
Var FromPaymentCash = "Invisible"
|
||||||
Var FromBrewingProcess = "Enable"
|
Var FromBrewingProcess = "Enable"
|
||||||
|
|
||||||
RootLayoutVisible 15 "show"
|
RootLayoutVisible 14 "show"
|
||||||
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
|
If CurrHelpCenter = 1 Then
|
||||||
|
;do not thing
|
||||||
|
Else
|
||||||
|
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
|
||||||
|
EndIf
|
||||||
Else
|
Else
|
||||||
RootLayoutVisible 15 "hide"
|
RootLayoutVisible 14 "hide"
|
||||||
EndIf
|
EndIf
|
||||||
Else
|
Else
|
||||||
RootLayoutVisible 3 "hide"
|
RootLayoutVisible 3 "hide"
|
||||||
|
|
@ -2121,10 +2126,8 @@ PRICE "Reset" "-"
|
||||||
DEBUGVAR InternationalEnable
|
DEBUGVAR InternationalEnable
|
||||||
DEBUGVAR CountryName
|
DEBUGVAR CountryName
|
||||||
|
|
||||||
Var BaseOnPageBoard = 0
|
|
||||||
|
|
||||||
If CurrHelpCenter = 1 Then
|
If CurrHelpCenter = 1 Then
|
||||||
; do not thing when open the helper
|
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
|
||||||
Else
|
Else
|
||||||
Var BaseOnPageBoard = 0
|
Var BaseOnPageBoard = 0
|
||||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
||||||
|
|
@ -2303,7 +2306,7 @@ PRICE "Reset" "-"
|
||||||
If CurrHelpCenter = 1 Then
|
If CurrHelpCenter = 1 Then
|
||||||
;do not thing
|
;do not thing
|
||||||
Else
|
Else
|
||||||
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
@ -2604,7 +2607,7 @@ PRICE "Reset" "-"
|
||||||
Var OpenFromPageBoard = 1
|
Var OpenFromPageBoard = 1
|
||||||
|
|
||||||
If CurrHelpCenter = 1 Then
|
If CurrHelpCenter = 1 Then
|
||||||
; do not thing when open the helper
|
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
|
||||||
Else
|
Else
|
||||||
Var BaseOnPageBoard = 0
|
Var BaseOnPageBoard = 0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2782,8 +2782,7 @@
|
||||||
|
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
|
|
||||||
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
|
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
|
||||||
;RootLayoutVisible 15 "show"
|
|
||||||
|
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
||||||
|
|
@ -76,6 +76,8 @@
|
||||||
Var ButtonLanguageListWidth = 70
|
Var ButtonLanguageListWidth = 70
|
||||||
l 86
|
l 86
|
||||||
|
|
||||||
|
Var ButtonLanguageListXPositionIconForFlag = ButtonLanguageListXPositionIcon - 10
|
||||||
|
|
||||||
DEBUGVAR ENABLE_LANGUAGE_COUNT
|
DEBUGVAR ENABLE_LANGUAGE_COUNT
|
||||||
If ENABLE_LANGUAGE_COUNT = "" Then
|
If ENABLE_LANGUAGE_COUNT = "" Then
|
||||||
LanguageControl "UpdateList" 1
|
LanguageControl "UpdateList" 1
|
||||||
|
|
@ -502,7 +504,7 @@
|
||||||
</ListView1>
|
</ListView1>
|
||||||
|
|
||||||
<ListView1>
|
<ListView1>
|
||||||
<X> ButtonLanguageListXPositionIcon </X>
|
<X> ButtonLanguageListXPositionIconForFlag </X>
|
||||||
<Y> ButtonLanguageListYPositionIcon </Y>
|
<Y> ButtonLanguageListYPositionIcon </Y>
|
||||||
<Width> 1080 </Width>
|
<Width> 1080 </Width>
|
||||||
<Height> "auto" </Height>
|
<Height> "auto" </Height>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue