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

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

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

@ -1,4 +1,4 @@
Var NextPage = "-"
DEBUGVAR ICE_PROCESS_STATUS DEBUGVAR ICE_PROCESS_STATUS
DEBUGVAR ICE_PROCESS_TXT DEBUGVAR ICE_PROCESS_TXT
@ -179,6 +179,3 @@
DEBUGVAR MenuVSelected2 DEBUGVAR MenuVSelected2
EndIf EndIf

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

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

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

@ -12,7 +12,7 @@
Var Menu1Selected = "PressForever" Var Menu1Selected = "PressForever"
Var Timeout = 0 Var RecommendTimeOut = 0
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml" ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
SetInstanceIgnoreTouch SetInstanceIgnoreTouch
@ -27,9 +27,7 @@
TRY "ROOT/taobin_project/inter/tha/show_lang.ev" TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
RefreshAll DEBUGVAR NextPage
</EventOpen> </EventOpen>
<EventOnShow> <EventOnShow>
@ -64,18 +62,22 @@
If NextPage = "-" Then If NextPage = "-" Then
Else Else
If CupOnArm = "true" Then If CupOnArm = "true" Then
If Timeout > 9 Then If RecommendTimeOut > 9 Then
SAVELOG "COA9" SAVELOG "COA9"
Var NextPage = "-"
Open NextPage Open NextPage
EndIf EndIf
Else Else
If Timeout > 30 Then If RecommendTimeOut > 30 Then
SAVELOG "COA30" SAVELOG "COA30"
Var NextPage = "-"
Open NextPage Open NextPage
EndIf EndIf
EndIf EndIf
EndIf EndIf
Var RecommendTimeOut = RecommendTimeOut + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

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

@ -126,23 +126,6 @@
<MenuUnavailableLabel> 000013 </MenuUnavailableLabel> <MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
</Configuration> </Configuration>
<Menus> <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 ; ==================> Len = 3
; - 12-05-02-0133 - ; - 12-05-02-0133 -

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

@ -12,7 +12,7 @@
Var Menu1Selected = "PressForever" Var Menu1Selected = "PressForever"
Var Timeout = 0 Var RecommendTimeOut = 0
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml" ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
SetInstanceIgnoreTouch SetInstanceIgnoreTouch
@ -27,9 +27,7 @@
TRY "ROOT/taobin_project/inter/tha/show_lang.ev" TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
RefreshAll DEBUGVAR NextPage
</EventOpen> </EventOpen>
<EventOnShow> <EventOnShow>
@ -61,6 +59,25 @@
EndIf EndIf
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 TimerReset
</EventTimeout> </EventTimeout>

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

@ -14,7 +14,7 @@
Var Menu1Selected = "PressForever" Var Menu1Selected = "PressForever"
Var Timeout = 0 Var RecommendTimeOut = 0
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml" ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
SetInstanceIgnoreTouch SetInstanceIgnoreTouch
@ -29,9 +29,7 @@
TRY "ROOT/taobin_project/inter/tha/show_lang.ev" TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
RefreshAll DEBUGVAR NextPage
</EventOpen> </EventOpen>
<EventOnShow> <EventOnShow>
@ -63,6 +61,25 @@
EndIf EndIf
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 TimerReset
</EventTimeout> </EventTimeout>

2
ui/lang.tsv
View file

@ -1269,7 +1269,7 @@
1300003 Beans module ชุดเมล็ดกาแฟ 1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด : 1300005 Switch tray : สวิตซ์ถาด :
1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด 1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300007 Pay beans จ่ายถั่ว 1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง 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 EndIf
If CatalogLayoutV3 = 1 Then If CatalogLayoutV3 = 1 Then
DEBUGVAR NextPage
SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3" SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
EndIf EndIf
@ -81,3 +84,4 @@ If OpenFromMulti = 1 Then
TabMenuVisibleInst 99 TabMenuVisibleInst 99
EndIf EndIf
Var OpenFromMulti = 0 Var OpenFromMulti = 0

2
xml/page_board.xml
View file

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

14
xml/page_lid_straw.xml
View file

@ -228,6 +228,7 @@
If Seeker.SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml" Open "ROOT/taobin_project/xml/page_spiral_before_conti.xml"
EndIf EndIf
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf EndIf
@ -247,7 +248,7 @@
EndIf EndIf
Else Else
; seeker is curr ent ; seeker currr
DEBUGVAR ChangeFlag2 DEBUGVAR ChangeFlag2
@ -267,12 +268,8 @@
If New_Payment = 1 Then If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf 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" Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter Open Brew3Inter
@ -282,14 +279,9 @@
If New_Payment = 1 Then If New_Payment = 1 Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
EndIf 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" Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf EndIf
EndIf
Else Else
If UsePepsiTheme = 1 Then If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then If CountryName = "Singapore" Then

14
xml/page_spiral_sell.xml
View file

@ -6,6 +6,7 @@
;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound> ;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
SAVELOG " spiral sell v3"
Var Timeout = 0 Var Timeout = 0
Var LastMakeSpiralResult = 0 Var LastMakeSpiralResult = 0
@ -17,8 +18,7 @@
SPIRAL_SELL ServiceCredit SpiralRef SPIRAL_SELL ServiceCredit SpiralRef
Var TimeOutSmoothiesProcess = 120 Var TimeOutSmoothiesProcess = 120
Var Seeker.SmoothieToPayment = SmoothieToPayment
Var NextSmoothie = 0
DEBUGVAR Seeker.SmoothieToPayment DEBUGVAR Seeker.SmoothieToPayment
</EventOpen> </EventOpen>
@ -54,7 +54,15 @@
DEBUGVAR SpiralPayDetail DEBUGVAR SpiralPayDetail
Var Seeker.sprial_pay_detail = 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 EndIf
If LastMakeSpiralResult = 2 Then If LastMakeSpiralResult = 2 Then

4
xml/page_thankyouConti.xml
View file

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

2
xml/sometime/make_drink.xml
View file

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