Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
babe93a2e2
19 changed files with 1880 additions and 1653 deletions
|
|
@ -192,15 +192,19 @@
|
|||
|
||||
|
||||
|
||||
DEBUGVAR $51-03-01-0035.Price
|
||||
|
||||
Var PromotionIDCurrentOrder = 0
|
||||
RootLayoutVisible 3 "show"
|
||||
|
||||
Var ButtonLanguageCurrentXPosition = 1005
|
||||
Var ButtonLanguageCurrentXPosition = 1005
|
||||
Var ButtonLanguageCurrentYPosition = 458 - 38
|
||||
|
||||
Var ButtonLanguageListXPosition = 970
|
||||
Var ButtonLanguageListYPosition = 450 - 38
|
||||
|
||||
Var SelectedMenu = ""
|
||||
Var MultiProcess = "Invisible"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -237,6 +241,69 @@
|
|||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If MultiProcess = "Enable" Then
|
||||
If SelectedMenu = "coffee" Then
|
||||
If Inst5MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 2
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "tea" Then
|
||||
If Inst6MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 3
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "caramel" Then
|
||||
If Inst7MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 4
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "kidmenu" Then
|
||||
If Inst8MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 5
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "healthy" Then
|
||||
If Inst9MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 6
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "pepsi" Then
|
||||
If Inst10MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 8
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SelectedMenu = "soda" Then
|
||||
If Inst11MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
TabMenuVisibleInst 7
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
|
|
@ -357,7 +424,7 @@
|
|||
<EventClick>
|
||||
|
||||
Var OpenFromMulti = 1
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
RootLayoutVisible 3 "hide"
|
||||
RootLayoutVisible 13 "hide"
|
||||
|
||||
|
|
@ -380,10 +447,14 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
TabMenuVisibleInst 2
|
||||
|
||||
RootLayoutVisible 13 "show"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
If Inst5MenuLoaded = "done" Then
|
||||
TabMenuVisibleInst 2
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "coffee"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -405,8 +476,15 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
TabMenuVisibleInst 3
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
If Inst6MenuLoaded = "done" Then
|
||||
TabMenuVisibleInst 3
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "tea"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000006 </ID>
|
||||
|
|
@ -425,8 +503,15 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
TabMenuVisibleInst 4
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
||||
If Inst7MenuLoaded = "done" Then
|
||||
TabMenuVisibleInst 4
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "caramel"
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000007 </ID>
|
||||
|
|
@ -447,8 +532,15 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
TabMenuVisibleInst 5
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
||||
If Inst8MenuLoaded = "done" Then
|
||||
TabMenuVisibleInst 5
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "kidmenu"
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000011 </ID>
|
||||
|
|
@ -468,8 +560,14 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
TabMenuVisibleInst 5
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
If Inst8MenuLoaded = "done" Then
|
||||
TabMenuVisibleInst 5
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "appfast"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -490,8 +588,15 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
TabMenuVisibleInst 7
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
||||
If Inst11MenuLoaded = "done" Then
|
||||
TabMenuVisibleInst 7
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "soda"
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000009 </ID>
|
||||
|
|
@ -538,8 +643,15 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
TabMenuVisibleInst 6
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
||||
If Inst9MenuLoaded = "done" Then
|
||||
TabMenuVisibleInst 6
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "healthy"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -583,8 +695,15 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
TabMenuVisibleInst 8
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
|
||||
If Inst10MenuLoaded = "done" Then
|
||||
TabMenuVisibleInst 8
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "pepsi"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -610,7 +729,6 @@
|
|||
Open CheckMemberPage
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 696 </X>
|
||||
|
|
@ -627,6 +745,13 @@
|
|||
Open "ROOT/taobin_project/xml/page_back_to_topup.xml"
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 002004 </ID>
|
||||
<X> 70 </X>
|
||||
<Y> 25 </Y>
|
||||
<Width> 200 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
|
|
@ -716,7 +841,21 @@
|
|||
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
<State> MultiProcess </State>
|
||||
<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
|
||||
</Image>
|
||||
|
||||
<GIF>
|
||||
<X> 493 </X>
|
||||
<Y> 968 </Y>
|
||||
<Width> 94 </Width>
|
||||
<Height> 94 </Height>
|
||||
<State> MultiProcess </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_payment/loading.gif" </Filename>
|
||||
</GIF>
|
||||
|
||||
|
||||
<Image>
|
||||
|
|
@ -780,7 +919,9 @@
|
|||
</EventUnitTest2>
|
||||
; Initial for jump to page_brewing3.xml
|
||||
<EventUnitTest3>
|
||||
|
||||
|
||||
</EventUnitTest3>
|
||||
|
||||
|
||||
|
||||
</Popup>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue