Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
5269f48101
3 changed files with 219 additions and 145 deletions
|
|
@ -195,7 +195,7 @@
|
|||
|
||||
Var PromotionIDCurrentOrder = 0
|
||||
RootLayoutVisible 3 "show"
|
||||
|
||||
|
||||
Var ButtonLanguageCurrentXPosition = 1005
|
||||
Var ButtonLanguageCurrentYPosition = 458 - 38
|
||||
|
||||
|
|
@ -241,67 +241,134 @@
|
|||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
DEBUGVAR MultiProcess
|
||||
|
||||
DEBUGVAR Inst5MenuLoaded
|
||||
DEBUGVAR Inst6MenuLoaded
|
||||
DEBUGVAR Inst7MenuLoaded
|
||||
DEBUGVAR Inst8MenuLoaded
|
||||
DEBUGVAR Inst9MenuLoaded
|
||||
DEBUGVAR Inst10MenuLoaded
|
||||
DEBUGVAR Inst11MenuLoaded
|
||||
|
||||
DEBUGVAR MultiProcessTimer
|
||||
|
||||
|
||||
If MultiProcess = "Enable" Then
|
||||
If SelectedMenu = "coffee" Then
|
||||
Var MultiProcessTimer = MultiProcessTimer + 1
|
||||
If Inst5MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 2
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
If MultiProcessTimer >= 20 Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 2
|
||||
Var MultiProcessTimer = 0
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "tea" Then
|
||||
Var MultiProcessTimer = MultiProcessTimer + 1
|
||||
If Inst6MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 3
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
If MultiProcessTimer >= 20 Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 3
|
||||
Var MultiProcessTimer = 0
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "caramel" Then
|
||||
If SelectedMenu = "caramel" Then
|
||||
Var MultiProcessTimer = MultiProcessTimer + 1
|
||||
If Inst7MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 4
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
If MultiProcessTimer >= 20 Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 4
|
||||
Var MultiProcessTimer = 0
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "kidmenu" Then
|
||||
If SelectedMenu = "kidmenu" Then
|
||||
Var MultiProcessTimer = MultiProcessTimer + 1
|
||||
If Inst8MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 5
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
If MultiProcessTimer >= 20 Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 5
|
||||
Var MultiProcessTimer = 0
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "healthy" Then
|
||||
If SelectedMenu = "healthy" Then
|
||||
Var MultiProcessTimer = MultiProcessTimer + 1
|
||||
If Inst9MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 6
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
If MultiProcessTimer >= 20 Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 6
|
||||
Var MultiProcessTimer = 0
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "pepsi" Then
|
||||
If SelectedMenu = "pepsi" Then
|
||||
Var MultiProcessTimer = MultiProcessTimer + 1
|
||||
If Inst10MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 8
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
If MultiProcessTimer >= 20 Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 8
|
||||
Var MultiProcessTimer = 0
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "soda" Then
|
||||
If SelectedMenu = "soda" Then
|
||||
Var MultiProcessTimer = MultiProcessTimer + 1
|
||||
If Inst11MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 7
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
If MultiProcessTimer >= 20 Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 7
|
||||
Var MultiProcessTimer = 0
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -452,6 +519,7 @@
|
|||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "coffee"
|
||||
EndIf
|
||||
|
|
@ -481,6 +549,7 @@
|
|||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "tea"
|
||||
EndIf
|
||||
|
|
@ -509,6 +578,7 @@
|
|||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "caramel"
|
||||
EndIf
|
||||
|
|
@ -538,6 +608,7 @@
|
|||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "kidmenu"
|
||||
EndIf
|
||||
|
|
@ -565,6 +636,7 @@
|
|||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "appfast"
|
||||
EndIf
|
||||
|
|
@ -594,6 +666,7 @@
|
|||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "soda"
|
||||
EndIf
|
||||
|
|
@ -649,6 +722,7 @@
|
|||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "healthy"
|
||||
EndIf
|
||||
|
|
@ -701,6 +775,7 @@
|
|||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "pepsi"
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue