pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Fix recommend not auto open

Browse source
This commit is contained in:
wanlop run 2025-05-13 00:01:29 +07:00
parent c9ae570ef0
commit 3eacf4e3f7
16 changed files with 1102 additions and 1082 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inter/tha/menu/lang.tsv
View file

@ -1269,7 +1269,7 @@
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง

Can't render this file because it has a wrong number of fields in line 22.

49
inter/tha/xml/multi/menu_catalog_default_init.lxml
View file

@ -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

2
inter/tha/xml/multi/tab_menu.lxml
View file

@ -51,7 +51,7 @@
EndIf
DEBUGVAR Menu0Selected
DEBUGVAR NextPage
</EventOpen>
<Timeout> 10000 </Timeout>
<EventTimeout>

1964
inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
View file

File diff suppressed because it is too large Load diff

19
inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml
View file

@ -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>

39
inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
View file

@ -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>

45
inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
View file

@ -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
?>

2
ui/lang.tsv
View file

@ -1269,7 +1269,7 @@
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง

Can't render this file because it has a wrong number of fields in line 22.

BIN
video/brewing_adv17.mp4
View file

Binary file not shown.

BIN
video/brewing_adv17_long.mp4
View file

Binary file not shown.

4
xml/event/script_common_for_open_promotion_xml.ev
View file

@ -57,6 +57,9 @@ Else
EndIf
If CatalogLayoutV3 = 1 Then
DEBUGVAR NextPage
SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
EndIf
@ -81,3 +84,4 @@ If OpenFromMulti = 1 Then
TabMenuVisibleInst 99
EndIf
Var OpenFromMulti = 0

2
xml/page_board.xml
View file

@ -2581,7 +2581,7 @@ PRICE "Reset" "-"
<EventClick>
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
SAVELOG " NEXT PAGE NEXT PAGE NEXT PAGE "
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If DoorCupPosition = "bottom" Then

18
xml/page_lid_straw.xml
View file

@ -228,6 +228,7 @@
If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
EndIf
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
@ -247,7 +248,7 @@
EndIf
Else
; seeker is curr ent
; seeker currr
DEBUGVAR ChangeFlag2
@ -267,12 +268,8 @@
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If Seeker.SmoothieToPayment = 1 Then
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
@ -282,13 +279,8 @@
If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf
If Seeker.SmoothieToPayment = 1 Then
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
If UsePepsiTheme = 1 Then

14
xml/page_spiral_sell.xml
View file

@ -6,6 +6,7 @@
;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
<Volume> SoundVolume </Volume>
<EventOpen>
SAVELOG " spiral sell v3"
Var Timeout = 0
Var LastMakeSpiralResult = 0
@ -17,8 +18,7 @@
SPIRAL_SELL ServiceCredit SpiralRef
Var TimeOutSmoothiesProcess = 120
Var Seeker.SmoothieToPayment = SmoothieToPayment
Var NextSmoothie = 0
DEBUGVAR Seeker.SmoothieToPayment
</EventOpen>
@ -54,7 +54,15 @@
DEBUGVAR SpiralPayDetail
Var Seeker.sprial_pay_detail = SpiralPayDetail
Open "ROOT/taobin_project/xml/page_thankyou.xml"
If Seeker = "next" Then
Var NextOrder = "true"
Var NextSmoothie = 1
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
EndIf
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
EndIf
If LastMakeSpiralResult = 2 Then

22
xml/page_thankyouConti.xml
View file

@ -147,7 +147,7 @@
Var buttonRemoveCup = "Invisible"
SAVELOG "Thank you conti version TCT8"
SAVELOG "Thank you conti version TCV9"
SAVELOG "Support NextSmoothie and fix bug next"
DEBUGVAR NextSmoothie
@ -355,17 +355,15 @@
EndIf
; smoothie next
If NextSmoothie = 1 Then
DEBUGVAR Seeker
DEBUGVAR Seeker.SmoothieToPayment
Var NextSmoothie = 0
If Seeker.SmoothieToPayment = 1 Then
Var TimeOutSmoothiesProcess = 120
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
EndIf
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.SmoothieToPayment
Var NextSmoothie = 0
If Seeker.SmoothieToPayment = 1 Then
Var TimeOutSmoothiesProcess = 120
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
EndIf
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID

2
xml/sometime/make_drink.xml
View file

@ -19,8 +19,10 @@ Else
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
Else
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf