Merge branch 'uae_dubai_blue' into masterpiece
This commit is contained in:
commit
ecdf9a316f
36 changed files with 537 additions and 80 deletions
|
|
@ -679,6 +679,11 @@
|
|||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
|
||||
; zone-fast-load-lang
|
||||
READ_FILE "/mnt/sdcard/enable_load_lang_fast" ENABLE_LOAD_LANG_V2
|
||||
STRCONTAIN "1" ENABLE_LOAD_LANG_V2 UseLoadLangV2
|
||||
|
||||
|
||||
;inter-page-board
|
||||
If CountryName = "Malaysia" Then
|
||||
|
||||
|
|
@ -718,10 +723,26 @@
|
|||
Var XButtonMember = 384
|
||||
Var YButtonMember = 1695
|
||||
|
||||
If Not#LanguageLoaded = "" Then
|
||||
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/mys/menu/lang.tsv"
|
||||
DEBUGVAR UseLoadLangV2
|
||||
DEBUGVAR Not#LanguageLoaded
|
||||
DEBUGVAR Not#LanguageResult
|
||||
DEBUGVAR LangProcess
|
||||
|
||||
DEBUGVAR LangLoadTime
|
||||
|
||||
If UseLoadLangV2 = "true" Then
|
||||
; load-process-should-be-done-b4-this
|
||||
If Not#LanguageLoaded = "" Then
|
||||
LoadLanguageV2 "/mnt/sdcard/coffeevending/taobin_project/inter/mys/menu/lang.tsv"
|
||||
EndIf
|
||||
Else
|
||||
If Not#LanguageLoaded = "" Then
|
||||
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/mys/menu/lang.tsv"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
; load credit
|
||||
|
||||
If EnableCreditCard = "" Then
|
||||
|
|
@ -990,7 +1011,7 @@
|
|||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev"
|
||||
|
||||
|
||||
|
||||
Var WebAppShow = "Invisible"
|
||||
EnableLanguage "ENG"
|
||||
EnableLanguage "UAE_DUBAI"
|
||||
|
|
@ -1012,6 +1033,7 @@
|
|||
Var TextPriceMenuHotX = 48
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Var ButtontoTopupMenu = "Invisible"
|
||||
Var ExtraToppingState = "Invisible"
|
||||
|
||||
Var PriceUnitText = "Price in DH"
|
||||
|
||||
|
|
@ -1437,6 +1459,7 @@
|
|||
Var TimeProfilePrice = 0
|
||||
|
||||
DEBUGVAR LangProcess
|
||||
DEBUGVAR LangLoadTime
|
||||
|
||||
; lang-lock-until-done
|
||||
If LangProcess = "Done" Then
|
||||
|
|
@ -1660,8 +1683,8 @@ PRICE "Reset" "-"
|
|||
</EventUnitTest7>
|
||||
|
||||
<EventUnitTest8>
|
||||
Var XMLProfile = "General"
|
||||
Var TimeProfilePrice = 0
|
||||
Var buttonRemoveCup = "Enable"
|
||||
DEBUGVAR buttonRemoveCup
|
||||
|
||||
</EventUnitTest8>
|
||||
|
||||
|
|
|
|||
|
|
@ -612,7 +612,7 @@
|
|||
; full
|
||||
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
|
||||
Else
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/advert.xml"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
; Only IDCard
|
||||
Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
|
||||
EndIf
|
||||
|
|
@ -654,7 +654,7 @@
|
|||
; full
|
||||
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
|
||||
Else
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/advert.xml"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
; Only IDCard
|
||||
Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue