Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
e80ce060cc
82 changed files with 728 additions and 1008 deletions
|
|
@ -18,6 +18,20 @@
|
|||
|
||||
DEBUGVAR ToppingNewShow
|
||||
|
||||
DEBUGVAR OpenFromPageBoard
|
||||
If OpenFromPageBoard = 1 Then
|
||||
Var OpenFromPageBoard = 0
|
||||
Var langnext1 = "true"
|
||||
Var langnext2 = "true"
|
||||
Var langnext3 = "true"
|
||||
Var langnext4 = "true"
|
||||
Var langnext5 = "true"
|
||||
Var langnext6 = "true"
|
||||
Var langnext7 = "true"
|
||||
Var langnext8 = "true"
|
||||
SAVELOG "======================================= RefreshAll Languages ================================"
|
||||
EndIf
|
||||
|
||||
Var NextPage = "-"
|
||||
|
||||
Var Seeker.thankLidFlag = 0
|
||||
|
|
@ -561,6 +575,7 @@
|
|||
<EventClick>
|
||||
|
||||
If Inst5MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 2
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
|
@ -631,6 +646,7 @@
|
|||
<EventClick>
|
||||
|
||||
If Inst6MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 3
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
|
@ -664,6 +680,7 @@
|
|||
<EventClick>
|
||||
|
||||
If Inst7MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 4
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
|
@ -697,6 +714,7 @@
|
|||
<EventClick>
|
||||
|
||||
If Inst11MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 7
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
|
@ -730,6 +748,7 @@
|
|||
<EventClick>
|
||||
|
||||
If Inst10MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 8
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
|
@ -766,6 +785,7 @@
|
|||
<EventClick>
|
||||
|
||||
If Inst8MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 5
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
|
@ -798,6 +818,7 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
If Inst8MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 5
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
|
@ -858,6 +879,7 @@
|
|||
<EventClick>
|
||||
|
||||
If Inst9MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 6
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -433,11 +433,6 @@
|
|||
Machine DoorClose
|
||||
|
||||
|
||||
If ShoppyPayEnable = "true" Then
|
||||
Else
|
||||
Var PayState5 = "Disable"
|
||||
Var PayState6 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
If web_readyOK = "true" Then
|
||||
|
|
|
|||
|
|
@ -497,14 +497,6 @@
|
|||
|
||||
Machine DoorClose
|
||||
|
||||
|
||||
If ShoppyPayEnable = "true" Then
|
||||
Else
|
||||
Var PayState5 = "Disable"
|
||||
Var PayState6 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
If web_readyOK = "true" Then
|
||||
|
||||
Var web_readyOK = "false"
|
||||
|
|
@ -548,6 +540,7 @@
|
|||
EndIf
|
||||
|
||||
DEBUGVAR DirImage2
|
||||
DEBUGVAR PayState5
|
||||
|
||||
Var CancelContinue = 0
|
||||
|
||||
|
|
@ -874,6 +867,11 @@
|
|||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
DEBUGVAR PayState5
|
||||
DEBUGVAR CoinAmount
|
||||
DEBUGVAR SELLONLINE
|
||||
|
||||
|
||||
If ReadyForBrew = "false" Then
|
||||
SAVELOG "Back to main1"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
@ -913,17 +911,11 @@
|
|||
|
||||
If RoadShow = "true" Then
|
||||
Else
|
||||
Var PayState3 = "Disable"
|
||||
If PayState3 = "Enable" Then
|
||||
Var PayState3 = "Disable"
|
||||
EndIf
|
||||
If PayState5 = "Enable" Then
|
||||
Var PayState3 = "Disable"
|
||||
EndIf
|
||||
If PayState5 = "Enable" Then
|
||||
Var PayState5 = "Disable"
|
||||
Var PayState5 = "Disable"
|
||||
EndIf
|
||||
Var PayState5 = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue