Merge branch 'masterpiece' of ssh://kong:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
nattapon tachawong
commit
decac96cba
560 changed files with 233482 additions and 69931 deletions
|
|
@ -160,6 +160,7 @@
|
|||
Var TestLoopFailed = 0
|
||||
|
||||
Var cock_tail_str = ""
|
||||
Var BeerTrapEnable = ""
|
||||
|
||||
READ_FILE "/mnt/sdcard/coffeevending/cock_tail_enable" cock_tail_str
|
||||
STRCONTAIN "1" cock_tail_str cock_tail_enable
|
||||
|
|
@ -178,6 +179,7 @@
|
|||
EndIf
|
||||
|
||||
|
||||
STRCONTAIN "1060" MaterialAvailable TaiwanesePowderEnable
|
||||
|
||||
|
||||
|
||||
|
|
@ -389,7 +391,6 @@
|
|||
Var TimerFirst = "true"
|
||||
|
||||
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
Var led_new = "0"
|
||||
READ_FILE "/mnt/sdcard/coffeevending/led_new" led_new
|
||||
|
|
@ -1303,7 +1304,7 @@
|
|||
Var TextPriceMenuY = 264
|
||||
Var TextPriceMenuBlendX = 180
|
||||
Var TextPriceMenuHotX = 48
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ButtontoTopupMenu = "Invisible"
|
||||
|
||||
Var PriceUnitText = ""
|
||||
|
|
@ -1334,14 +1335,32 @@
|
|||
; New mode
|
||||
; Inter + Multi-Instance available ./inter/tha/multi
|
||||
|
||||
Var EnableMultiInstanceFromBoxID = 0
|
||||
|
||||
TRY "ROOT/taobin_project/inter/tha/configure.ev"
|
||||
If CountryName = "Thailand" Then
|
||||
TRY "ROOT/taobin_project/inter/tha/configure.ev"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Australia" Then
|
||||
TRY "ROOT/taobin_project/inter/tha/configure.ev"
|
||||
EndIf
|
||||
|
||||
If BoxID = 173372 Then
|
||||
Var SpiralOnline = "true"
|
||||
DEBUGVAR EnableMultiInstanceFromBoxID
|
||||
|
||||
Var InternationalShow = 1
|
||||
If MAT_ID_2301 = "Enable" Then
|
||||
If EnableMultiInstanceFromBoxID = 0 Then
|
||||
|
||||
If CountUpForRestartApp = "" Then
|
||||
Var CountUpForRestartApp = 0
|
||||
EndIf
|
||||
DEBUGVAR CountUpForRestartApp
|
||||
Var CountUpForRestartApp = CountUpForRestartApp + 1
|
||||
|
||||
If CountUpForRestartApp > 1 Then
|
||||
WRITE_FILE "/mnt/sdcard/enable_ui_v3" "true"
|
||||
FINISH
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If EnableMultiInstanceFromBoxID = 1 Then
|
||||
|
|
@ -1387,7 +1406,7 @@
|
|||
Var InternationalShow = 0
|
||||
|
||||
Var CatalogLayoutV3 = 1
|
||||
|
||||
|
||||
|
||||
If BoxID = 123456 Then
|
||||
Var SpiralOnline = "true"
|
||||
|
|
@ -1395,7 +1414,7 @@
|
|||
Var InternationalShow = 0
|
||||
EndIf
|
||||
|
||||
If BoxID = 201193 Then
|
||||
If BoxID = 201729 Then
|
||||
Var InternationalShow = 1
|
||||
EndIf
|
||||
|
||||
|
|
@ -1475,6 +1494,71 @@
|
|||
|
||||
|
||||
EndIf
|
||||
|
||||
If CountryName = "Australia" Then
|
||||
; enable helper
|
||||
Var EnableHelperShow = 0
|
||||
;Var FromDrinkOk = 1
|
||||
RootLayoutVisible 3 "hide"
|
||||
|
||||
Var EnableMultiInstance = "true"
|
||||
Var InternationalShow = 0
|
||||
Var CatalogLayoutV3 = 1
|
||||
|
||||
Var New_Payment = 1
|
||||
Var InternationalEnable = 1
|
||||
DEBUGVAR InternationalEnable
|
||||
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"
|
||||
|
||||
;specified to unittest4
|
||||
Var CountryRootPath = "ROOT/taobin_project/inter/aus/"
|
||||
Var CountryShortName = "aus"
|
||||
|
||||
Var WebAppShow = "Invisible"
|
||||
|
||||
Var LanguageShow = "ENG"
|
||||
EnableLanguage "ENG"
|
||||
|
||||
Var RedirectToNormalVersion = 1
|
||||
|
||||
SetLanguage "ENG"
|
||||
LanguageControl "UpdateList" "-"
|
||||
Var show_eng = "true"
|
||||
|
||||
;Var ShowNetworkProblemText = "Network error. Payment Cash only."
|
||||
|
||||
Var TextPriceMenuSize = 12
|
||||
Var TextPriceMenuY = 266
|
||||
Var TextPriceMenuBlendX = 180
|
||||
Var TextPriceMenuHotX = 48
|
||||
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Var ButtontoTopupMenu = "Enable"
|
||||
Var CurrentPageShowError = 0
|
||||
|
||||
|
||||
Var PriceUnitText = ""
|
||||
|
||||
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
|
||||
|
||||
Var XButtonMember = 212
|
||||
Var YButtonMember = 1695
|
||||
|
||||
If Not#LanguageLoaded = "" Then
|
||||
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/aus/menu/lang.tsv"
|
||||
EndIf
|
||||
|
||||
Var cups_sold_text = "Cups Sold Worldwide"
|
||||
|
||||
Var MinPhoneNumber = 10
|
||||
Var MaxPhoneNumber = 10
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR InternationalEnable
|
||||
|
|
@ -1498,6 +1582,10 @@
|
|||
DEBUGVAR OpenFileXML
|
||||
TRY OpenFileXML
|
||||
|
||||
If CountryName = "Thailand" Then
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Var LanguageObjectShow = "Invisible"
|
||||
Var NoLangObjectShow = "Enable"
|
||||
|
|
@ -1580,21 +1668,13 @@
|
|||
Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
|
||||
EndIf
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
If CheckCupStateDoorCupClose = "done" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
If CountryName = "HongKong" Then
|
||||
Var bnRemoveCup = CountryRootPath + "/image/main_page/bn_remove_cup.png"
|
||||
Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If IgnoreProfileFromRunEV = "" Then
|
||||
Var IgnoreProfileFromRunEV = 0
|
||||
EndIf
|
||||
|
|
@ -1753,10 +1833,14 @@
|
|||
|
||||
OpenInst 2 PepsiFullScreenPageBoard
|
||||
EndIf
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
; tap screen for press popup when app hang
|
||||
TapScreen 860 1004
|
||||
|
||||
Else
|
||||
; tap screen for press popup when app hang
|
||||
TapScreen 860 1004
|
||||
EndIf
|
||||
|
||||
Var buttonRemoveCupOnArm = "Invisible"
|
||||
Var CountDownFailErrorHappendClear = 8
|
||||
</EventOpen>
|
||||
|
||||
|
|
@ -1906,17 +1990,17 @@ PRICE "Reset" "-"
|
|||
</EventUnitTest7>
|
||||
|
||||
<EventUnitTest8>
|
||||
Var buttonRemoveCup = "Enable"
|
||||
DEBUGVAR buttonRemoveCup
|
||||
Var buttonRemoveCupOnArm = "Enable"
|
||||
DEBUGVAR buttonRemoveCupOnArm
|
||||
DEBUGVAR bnRemoveCup
|
||||
DEBUGVAR bpRemoveCup
|
||||
|
||||
</EventUnitTest8>
|
||||
|
||||
<EventUnitTest9>
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var buttonRemoveCupOnArm = "Enable"
|
||||
Var UseVeryBigRemoveCupButton = "Enable"
|
||||
DEBUGVAR buttonRemoveCup
|
||||
DEBUGVAR buttonRemoveCupOnArm
|
||||
|
||||
|
||||
</EventUnitTest9>
|
||||
|
|
@ -1941,12 +2025,16 @@ PRICE "Reset" "-"
|
|||
EndIf
|
||||
|
||||
DEBUGVAR FailErrorHappend
|
||||
|
||||
|
||||
If FailErrorHappend = 1 Then
|
||||
If CountDownFailErrorHappendClear > 0 Then
|
||||
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
|
||||
If CountDownFailErrorHappendClear = 1 Then
|
||||
__CMD "error-code-clear-all" "-" "-" "-"
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
Else
|
||||
If CountDownFailErrorHappendClear > 0 Then
|
||||
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
|
||||
If CountDownFailErrorHappendClear = 1 Then
|
||||
__CMD "error-code-clear-all" "-" "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -2083,7 +2171,7 @@ PRICE "Reset" "-"
|
|||
|
||||
If TaobinOnlineX = "true" Then
|
||||
|
||||
|
||||
|
||||
|
||||
If CountDownShowButton = 31 Then
|
||||
Var ShowButtonClickFull = "Enable"
|
||||
|
|
@ -2186,7 +2274,7 @@ PRICE "Reset" "-"
|
|||
|
||||
TopView "show"
|
||||
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
|
||||
|
|
@ -2210,7 +2298,7 @@ PRICE "Reset" "-"
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -2305,23 +2393,7 @@ PRICE "Reset" "-"
|
|||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
If CheckCupStateDoorCupClose = "done" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
|
||||
|
||||
|
||||
|
||||
|
|
@ -2634,9 +2706,9 @@ PRICE "Reset" "-"
|
|||
Var NextPage = "-"
|
||||
Var BaseOnPageBoard = 0
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
|
||||
;inter-xml-open BEGIN
|
||||
|
||||
|
||||
If SpiralOnline = "true" Then
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
|
|
@ -2673,7 +2745,7 @@ PRICE "Reset" "-"
|
|||
<Button>
|
||||
<X> btnRemoveCupX </X>
|
||||
<Y> btnRemoveCupY </Y>
|
||||
<State> buttonRemoveCup </State>
|
||||
<State> buttonRemoveCupOnArm </State>
|
||||
;<Color> "0x00BDFF" </Color>
|
||||
<Interval> 500 </Interval>
|
||||
<Filename> bnRemoveCup </Filename>
|
||||
|
|
@ -2683,7 +2755,8 @@ PRICE "Reset" "-"
|
|||
Machine DoorLidOpen
|
||||
|
||||
Var CheckCupStateDoorCupClose = "reset"
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Var buttonRemoveCupOnArm = "Invisible"
|
||||
RefreshAll
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -2823,4 +2896,6 @@ PRICE "Reset" "-"
|
|||
</Text>
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/inc/remove_cup_tag_on_arm.inc"
|
||||
|
||||
</Page>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue