THAI INTER: Merge branch masterpiece -> th_mmr
This commit is contained in:
commit
3c994e2ed1
548 changed files with 161156 additions and 52934 deletions
|
|
@ -172,6 +172,10 @@
|
|||
Var menu_name_thai_blender = ""
|
||||
Var menu_desc_thai_blender = ""
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
||||
|
||||
TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -184,11 +188,11 @@
|
|||
DEBUGVAR ShowButtonClick2
|
||||
|
||||
DEBUGVAR MenuKidButtonState
|
||||
|
||||
DEBUGVAR New_Payment
|
||||
|
||||
|
||||
|
||||
DEBUGVAR $51-03-01-0035.Price
|
||||
|
||||
Var PromotionIDCurrentOrder = 0
|
||||
RootLayoutVisible 3 "show"
|
||||
|
||||
|
|
@ -238,6 +242,136 @@
|
|||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
@ -379,10 +513,15 @@
|
|||
<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 MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "coffee"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -404,8 +543,16 @@
|
|||
<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 MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "tea"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000006 </ID>
|
||||
|
|
@ -424,8 +571,16 @@
|
|||
<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 MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "caramel"
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000007 </ID>
|
||||
|
|
@ -446,8 +601,16 @@
|
|||
<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 MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "kidmenu"
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000011 </ID>
|
||||
|
|
@ -467,8 +630,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 MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "appfast"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -489,8 +659,16 @@
|
|||
<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 MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "soda"
|
||||
EndIf
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000009 </ID>
|
||||
|
|
@ -537,8 +715,16 @@
|
|||
<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 MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "healthy"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -582,8 +768,16 @@
|
|||
<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 MultiProcessTimer = 0
|
||||
Var MultiProcess = "Enable"
|
||||
Var SelectedMenu = "pepsi"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
|
|
@ -609,6 +803,7 @@
|
|||
Open CheckMemberPage
|
||||
|
||||
</EventClick>
|
||||
|
||||
<Language>
|
||||
<ID> 002005 </ID>
|
||||
<X> 20 </X>
|
||||
|
|
@ -729,7 +924,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>
|
||||
|
|
@ -820,5 +1029,4 @@
|
|||
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
|
||||
</EventUnitTest8>
|
||||
|
||||
|
||||
</Popup>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue