Add support_langs for inter, MYS: change video & fix profile price auto change (still bug)
This commit is contained in:
parent
6761957213
commit
ed490b440f
8 changed files with 181 additions and 56 deletions
1
inter/aus/support_langs
Normal file
1
inter/aus/support_langs
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
ENG
|
||||||
1
inter/hkg/support_langs
Normal file
1
inter/hkg/support_langs
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
ENG
|
||||||
Binary file not shown.
|
|
@ -1 +1 @@
|
||||||
ENG,THAI,CHINA,JAPAN,MALAY
|
ENG,-,CHINA,JAPAN,MALAY
|
||||||
|
|
|
||||||
|
|
@ -5,75 +5,121 @@ DEBUGVAR XMLProfile
|
||||||
STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat
|
STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat
|
||||||
STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce
|
STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce
|
||||||
|
|
||||||
DEBUGVAR HasProYuzu250Concat
|
Var refresh_str = "-RefreshProf"
|
||||||
DEBUGVAR ProReducedPriceEnable
|
STRCONTAIN refresh_str XMLProfile HasRefreshProf
|
||||||
DEBUGVAR IgnoreProfileFromRunEV
|
|
||||||
|
|
||||||
If ProReducedPriceEnable = 1 Then
|
DEBUGVAR HasRefreshProf
|
||||||
|
DEBUGVAR NeedRefreshProfile
|
||||||
|
|
||||||
Else
|
; refresh-profile-after-promo-end
|
||||||
DEBUGVAR "Case pro reduce end"
|
If NeedRefreshProfile = 1 Then
|
||||||
; case-pro-reduce-end
|
|
||||||
If IgnoreProfileFromRunEV = 1 Then
|
READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_3.json" ProfileSlot3MYS
|
||||||
DEBUGVAR "Pro yuzu ongoing"
|
READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS
|
||||||
; concat-profile
|
|
||||||
If HasProYuzu250Concat = "true" Then
|
STRCONTAIN "Drop" ProfileSlot3MYS PromoYuzuDrop
|
||||||
DEBUGVAR "Pro yuzu concat"
|
STRCONTAIN "Drop" ProfileSlot4MYS PromoYuzuDis50Drop
|
||||||
|
|
||||||
|
DEBUGVAR PromoYuzuDrop
|
||||||
|
DEBUGVAR PromoYuzuDis50Drop
|
||||||
|
|
||||||
|
If HasRefreshProf = "true" Then
|
||||||
|
|
||||||
|
DEBUGVAR "case already refresh"
|
||||||
|
|
||||||
|
; restore-profile
|
||||||
|
CacheVarStr "get" XMLProfilePreEvent
|
||||||
|
Var XMLProfile = XMLProfilePreEvent
|
||||||
|
Var NeedRefreshProfile = 0
|
||||||
|
Else
|
||||||
|
; save-current-as-pre
|
||||||
|
CacheVarStr "put" XMLProfilePreEvent
|
||||||
|
|
||||||
|
If PromoYuzuDrop = "true" Then
|
||||||
|
DEBUGVAR "case yuzu drop --> refresh"
|
||||||
|
Var XMLProfile = XMLProfile + refresh_str
|
||||||
Else
|
Else
|
||||||
|
If PromoYuzuDis50Drop = "true" Then
|
||||||
|
DEBUGVAR "case yuzu drop discount 50% --> refresh"
|
||||||
|
Var XMLProfile = XMLProfile + refresh_str
|
||||||
|
EndIf
|
||||||
|
EndIf
|
||||||
|
|
||||||
|
EndIf
|
||||||
|
Else
|
||||||
|
|
||||||
|
DEBUGVAR HasProYuzu250Concat
|
||||||
|
DEBUGVAR ProReducedPriceEnable
|
||||||
|
DEBUGVAR IgnoreProfileFromRunEV
|
||||||
|
|
||||||
|
If ProReducedPriceEnable = 1 Then
|
||||||
|
|
||||||
|
Else
|
||||||
|
DEBUGVAR "Case pro reduce end"
|
||||||
|
; case-pro-reduce-end
|
||||||
|
If IgnoreProfileFromRunEV = 1 Then
|
||||||
|
DEBUGVAR "Pro yuzu ongoing"
|
||||||
|
; concat-profile
|
||||||
|
If HasProYuzu250Concat = "true" Then
|
||||||
|
DEBUGVAR "Pro yuzu concat"
|
||||||
|
Else
|
||||||
|
|
||||||
|
If IsProfileReduce = "true" Then
|
||||||
|
DEBUGVAR "Pro reduce was set but disabled from trick"
|
||||||
|
CacheVarStr "get" XMLProfilePreEvent
|
||||||
|
If XMLProfilePreEvent = "" Then
|
||||||
|
DEBUGVAR "Get PreEvent Empty"
|
||||||
|
Var XMLProfile = "General"
|
||||||
|
Else
|
||||||
|
DEBUGVAR "Restore profile by pre-event, also concat Yuzu"
|
||||||
|
DEBUGVAR XMLProfilePreEvent
|
||||||
|
Var XMLProfile = XMLProfilePreEvent + "-"
|
||||||
|
Var XMLProfile = XMLProfile + "PromoYuzu250"
|
||||||
|
|
||||||
|
EndIf
|
||||||
|
|
||||||
If IsProfileReduce = "true" Then
|
|
||||||
DEBUGVAR "Pro reduce was set but disabled from trick"
|
|
||||||
CacheVarStr "get" XMLProfilePreEvent
|
|
||||||
If XMLProfilePreEvent = "" Then
|
|
||||||
DEBUGVAR "Get PreEvent Empty"
|
|
||||||
Var XMLProfile = "General"
|
|
||||||
Else
|
Else
|
||||||
DEBUGVAR "Restore profile by pre-event, also concat Yuzu"
|
DEBUGVAR "No pro reduce, concat pro yuzu"
|
||||||
DEBUGVAR XMLProfilePreEvent
|
CacheVarStr "put" XMLProfilePreEvent
|
||||||
Var XMLProfile = XMLProfilePreEvent + "-"
|
|
||||||
|
Var XMLProfile = XMLProfile + "-"
|
||||||
Var XMLProfile = XMLProfile + "PromoYuzu250"
|
Var XMLProfile = XMLProfile + "PromoYuzu250"
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
Else
|
|
||||||
DEBUGVAR "No pro reduce, concat pro yuzu"
|
|
||||||
CacheVarStr "put" XMLProfilePreEvent
|
|
||||||
|
|
||||||
Var XMLProfile = XMLProfile + "-"
|
|
||||||
Var XMLProfile = XMLProfile + "PromoYuzu250"
|
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
|
||||||
Else
|
|
||||||
If IsProfileReduce = "true" Then
|
|
||||||
DEBUGVAR "No yuzu but set pro reduce"
|
|
||||||
CacheVarStr "get" XMLProfilePreEvent
|
|
||||||
If XMLProfilePreEvent = "" Then
|
|
||||||
DEBUGVAR "PreEvent empty, set General"
|
|
||||||
Var XMLProfile = "General"
|
|
||||||
Else
|
|
||||||
DEBUGVAR "Restore profile by pre-event"
|
|
||||||
Var XMLProfile = XMLProfilePreEvent
|
|
||||||
EndIf
|
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
If IsProfileReduce = "true" Then
|
||||||
If HasProYuzu250Concat = "true" Then
|
DEBUGVAR "No yuzu but set pro reduce"
|
||||||
CacheVarStr "get" XMLProfilePreEvent
|
CacheVarStr "get" XMLProfilePreEvent
|
||||||
Var XMLProfile = XMLProfilePreEvent
|
If XMLProfilePreEvent = "" Then
|
||||||
|
DEBUGVAR "PreEvent empty, set General"
|
||||||
|
Var XMLProfile = "General"
|
||||||
|
Else
|
||||||
|
DEBUGVAR "Restore profile by pre-event"
|
||||||
|
Var XMLProfile = XMLProfilePreEvent
|
||||||
|
EndIf
|
||||||
|
|
||||||
|
Else
|
||||||
|
|
||||||
|
If HasProYuzu250Concat = "true" Then
|
||||||
|
CacheVarStr "get" XMLProfilePreEvent
|
||||||
|
Var XMLProfile = XMLProfilePreEvent
|
||||||
|
EndIf
|
||||||
|
|
||||||
|
DEBUGVAR "Store profile pre event"
|
||||||
|
DEBUGVAR XMLProfilePreEvent
|
||||||
|
CacheVarStr "put" XMLProfilePreEvent
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
DEBUGVAR "Store profile pre event"
|
|
||||||
DEBUGVAR XMLProfilePreEvent
|
|
||||||
CacheVarStr "put" XMLProfilePreEvent
|
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
EndIf
|
|
||||||
|
|
||||||
|
If IgnoreProfileFromRunEV = 1 Then
|
||||||
|
Var ToggleAfterEventProfileOff = 1
|
||||||
If IgnoreProfileFromRunEV = 1 Then
|
EndIf
|
||||||
Var ToggleAfterEventProfileOff = 1
|
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
|
|
|
||||||
|
|
@ -58,8 +58,25 @@ If SystemDateMonthInt = 9 Then
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
If SystemDateMonthInt = 10 Then
|
||||||
|
|
||||||
|
Var IgnoreProfileFromRunEV = 0
|
||||||
|
|
||||||
|
EndIf
|
||||||
|
|
||||||
|
If SystemDateMonthInt = 11 Then
|
||||||
|
|
||||||
|
Var IgnoreProfileFromRunEV = 0
|
||||||
|
EndIf
|
||||||
|
|
||||||
|
If SystemDateMonthInt = 12 Then
|
||||||
|
Var IgnoreProfileFromRunEV = 0
|
||||||
|
|
||||||
|
EndIf
|
||||||
|
|
||||||
If SystemDateMonthInt < 10 Then
|
If SystemDateMonthInt < 10 Then
|
||||||
Var ProReducedPriceEnable = 0
|
Var ProReducedPriceEnable = 0
|
||||||
|
Var IgnoreProfileFromRunEV = 0
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If ProReducedPriceEnable = 0 Then
|
If ProReducedPriceEnable = 0 Then
|
||||||
|
|
@ -69,6 +86,23 @@ If ProReducedPriceEnable = 0 Then
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
|
; zone-refresh-once
|
||||||
|
|
||||||
|
READ_FILE "/mnt/sdcard/coffeevending/need_refresh_file" NeedRefreshStr
|
||||||
|
STRCONTAIN "1" NeedRefreshStr need_refresh
|
||||||
|
|
||||||
|
If need_refresh = "true" Then
|
||||||
|
|
||||||
|
Var NeedRefreshProfile = 1
|
||||||
|
WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "0"
|
||||||
|
|
||||||
|
Else
|
||||||
|
Var NeedRefreshProfile = 0
|
||||||
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
If BoxID = 177746 Then
|
If BoxID = 177746 Then
|
||||||
Var ProThaiTeaEnable = 1
|
Var ProThaiTeaEnable = 1
|
||||||
Var ProYuzuEnable = 1
|
Var ProYuzuEnable = 1
|
||||||
|
|
|
||||||
1
inter/sgp/support_langs
Normal file
1
inter/sgp/support_langs
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
ENG
|
||||||
|
|
@ -667,6 +667,7 @@
|
||||||
Var UsePepsiTheme = 0
|
Var UsePepsiTheme = 0
|
||||||
|
|
||||||
Var NoTrickPriceProfile = 0
|
Var NoTrickPriceProfile = 0
|
||||||
|
Var NeedRefreshProfile = 0
|
||||||
|
|
||||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||||
|
|
||||||
|
|
@ -1502,7 +1503,7 @@ PRICE "Reset" "-"
|
||||||
</EventUnitTest7>
|
</EventUnitTest7>
|
||||||
|
|
||||||
<EventUnitTest8>
|
<EventUnitTest8>
|
||||||
Var XMLProfile = "Discount50"
|
Var XMLProfile = "General"
|
||||||
Var TimeProfilePrice = 0
|
Var TimeProfilePrice = 0
|
||||||
|
|
||||||
</EventUnitTest8>
|
</EventUnitTest8>
|
||||||
|
|
@ -2188,5 +2189,46 @@ PRICE "Reset" "-"
|
||||||
<Value> ShowNetworkProblemText </Value>
|
<Value> ShowNetworkProblemText </Value>
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
|
<Button>
|
||||||
|
<X> 0 </X>
|
||||||
|
<Y> 1870 </Y>
|
||||||
|
<State> eval(
|
||||||
|
If LangProcess = "LoadConfig" Then
|
||||||
|
Var return = "Enable"
|
||||||
|
Else
|
||||||
|
Var return = "Invisible"
|
||||||
|
EndIf
|
||||||
|
) </State>
|
||||||
|
<Color> "0xFFFF00" </Color>
|
||||||
|
<Width> 1080 </Width>
|
||||||
|
<Height> 60 </Height>
|
||||||
|
<EventClick>
|
||||||
|
</EventClick>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<Text>
|
||||||
|
<State> eval(
|
||||||
|
If LangProcess = "LoadConfig" Then
|
||||||
|
Var return = "Enable"
|
||||||
|
Else
|
||||||
|
Var return = "Invisible"
|
||||||
|
EndIf
|
||||||
|
) </State>
|
||||||
|
<X> 5 </X>
|
||||||
|
<Y> 1880 </Y>
|
||||||
|
<Size> 24 </Size>
|
||||||
|
<Align> Center </Align>
|
||||||
|
<Width> 1080 </Width>
|
||||||
|
<Font> RobotoRegular </Font>
|
||||||
|
<Color> 0x000000 </Color>
|
||||||
|
<Value> eval(
|
||||||
|
If LangProcess = "LoadConfig" Then
|
||||||
|
Var return = "Loading ..."
|
||||||
|
Else
|
||||||
|
Var return = ""
|
||||||
|
EndIf
|
||||||
|
) </Value>
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
|
||||||
</Page>
|
</Page>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue