Merge origin/masterpiece into smoothie_tbp
This commit is contained in:
commit
678a79ae83
80 changed files with 10192 additions and 14079 deletions
|
|
@ -1,4 +1,4 @@
|
|||
Var NextPage = "-"
|
||||
|
||||
|
||||
DEBUGVAR ICE_PROCESS_STATUS
|
||||
DEBUGVAR ICE_PROCESS_TXT
|
||||
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
DEBUGVAR LanguageShow
|
||||
DEBUGVAR CountryName
|
||||
|
||||
|
||||
;inter-image
|
||||
If LanguageShow = "ENG" Then
|
||||
If LanguageShow = "ENG" Then
|
||||
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
|
||||
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
|
||||
Var DirImage = "ROOT/taobin_project/image/page3_en"
|
||||
Var ice_tab_text = "Ice will be ready at "
|
||||
|
||||
InstanceSetString "ShowEng"
|
||||
|
||||
|
||||
EndIf
|
||||
If LanguageShow = "THAI" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
|
||||
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
|
||||
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
InstanceSetString "ShowThai"
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
|
||||
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
|
||||
Var ice_tab_text = "ရေခဲပြင်မှာ ထားမယ်။ "
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
InstanceSetString "ShowMYANMAR"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MSC" Then
|
||||
If LanguageShow = "MSC" Then
|
||||
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
|
||||
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
|
||||
Var DirImage = "ROOT/taobin_project/image/page3_en"
|
||||
|
|
@ -48,14 +48,14 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/page3_en"
|
||||
Var ice_tab_text = "Ice will be ready at "
|
||||
EndIf
|
||||
|
||||
|
||||
If CountryName = "Australia" Then
|
||||
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
|
||||
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
|
||||
Var DirImage = "ROOT/taobin_project/image/page3_en"
|
||||
Var ice_tab_text = "Ice will be ready at "
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If ICE_PROCESS_STATUS = 2 Then
|
||||
Var ice_tab_process_show = "Enable"
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
Var Menu2Selected2 = "Invisible"
|
||||
Var Menu3Selected2 = "Invisible"
|
||||
Var Menu4Selected2 = "Invisible"
|
||||
|
||||
|
||||
Var Menu6Selected2 = "Invisible"
|
||||
Var Menu7Selected2 = "Invisible"
|
||||
Var MenuVSelected2 = "Invisible"
|
||||
|
|
@ -92,8 +92,8 @@
|
|||
Else
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -111,32 +111,32 @@
|
|||
; 8 cocktail
|
||||
Var Menu8Selected = "Invisible"
|
||||
|
||||
If CocktailShow = "true" Then
|
||||
If CocktailShow = "true" Then
|
||||
Var Menu7Selected = "Invisible"
|
||||
;Var Menu8Selected = "Enable"
|
||||
Var Menu8Selected = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
Var Menu21Selected = "Invisible"
|
||||
Var Menu11Selected = "Enable"
|
||||
Var Menu21Selected = "Invisible"
|
||||
Var Menu7Selected = "Invisible"
|
||||
Else
|
||||
If MenuKidEnable = "true" Then
|
||||
Var Menu11Selected = "Invisible"
|
||||
Var Menu11Selected = "Invisible"
|
||||
Var Menu21Selected = "Enable"
|
||||
Var Menu7Selected = "Invisible"
|
||||
Else
|
||||
Var Menu11Selected = "Invisible"
|
||||
Var Menu21Selected = "Invisible"
|
||||
Var Menu21Selected = "Invisible"
|
||||
Var Menu7Selected = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CocktailShow = "true" Then
|
||||
Var Menu7Selected = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var Menu22Selected = "Enable"
|
||||
;
|
||||
|
|
@ -145,8 +145,8 @@
|
|||
DEBUGVAR SpiralOnline
|
||||
DEBUGVAR SpiralModeGoods
|
||||
DEBUGVAR SpiralModeFrozenFruit
|
||||
|
||||
If SpiralOnline = "true" Then
|
||||
|
||||
If SpiralOnline = "true" Then
|
||||
If Seeker = "curr" Then
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
Var Menu0Selected = "Enable"
|
||||
Var MenuVSelected2 = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
If SpiralModeGoods = 1 Then
|
||||
Var MenuVSelected2 = "Enable"
|
||||
EndIf
|
||||
|
|
@ -178,7 +178,4 @@
|
|||
EndIf
|
||||
|
||||
DEBUGVAR MenuVSelected2
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
|
||||
Var Seeker.thankLidFlag = 0
|
||||
Var Seeker.thankStrawFlag = 0
|
||||
Var Seeker.SmoothieToPayment = 0
|
||||
|
||||
WEB "DISABLE"
|
||||
|
||||
|
|
@ -74,9 +75,9 @@
|
|||
DEBUGVAR MAT_ID_2301
|
||||
Var SpiralModeFrozenFruit = 0
|
||||
Var SpiralModeGoods = 0
|
||||
|
||||
|
||||
Var ButtonFrozenSmoothie = "Invisible"
|
||||
|
||||
|
||||
If SpiralOnline = "true" Then
|
||||
|
||||
If MAT_ID_2301 = "Enable" Then
|
||||
|
|
@ -209,6 +210,8 @@
|
|||
|
||||
EndIf
|
||||
|
||||
Var Seeker.SmoothieToPayment = 0
|
||||
|
||||
|
||||
Var menu_name_eng_hot = ""
|
||||
Var menu_desc_eng_hot = ""
|
||||
|
|
@ -270,12 +273,12 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
DEBUGVAR SpiralOnline
|
||||
|
||||
RootLayoutVisible 13 "hide"
|
||||
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -297,21 +300,24 @@
|
|||
EndIf
|
||||
|
||||
|
||||
|
||||
; zone cup on arm
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
If CheckCupStateDoorCupClose = "done" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
If Seeker = "curr" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
; zone cup on arm
|
||||
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
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -329,10 +335,10 @@
|
|||
Var Inst9MenuLoaded = "done"
|
||||
Var Inst10MenuLoaded = "done"
|
||||
Var Inst11MenuLoaded = "done"
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If MultiProcess = "Enable" Then
|
||||
If SelectedMenu = "coffee" Then
|
||||
Var MultiProcessTimer = MultiProcessTimer + 1
|
||||
|
|
@ -602,7 +608,7 @@
|
|||
If SpiralModeFrozenFruit = 1 Then
|
||||
Var ColumnOverride[0] = 3
|
||||
EndIf
|
||||
|
||||
|
||||
If SpiralModeGoods = 1 Then
|
||||
Var ColumnOverride[0] = 3
|
||||
EndIf
|
||||
|
|
@ -612,10 +618,10 @@
|
|||
Var MenuKidButtonState = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Var ColumnOverride[1] = 3
|
||||
Var ColumnOverride[2] = 3
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
EndIf
|
||||
|
||||
DEBUGVAR Menu0Selected
|
||||
|
||||
DEBUGVAR NextPage
|
||||
</EventOpen>
|
||||
<Timeout> 10000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
;<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
|
||||
; soda and other
|
||||
Var Menu1Selected = "PressForever"
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
Var RecommendTimeOut = 0
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
|
||||
|
||||
SetInstanceIgnoreTouch
|
||||
|
||||
|
||||
|
|
@ -25,11 +25,9 @@
|
|||
DEBUGVAR SlientRefreshIndex
|
||||
|
||||
TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
|
||||
|
||||
|
||||
RefreshAll
|
||||
|
||||
|
||||
DEBUGVAR NextPage
|
||||
</EventOpen>
|
||||
|
||||
<EventOnShow>
|
||||
|
|
@ -41,17 +39,17 @@
|
|||
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
|
||||
|
||||
|
||||
|
||||
GetVisible inst_show_exclude_group
|
||||
|
||||
|
||||
If inst_show_exclude_group_counter = "" Then
|
||||
Var inst_show_exclude_group_counter = 45
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If inst_show_exclude_group = 1 Then
|
||||
If inst_show_exclude_group_counter > 0 Then
|
||||
|
||||
|
||||
Var inst_show_exclude_group_counter = inst_show_exclude_group_counter - 1
|
||||
|
||||
If inst_show_exclude_group_counter = 0 Then
|
||||
|
|
@ -61,7 +59,26 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If NextPage = "-" Then
|
||||
|
||||
Else
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
If RecommendTimeOut > 9 Then
|
||||
SAVELOG "COA9"
|
||||
Var NextPage = "-"
|
||||
Open NextPage
|
||||
EndIf
|
||||
Else
|
||||
If RecommendTimeOut > 30 Then
|
||||
SAVELOG "COA30"
|
||||
Var NextPage = "-"
|
||||
Open NextPage
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Var RecommendTimeOut = RecommendTimeOut + 1
|
||||
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
||||
|
|
|
|||
|
|
@ -126,24 +126,7 @@
|
|||
<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
|
||||
</Configuration>
|
||||
<Menus>
|
||||
<Banner>
|
||||
<State> BoostEnergyProState </State>
|
||||
<Type> IMAGE </Type>
|
||||
<Media>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/boost_energy/boost_energy.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/boost_energy/boost_energy.png"
|
||||
EndIf
|
||||
)
|
||||
</Media>
|
||||
<EventOnClick>
|
||||
RootLayoutVisible 10 "hide"
|
||||
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_boost_energy.lxml"
|
||||
</EventOnClick>
|
||||
</Banner>
|
||||
|
||||
|
||||
; ==================> Len = 3
|
||||
; - 12-05-02-0133 -
|
||||
<Menu>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
;<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
|
||||
; soda and other
|
||||
Var Menu1Selected = "PressForever"
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
Var RecommendTimeOut = 0
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
|
||||
|
||||
SetInstanceIgnoreTouch
|
||||
|
||||
|
||||
|
|
@ -25,11 +25,9 @@
|
|||
DEBUGVAR SlientRefreshIndex
|
||||
|
||||
TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
|
||||
|
||||
|
||||
RefreshAll
|
||||
|
||||
|
||||
DEBUGVAR NextPage
|
||||
</EventOpen>
|
||||
|
||||
<EventOnShow>
|
||||
|
|
@ -41,17 +39,17 @@
|
|||
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
|
||||
|
||||
|
||||
|
||||
GetVisible inst_show_exclude_group
|
||||
|
||||
|
||||
If inst_show_exclude_group_counter = "" Then
|
||||
Var inst_show_exclude_group_counter = 45
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If inst_show_exclude_group = 1 Then
|
||||
If inst_show_exclude_group_counter > 0 Then
|
||||
|
||||
|
||||
Var inst_show_exclude_group_counter = inst_show_exclude_group_counter - 1
|
||||
|
||||
If inst_show_exclude_group_counter = 0 Then
|
||||
|
|
@ -61,7 +59,26 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If NextPage = "-" Then
|
||||
|
||||
Else
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
If RecommendTimeOut > 9 Then
|
||||
SAVELOG "COA9"
|
||||
Var NextPage = "-"
|
||||
Open NextPage
|
||||
EndIf
|
||||
Else
|
||||
If RecommendTimeOut > 30 Then
|
||||
SAVELOG "COA30"
|
||||
Var NextPage = "-"
|
||||
Open NextPage
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Var RecommendTimeOut = RecommendTimeOut + 1
|
||||
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?hurr
|
||||
#include=menu_head.py
|
||||
<?hurr
|
||||
#include=menu_head.py
|
||||
?>
|
||||
; this file for generate from page_catalog_group_recommend.skt
|
||||
<Popup>
|
||||
|
|
@ -9,14 +9,14 @@
|
|||
;<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
|
||||
; soda and other
|
||||
Var Menu1Selected = "PressForever"
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
Var RecommendTimeOut = 0
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
|
||||
|
||||
SetInstanceIgnoreTouch
|
||||
|
||||
|
||||
|
|
@ -27,11 +27,9 @@
|
|||
DEBUGVAR SlientRefreshIndex
|
||||
|
||||
TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
|
||||
|
||||
|
||||
RefreshAll
|
||||
|
||||
|
||||
DEBUGVAR NextPage
|
||||
</EventOpen>
|
||||
|
||||
<EventOnShow>
|
||||
|
|
@ -43,17 +41,17 @@
|
|||
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
|
||||
|
||||
|
||||
|
||||
GetVisible inst_show_exclude_group
|
||||
|
||||
|
||||
If inst_show_exclude_group_counter = "" Then
|
||||
Var inst_show_exclude_group_counter = 45
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If inst_show_exclude_group = 1 Then
|
||||
If inst_show_exclude_group_counter > 0 Then
|
||||
|
||||
|
||||
Var inst_show_exclude_group_counter = inst_show_exclude_group_counter - 1
|
||||
|
||||
If inst_show_exclude_group_counter = 0 Then
|
||||
|
|
@ -63,7 +61,26 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If NextPage = "-" Then
|
||||
|
||||
Else
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
If RecommendTimeOut > 9 Then
|
||||
SAVELOG "COA9"
|
||||
Var NextPage = "-"
|
||||
Open NextPage
|
||||
EndIf
|
||||
Else
|
||||
If RecommendTimeOut > 30 Then
|
||||
SAVELOG "COA30"
|
||||
Var NextPage = "-"
|
||||
Open NextPage
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Var RecommendTimeOut = RecommendTimeOut + 1
|
||||
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
||||
|
|
@ -71,7 +88,7 @@
|
|||
|
||||
|
||||
|
||||
<?hurr
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen_v3.py
|
||||
?>
|
||||
|
||||
|
|
|
|||
|
|
@ -28,11 +28,10 @@
|
|||
|
||||
Var OverrideVideoThankyou = 1
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
DEBUGVAR TimeOutSmoothiesProcess
|
||||
;SAVELOG SoundPlaying
|
||||
|
||||
If TimeOutSmoothiesProcess > 0 Then
|
||||
|
|
@ -43,6 +42,15 @@
|
|||
If TimeOutSmoothiesProcess = 0 Then
|
||||
Var OverrideVideoThankyou = 1
|
||||
|
||||
Var SelectDrink = Seeker.selected_a_drink
|
||||
Var SelectSugarID = ""
|
||||
|
||||
SAVELOG "============================= Select ======================================="
|
||||
|
||||
Machine StrawOrder
|
||||
|
||||
Topping "Select" SelectDrink
|
||||
SAVELOG "============================= MakeDrinkV1 ======================================="
|
||||
MakeDrinkV1 SelectDrink SelectSugarID
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
|
||||
SAVELOG "======================================= page_smoothie_suggest_and_process.xml ================================"
|
||||
SAVELOG "======================================= page_smoothie_suggest_and_process.xml == Version 1.02 =============================="
|
||||
; On open
|
||||
|
||||
TopView "show"
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
Var TextDoorButtonID = 001202
|
||||
|
||||
Var SmoothieProcessState = "idle"
|
||||
Var CountDownCertainConfuse = 5
|
||||
Var CountDownCertainConfuse = 2
|
||||
|
||||
Var ArmIDForMakeOrder = 0
|
||||
|
||||
|
|
@ -102,6 +102,7 @@
|
|||
DEBUGVAR ArmIDForMakeOrder
|
||||
__CMD "ui-load-playlist" 0 SelectDrink "-"
|
||||
|
||||
Var CountDownCupStageRunningTimeout = 15
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -165,7 +166,9 @@
|
|||
Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If TimeOutSmoothiesProcess = 2 Then
|
||||
Machine DoorClose
|
||||
EndIf
|
||||
If TimeOutSmoothiesProcess = 0 Then
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_3.xml"
|
||||
EndIf
|
||||
|
|
@ -177,15 +180,14 @@
|
|||
DEBUGVAR CH9994_Status
|
||||
|
||||
DEBUGVAR HaveCup
|
||||
DEBUGVAR CupOnArm
|
||||
DEBUGVAR CountDownCupStageRunningTimeout
|
||||
DEBUGVAR DoorCupPosition
|
||||
DEBUGVAR CupChecking
|
||||
DEBUGVAR CupArmMove
|
||||
DEBUGVAR buttonRemoveCup
|
||||
DEBUGVAR SmoothieProcessState
|
||||
DEBUGVAR AnyArmConfuse
|
||||
DEBUGVAR SensorDoorCupStatus
|
||||
DEBUGVAR ArmIDForMakeOrder
|
||||
DEBUGVAR CountDownCertainConfuse
|
||||
|
||||
If ArmIDForMakeOrder = 2 Then
|
||||
Var ChannelArmForProccessStatus = CH9992_Status
|
||||
|
|
@ -207,7 +209,8 @@
|
|||
Else
|
||||
If SmoothieProcessState = "insert" Then
|
||||
Var TextDoorButtonID = 001203
|
||||
|
||||
Machine CheckCupCurrentProcess
|
||||
Var SmoothieProcessState = "checking"
|
||||
Else
|
||||
|
||||
EndIf
|
||||
|
|
@ -237,6 +240,11 @@
|
|||
|
||||
|
||||
If AnyArmConfuse = 1 Then
|
||||
If CountDownCertainConfuse = 0 Then
|
||||
SAVELOG " CountDownCertainConfuse CountDownCertainConfuse "
|
||||
Var CountDownCertainConfuse = 10
|
||||
EndIf
|
||||
|
||||
If CountDownCertainConfuse > 0 Then
|
||||
Var CountDownCertainConfuse = CountDownCertainConfuse - 1
|
||||
|
||||
|
|
@ -245,9 +253,23 @@
|
|||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SmoothieProcessState = "checking" Then
|
||||
|
||||
If CountDownCupStageRunningTimeout > 0 Then
|
||||
|
||||
Var CountDownCupStageRunningTimeout = CountDownCupStageRunningTimeout - 1
|
||||
|
||||
EndIf
|
||||
If CountDownCupStageRunningTimeout = 0 Then
|
||||
Var SmoothieProcessState = "idle"
|
||||
Var TextDoorButtonID = 001202
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If ChannelArmForProccessStatus = "RUNNING" Then
|
||||
|
||||
Var SmoothieProcessState = "blendnow"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -255,13 +277,7 @@
|
|||
If SmoothieProcessState = "blendnow" Then
|
||||
Var TextDoorButtonID = 001206
|
||||
|
||||
Var SelectDrink = Seeker.selected_a_drink
|
||||
Var SelectSugarID = ""
|
||||
|
||||
Machine StrawOrder
|
||||
|
||||
|
||||
Topping "Select" SelectDrink
|
||||
|
||||
Var SmoothieProcessState = "blending"
|
||||
|
||||
|
|
@ -283,10 +299,9 @@
|
|||
Refresh
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
||||
; setvarint TimeOutSmoothiesProcess 2
|
||||
;DEBUGVAR Var [ChannelArmForProccessStatus] = RUNNING
|
||||
|
||||
;include="ROOT/taobin_project/inc/video.inc"
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
|
|
@ -399,10 +414,13 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
SAVELOG " SmoothieProcessState press "
|
||||
Var SmoothieProcessState = "press"
|
||||
If DoorCupPosition = "top" Then
|
||||
|
||||
Else
|
||||
Var CountDownCupStageRunningTimeout = 15
|
||||
Var CountDownCertainConfuse = 2
|
||||
Var ArmIDForMakeOrderStr = "" + ArmIDForMakeOrder
|
||||
DEBUGVAR ArmIDForMakeOrderStr
|
||||
__CMD "UseArm" ArmIDForMakeOrderStr "-" "-"
|
||||
|
|
@ -462,11 +480,15 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
SAVELOG " Cancel order press "
|
||||
|
||||
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_2.xml"
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_2.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -511,7 +533,7 @@
|
|||
<Width> 1080 </Width>
|
||||
<Align> end </Align>
|
||||
<Color> 0xFF0000 </Color>
|
||||
<Value> "V01 "</Value>
|
||||
<Value> "V102 "</Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,66 @@
|
|||
Var SmoothieProcessState = "idle"
|
||||
Var CountDownCertainConfuse = 5
|
||||
|
||||
|
||||
; ======================== send pay =============================
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
|
||||
|
||||
Var SelectDrink = Seeker.selected_a_drink
|
||||
Var ExtendData = Seeker.ExtendData
|
||||
Var ServiceAmount2 = Seeker.ServiceAmount2
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + ExtendData
|
||||
|
||||
Var CreditReference = Seeker.CreditReferenceTmp
|
||||
Var VendingDiscount = Seeker.VendingDiscount
|
||||
Var VendingCampaign = Seeker.VendingCampaign
|
||||
Var TxReference = Seeker.TxRef1
|
||||
Var VendingOrderID = Seeker.ORDER_ID
|
||||
Var PayType = "newpay"
|
||||
|
||||
Var ServiceType = "coffee-payment"
|
||||
Var ServiceCredit = SelectDrink
|
||||
Var SuggestID = ""
|
||||
|
||||
DEBUGVAR Seeker.sprial_pay_detail
|
||||
|
||||
Var PayDetail = "2/S:0/0/|" + Seeker.sprial_pay_detail
|
||||
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
Var SessionID2 = SessionID2 + "/"
|
||||
Var SessionID2 = SessionID2 + ""
|
||||
Var SessionID2 = SessionID2 + "/"
|
||||
Var SessionID2 = SessionID2 + Seeker.VendingCode
|
||||
Var SessionID2 = SessionID2 + "/"
|
||||
Var SessionID2 = SessionID2 + SelectDrink
|
||||
Var SessionID2 = SessionID2 + "/"
|
||||
Var SessionID2 = SessionID2 + BoxID
|
||||
Var SessionID2 = SessionID2 + "/"
|
||||
Var SessionID2 = SessionID2 + "S"
|
||||
Var SessionID2 = SessionID2 + "/"
|
||||
Var SessionID2 = SessionID2 + Seeker.CodeNumber
|
||||
Var SessionID2 = SessionID2 + "/"
|
||||
|
||||
DEBUGVAR PayDetail
|
||||
DEBUGVAR Seeker.PayDetail2
|
||||
DEBUGVAR SessionID2
|
||||
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
Else
|
||||
|
||||
DEBUGVAR PayDetail
|
||||
DEBUGVAR Seeker.PayDetail2
|
||||
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
EndIf
|
||||
|
||||
; ======================== end send pay =============================
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
CRLFToSpace showdesc
|
||||
|
||||
Var MachineEvent = 0
|
||||
Var MatchineSpiralStage = "-"
|
||||
Var MachineSpiralStage = "-"
|
||||
|
||||
Var NextButtonState = "Invisible"
|
||||
|
||||
|
|
@ -147,6 +147,8 @@
|
|||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
DEBUGVAR Timeout
|
||||
DEBUGVAR LinkProductCodeAnotherMachine[0]
|
||||
DEBUGVAR MachineSpiralStage
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
|
|
@ -183,11 +185,12 @@
|
|||
EndIf
|
||||
|
||||
If MachineEvent = 1 Then
|
||||
If MatchineSpiralStage = "-" Then
|
||||
If MachineSpiralStage = "-" Then
|
||||
|
||||
Else
|
||||
If MatchineSpiralStage = "spiral-valid" Then
|
||||
If MachineSpiralStage = "spiral-valid" Then
|
||||
Function 2
|
||||
Var NextButtonState = "Enable"
|
||||
Else
|
||||
; Verify error
|
||||
DEBUGVAR MachineSpiralErrorCode
|
||||
|
|
@ -343,7 +346,7 @@
|
|||
DEBUGVAR LinkProductCodeAnotherMachine[1]
|
||||
DEBUGVAR LinkProductCodeAnotherMachine[2]
|
||||
|
||||
Var MatchineSpiralStage = "-"
|
||||
Var MachineSpiralStage = "-"
|
||||
|
||||
GenHashWithTimeStamp SpiralRef
|
||||
SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef
|
||||
|
|
@ -734,7 +737,7 @@
|
|||
|
||||
Else
|
||||
If SelectDrinkType = 1 Then
|
||||
Var SmoothieToPayment = 1
|
||||
Var Seeker.SmoothieToPayment = 1
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment.xml"
|
||||
EndIf
|
||||
|
|
@ -1085,7 +1088,6 @@
|
|||
|
||||
|
||||
Var Timeout = 0
|
||||
Var NextButtonState = "Enable"
|
||||
|
||||
RefreshAll
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue