Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
e77d24726d
413 changed files with 157624 additions and 52927 deletions
|
|
@ -195,7 +195,11 @@
|
|||
CacheVarStr "put" SpiralOnline
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If FrontDoorVersionInt = "" Then
|
||||
__CMD "mcu-version" "-" "-" "-"
|
||||
EndIf
|
||||
|
||||
If BoxID = 105005 Then
|
||||
Var XMLProfile = "Plus5AndInclude20Percent-taobin_notopup-taobin_nopro-taobin_notopping"
|
||||
Var XMLProfile = "DiscountFromBO-MachineShedule"
|
||||
|
|
@ -1147,7 +1151,7 @@
|
|||
Var LanguageShow = "MTC"
|
||||
SetLanguage "MTC"
|
||||
LanguageControl "UpdateList" "-"
|
||||
|
||||
|
||||
Var InternationalEnable = 1
|
||||
Var show_eng = "true"
|
||||
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
|
||||
|
|
@ -1863,6 +1867,15 @@
|
|||
|
||||
Var buttonRemoveCupOnArm = "Invisible"
|
||||
Var CountDownFailErrorHappendClear = 8
|
||||
|
||||
If FrontDoorVersionInt > 19999 Then
|
||||
LEDv2 LedV4All On 100 20 0 255 10
|
||||
SAVELOG "LEDv4.SlowBrinkVertical"
|
||||
|
||||
; turn-off-horizontal
|
||||
TRY "ROOT/taobin_project/xml/process/temp_ledv4_offall_horizontal.ev"
|
||||
EndIf
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
@ -2640,9 +2653,19 @@ PRICE "Reset" "-"
|
|||
EndIf
|
||||
Else
|
||||
If InternationalEnable = 1 Then
|
||||
|
||||
If FrontDoorVersionInt > 19999 Then
|
||||
TRY "ROOT/taobin_project/xml/process/temp_ledv4_blinkall_horizontal.ev"
|
||||
EndIf
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
|
||||
Else
|
||||
|
||||
If FrontDoorVersionInt > 19999 Then
|
||||
TRY "ROOT/taobin_project/xml/process/temp_ledv4_blinkall_horizontal.ev"
|
||||
EndIf
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
||||
|
|
@ -2747,9 +2770,17 @@ PRICE "Reset" "-"
|
|||
EndIf
|
||||
Else
|
||||
If InternationalEnable = 1 Then
|
||||
If FrontDoorVersionInt > 19999 Then
|
||||
TRY "ROOT/taobin_project/xml/process/temp_ledv4_blinkall_horizontal.ev"
|
||||
EndIf
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
|
||||
Else
|
||||
If FrontDoorVersionInt > 19999 Then
|
||||
TRY "ROOT/taobin_project/xml/process/temp_ledv4_blinkall_horizontal.ev"
|
||||
EndIf
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue