Merge branch 'masterpiece' into sgp_blue
This commit is contained in:
Pakin
commit
d5ca231b2d
142 changed files with 23999 additions and 26660 deletions
|
|
@ -1,117 +1,117 @@
|
|||
; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
|
||||
If HaveCup = "false" Then
|
||||
If MachineStage = "show-menu" Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
If HaveCup = "false" Then
|
||||
If MachineStage = "show-menu" Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
Var TimeoutForProtectButtonHideLongTime = TimeoutForProtectButtonHideLongTime + 1
|
||||
If TimeoutForProtectButtonHideLongTime > 120 Then
|
||||
Var TimeoutForProtectButtonHideLongTime = 0
|
||||
EndIf
|
||||
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var TimeoutForProtectButtonHideLongTime = TimeoutForProtectButtonHideLongTime + 1
|
||||
If TimeoutForProtectButtonHideLongTime > 120 Then
|
||||
Var TimeoutForProtectButtonHideLongTime = 0
|
||||
|
||||
Else
|
||||
If DoorCupPosition = "bottom" Then
|
||||
SAVELOG "Check Cup all from Long time button hide"
|
||||
Machine CheckCupAll
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
|
||||
Else
|
||||
If DoorCupPosition = "bottom" Then
|
||||
SAVELOG "Check Cup all from Long time button hide"
|
||||
Machine CheckCupAll
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
If show_eng = "true" Then
|
||||
|
||||
Else
|
||||
If Timeout = 14 Then
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
If CupChecking = "false" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If Timeout = 14 Then
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
If CupChecking = "false" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
If Timeout > 15 Then
|
||||
Var Timeout = 0
|
||||
If Timeout > 15 Then
|
||||
Var Timeout = 0
|
||||
|
||||
DEBUGVAR HaveCup
|
||||
DEBUGVAR CupOnArm
|
||||
DEBUGVAR DoorCupPosition
|
||||
DEBUGVAR CupChecking
|
||||
DEBUGVAR CupArmMove
|
||||
DEBUGVAR buttonRemoveCup
|
||||
EndIf
|
||||
DEBUGVAR HaveCup
|
||||
DEBUGVAR CupOnArm
|
||||
DEBUGVAR DoorCupPosition
|
||||
DEBUGVAR CupChecking
|
||||
DEBUGVAR CupArmMove
|
||||
DEBUGVAR buttonRemoveCup
|
||||
EndIf
|
||||
|
||||
Var TimeoutInstance0 = TimeoutInstance0 + 1
|
||||
Var TimeoutInstance0 = TimeoutInstance0 + 1
|
||||
|
||||
If TimeoutInstance0 > 600 Then
|
||||
Var TimeoutInstance0 = 0
|
||||
SAVELOG "Check Cup all"
|
||||
Machine CheckCupAll
|
||||
EndIf
|
||||
If TimeoutInstance0 > 600 Then
|
||||
Var TimeoutInstance0 = 0
|
||||
SAVELOG "Check Cup all"
|
||||
Machine CheckCupAll
|
||||
EndIf
|
||||
|
||||
; Logic have differrent drinkfail3.xml
|
||||
; protect lock
|
||||
;
|
||||
; Logic have differrent drinkfail3.xml
|
||||
; protect lock
|
||||
;
|
||||
|
||||
If CheckCupStateDoorCupCloseCnt > 0 Then
|
||||
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
|
||||
DEBUGVAR CheckCupStateDoorCupCloseCnt
|
||||
If CheckCupStateDoorCupCloseCnt > 0 Then
|
||||
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
|
||||
DEBUGVAR CheckCupStateDoorCupCloseCnt
|
||||
|
||||
If CheckCupStateDoorCupCloseCnt = 0 Then
|
||||
Var CheckCupStateDoorCupClose = ""
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
If HaveCup = "true" Then
|
||||
If CheckCupStateDoorCupCloseCnt = 0 Then
|
||||
Var CheckCupStateDoorCupClose = ""
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
If HaveCup = "true" Then
|
||||
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
|
||||
Else
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Var CoundUpDelayCertainStage = 0
|
||||
EndIf
|
||||
|
||||
If CupArmMove = "true" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = "Please wait."
|
||||
Else
|
||||
Var MachineErrorDetailAll = "กรุณารอสักครู่"
|
||||
EndIf
|
||||
Else
|
||||
If CupArmMove = "false" Then
|
||||
If HaveCup = "true" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If buttonRemoveCup = "Invisible" Then
|
||||
Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1
|
||||
If CoundUpDelayCertainStage > 8 Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Var CoundUpDelayCertainStage = 0
|
||||
EndIf
|
||||
|
||||
If CupArmMove = "true" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = "Please wait."
|
||||
Else
|
||||
Var MachineErrorDetailAll = "กรุณารอสักครู่"
|
||||
EndIf
|
||||
Else
|
||||
If CupArmMove = "false" Then
|
||||
If HaveCup = "true" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If buttonRemoveCup = "Invisible" Then
|
||||
Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1
|
||||
If CoundUpDelayCertainStage > 8 Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
|
||||
Topping "Select" Seeker.selected_a_drink
|
||||
Topping "Select" Seeker.selected_a_drink
|
||||
|
||||
; Set option toppinng and pack
|
||||
Topping "Select1-ID" Seeker.topping1
|
||||
Topping "Select2-ID" Seeker.topping2
|
||||
Topping "Select3-ID" Seeker.topping3
|
||||
; Set option toppinng and pack
|
||||
Topping "Select1-ID" Seeker.topping1
|
||||
Topping "Select2-ID" Seeker.topping2
|
||||
Topping "Select3-ID" Seeker.topping3
|
||||
|
||||
Topping "Select6-ID" Seeker.topping6
|
||||
Topping "Select6-ID" Seeker.topping6
|
||||
|
||||
Topping "Select7-ID" Seeker.topping7
|
||||
Topping "Select8-ID" Seeker.topping8
|
||||
Topping "Select9-ID" Seeker.topping9
|
||||
Topping "Select10-ID" Seeker.topping10
|
||||
Topping "Select7-ID" Seeker.topping7
|
||||
Topping "Select8-ID" Seeker.topping8
|
||||
Topping "Select9-ID" Seeker.topping9
|
||||
Topping "Select10-ID" Seeker.topping10
|
||||
|
||||
Topping "PostTopping1-ID" Seeker.PostTopping1
|
||||
; Pack
|
||||
Topping "Pack" ExtendDataCurr
|
||||
|
||||
Topping "PostTopping1-ID" Seeker.PostTopping1
|
||||
; Pack
|
||||
Topping "Pack" ExtendDataCurr
|
||||
|
||||
|
||||
|
||||
|
|
@ -9,8 +9,8 @@
|
|||
READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_0" CurrPageInst0
|
||||
|
||||
If showMultiAds = "true" Then
|
||||
|
||||
|
||||
|
||||
|
||||
If PreviousFileName = "" Then
|
||||
Var PreviousFileName = PreviseXMLFileName2
|
||||
EndIf
|
||||
|
|
@ -41,9 +41,12 @@
|
|||
DEBUGVAR CountDownPauseVideo2
|
||||
If CountryName = "Singapore" Then
|
||||
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
|
||||
|
||||
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -56,7 +59,10 @@
|
|||
EndIf
|
||||
If CurrentXMLFileName2 = "" Then
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -64,7 +70,7 @@
|
|||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Else
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
|
|
@ -82,12 +88,15 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Else
|
||||
DEBUGVAR a_video_menu[ads_idx]
|
||||
If CountryName = "Singapore" Then
|
||||
|
|
@ -133,7 +142,10 @@
|
|||
If CurrentXMLFileName2 = "" Then
|
||||
DEBUGVAR CountDownPauseVideo2
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -147,7 +159,7 @@
|
|||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If CountryName = "Malaysia" Then
|
||||
|
||||
|
|
@ -161,6 +173,9 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
|
||||
EndIf
|
||||
|
|
@ -177,13 +192,13 @@
|
|||
<EventVideoEnd>
|
||||
DEBUGVAR CurrentXMLFileName2
|
||||
Var video_end = "Video end"
|
||||
DEBUGVAR video_end
|
||||
DEBUGVAR video_end
|
||||
If CountDownPauseVideo2 = -1 Then
|
||||
Var CountDownPauseVideo2 = 0
|
||||
EndIf
|
||||
If showMultiAds = "true" Then
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Var ads_idx = ads_idx + 1
|
||||
|
|
@ -201,7 +216,10 @@
|
|||
DEBUGVAR CurrentXMLFileName2
|
||||
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -214,7 +232,10 @@
|
|||
EndIf
|
||||
If CurrentXMLFileName2 = "" Then
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -224,7 +245,7 @@
|
|||
EndIf
|
||||
Else
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Malaysia" Then
|
||||
|
|
@ -239,18 +260,24 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Else
|
||||
DEBUGVAR a_video_menu[ads_idx]
|
||||
If CountryName = "Singapore" Then
|
||||
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
|
||||
If CountDownPauseVideo2 < 1 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -263,7 +290,10 @@
|
|||
EndIf
|
||||
If CurrentXMLFileName2 = "" Then
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -293,6 +323,10 @@
|
|||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
|
||||
If ProYuzu250Enable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
|
||||
If UseSlideShowVideo = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue