Fix many bug and move instance
This commit is contained in:
parent
2151bf0ae5
commit
ba53a7a47a
20 changed files with 143 additions and 245 deletions
|
|
@ -56,26 +56,27 @@ Else
|
|||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR OpenFromMulti
|
||||
If CatalogLayoutV3 = 1 Then
|
||||
|
||||
DEBUGVAR NextPage
|
||||
|
||||
SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
|
||||
EndIf
|
||||
|
||||
|
||||
If OpenFromPageBoard = 1 Then
|
||||
|
||||
DEBUGVAR BigButtonEnable
|
||||
|
||||
OpenInst 2 FileRecommendToOpen
|
||||
Var OpenFromPageBoard = 0
|
||||
|
||||
Else
|
||||
|
||||
|
||||
Open FileRecommendToOpen
|
||||
If OpenFromPageBoard = 1 Then
|
||||
|
||||
DEBUGVAR BigButtonEnable
|
||||
|
||||
OpenInst 2 FileRecommendToOpen
|
||||
Var OpenFromPageBoard = 0
|
||||
|
||||
Else
|
||||
|
||||
Open FileRecommendToOpen
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Var OpenFromPageBoard = 0
|
||||
|
|
|
|||
|
|
@ -1706,7 +1706,7 @@
|
|||
|
||||
Machine NewPaymentOpenBrewingXMLEnable
|
||||
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
||||
|
||||
|
||||
If EnablePepsiFullscreen = 1 Then
|
||||
DEBUGVAR EnablePepsiFullscreen
|
||||
|
|
@ -1888,6 +1888,7 @@ PRICE "Reset" "-"
|
|||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
||||
|
||||
If CNTDOWN_PROTECT_SCREEN_BLANK > 0 Then
|
||||
|
|
@ -2121,38 +2122,33 @@ PRICE "Reset" "-"
|
|||
DEBUGVAR CountryName
|
||||
|
||||
Var BaseOnPageBoard = 0
|
||||
|
||||
If CurrHelpCenter = 1 Then
|
||||
; do not thing when open the helper
|
||||
Else
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
Else
|
||||
; show language icon
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
RootLayoutVisible 3 "show"
|
||||
|
||||
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
|
||||
TRY OpenFileXML
|
||||
EndIf
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
Else
|
||||
If BeerTrapEnable = "true" Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
|
||||
Else
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
EndIf
|
||||
; show language icon
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
RootLayoutVisible 3 "show"
|
||||
|
||||
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
|
||||
TRY OpenFileXML
|
||||
EndIf
|
||||
|
||||
Machine DoorClose
|
||||
Else
|
||||
If BeerTrapEnable = "true" Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
|
||||
Else
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
TopView "show"
|
||||
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
Machine DoorClose
|
||||
|
||||
EndIf
|
||||
TopView "show"
|
||||
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -2166,11 +2162,11 @@ PRICE "Reset" "-"
|
|||
Var CountUpReloadAll = CountUpReloadAll + 1
|
||||
|
||||
DEBUGVAR CountUpReloadAll
|
||||
; setvarint CountUpReloadAll 49
|
||||
; setvarint CountUpReloadAll 200
|
||||
; Original value is 40
|
||||
If EnableMultiInstance = "true" Then
|
||||
|
||||
If CountUpReloadAll > 120 Then
|
||||
If CountUpReloadAll > 50 Then
|
||||
Var NeedReboot = "false"
|
||||
|
||||
Var StartUpExt = "-"
|
||||
|
|
@ -2600,36 +2596,32 @@ PRICE "Reset" "-"
|
|||
|
||||
Var OpenFromPageBoard = 1
|
||||
|
||||
If CurrHelpCenter = 1 Then
|
||||
; do not thing when open the helper
|
||||
Else
|
||||
If InternationalEnable = 1 Then
|
||||
If InternationalEnable = 1 Then
|
||||
|
||||
If CountryName = "Thailand" Then
|
||||
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
Else ; show language icon
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
RootLayoutVisible 3 "show"
|
||||
If CountryName = "Thailand" Then
|
||||
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
Else ; show language icon
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
RootLayoutVisible 3 "show"
|
||||
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
|
||||
TRY OpenFileXML
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If CocktailShow = "true" Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
|
||||
Else
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
EndIf
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
|
||||
TRY OpenFileXML
|
||||
EndIf
|
||||
Else
|
||||
|
||||
Machine DoorClose
|
||||
|
||||
TopView "show"
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
If CocktailShow = "true" Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
|
||||
Else
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Machine DoorClose
|
||||
|
||||
TopView "show"
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<Height> 1920 </Height>
|
||||
|
||||
<EventOpen>
|
||||
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.xml"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 10000 </Timeout>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<Height> 1920 </Height>
|
||||
|
||||
<EventOpen>
|
||||
Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.xml"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 10000 </Timeout>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<Height> 1920 </Height>
|
||||
|
||||
<EventOpen>
|
||||
Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.xml"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 10000 </Timeout>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<Height> 1920 </Height>
|
||||
|
||||
<EventOpen>
|
||||
Var InstanceTabOpenFile14 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.xml"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 10000 </Timeout>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue