next smoothie flow

2025-05-06 14:49:23 +07:00 · 2025-05-06 14:49:23 +07:00 · 43f6fa4e76
commit 43f6fa4e76
parent 4059a741ca
8 changed files with 106 additions and 27 deletions
--- a/inter/tha/menu/lang.tsv
+++ b/inter/tha/menu/lang.tsv
@ -400,8 +400,10 @@
 		Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48	Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48	Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center	Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48	Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48
 002431		Taobin has a problem\n[Please try again later.###Font=KanitLight,Size=48]	เต่าบินเกิดเหตุขัดข้อง\n[กรุณาทำรายการอีกครั้งภายหลัง###Font=KanitLight,Size=48]	Taobin 出现问题\n[请稍后再试。###Font=KanitLight,Size=48]			Taobin တွင်ပြဿနာတစ်ခုရှိနေသည်\n[ကျေးဇူးပြု၍ နောက်မှ ထပ်စမ်းကြည့်ပါ။###Font=KanitLight,Size=48]
 002432		Taobin will refund the money\n[through the channel you paid.###Font=KanitLight,Size=48]	เต่าบินจะทำการคืนเงินตาม\n[ช่องทางที่คุณจ่ายมา###Font=KanitLight,Size=48]	Taobin 将通过您付款的渠道\n[退还金额给您。###Font=KanitLight,Size=48]			Taobin ပြန်အမ်းငွေ\n[ပေးချေမှုနည်းလမ်းဖြင့်###Font=KanitLight,Size=48]
-							
-							
+		Font=Kanit,Type=Medium,Size=50,Color=0x513C2F,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=26,Color=0x513C2F,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=60,Color=0x513C2F,Align=Center,LineHeight=30
+002433		Wait for the previous cup first, okay?	รอแก้วก่อนหน้าเสร็จก่อนน้า	先等前面的杯子做好哦			အရင်ခွက်ပြီးမှစောင့်ပါနော်
+		Font=Kanit,Type=Light,Size=44,Color=0x513C2F,Align=Center,LineHeight=48	Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48	Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48	Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center	Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48	Font=Kanit,Type=Light,Size=48,Color=0x513C2F,Align=Center,LineHeight=48
+002434		Thanks for your patience\n[we’re almost there!###Font=KanitLight,Size=44]	ขอบคุณที่รอน้า น่ารักที่สุดเลย!	谢谢你的耐心！\n[马上就好了！###Font=KanitLight,Size=48]			စောင့်ပေးလို့ကျေးဇူးတင်ပါတယ်\n[ခဏလေးပါ!###Font=KanitLight,Size=48]
 							
 							
 		Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal	Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal			Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal	Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal
@ -1261,7 +1263,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. เลือกทิศทาง				
@ -1274,7 +1276,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที				
 1300017		Test grind sizes	ทดสอบขนาดบด				
 1300018		Coffee module type :	ประเภทชุดกาแฟ :				
-1300019		1. Select grind sizes	1. เลือกขนาดบด				
+1300019		1. Select grind sizes	1. เลือกขนาดการบด				
 1300020		More coarse	หยาบขึ้น				
 1300021		More fine	ละเอียดขึ้น				
 1300022		2. Test grinding	2. ทดสอบการบด				
--- a/inter/tha/xml/page_smoothie_suggest_and_process.xml
+++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml
@ -112,29 +112,9 @@
 	Else
 		Var ShowHandPoint = "Invisible"
 	EndIf
-	If BoxID = 210699 Then
-		If TextDoorButtonID = 001206 Then
-			If Show_btn_process = "Disable" Then
-				Var ShowHandPoint = "Invisible"
-			Else
-				If TimeOutHandPoint > 9 Then
-					If MotionHandPoint = 0 Then
-						Var ShowHandPoint = "Enable"
-						Var MotionHandPoint = 1
-					Else
-						Var ShowHandPoint = "Invisible"
-						Var MotionHandPoint = 0
-					EndIf
-				EndIf
-			EndIf
-		Else
-			Var ShowHandPoint = "Invisible"
-		EndIf
-		;Var Show_btn_process = "Disable"
-	EndIf

 	If Show_btn_process = "Disable" Then
-		Var VideoSmoothieProcess = "ROOT/taobin_project/video/TaoBin_Tao Pun_motion_proof3_pause.mp4"
+		Var VideoSmoothieProcess = "ROOT/taobin_project/video/TaoBin_Tao_Pun_motion_proof3_pause.mp4"
 		Var Showhelper = "Enable"
 		Var Show_btn_help = "Invisible"
 	Else
@ -143,7 +123,7 @@
 		Else
 			Var Show_btn_help = "Invisible"
 		EndIf
-		Var VideoSmoothieProcess = "ROOT/taobin_project/video/TaoBin_Tao Pun_motion_proof3.mp4"
+		Var VideoSmoothieProcess = "ROOT/taobin_project/video/TaoBin_Tao_Pun_motion_proof3.mp4"
 		Var Showhelper = "Invisible"
 	EndIf

--- a/video/TaoBin_Tao_Pun_motion_proof3.mp4
+++ b/video/TaoBin_Tao_Pun_motion_proof3.mp4
--- a/video/TaoBin_Tao_Pun_motion_proof3_pause.mp4
+++ b/video/TaoBin_Tao_Pun_motion_proof3_pause.mp4
--- a/xml/page_NewBrewing3.xml
+++ b/xml/page_NewBrewing3.xml
@ -10,6 +10,19 @@
 	
 	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev"

+	; smoothie next
+	If NextSmoothie = 1 Then
+		DEBUGVAR Seeker
+		DEBUGVAR Seeker.SmoothieToPayment
+		Var NextSmoothie = 0
+		If Seeker.SmoothieToPayment = 1 Then
+			Var TimeOutSmoothiesProcess = 120
+			Var Seeker.SmoothieToPayment = 0
+			OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+			Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
+		EndIf
+	EndIf
+
 	Var SendNotiPaySuccess = 2

 	Var GetMoreStrawCount = 2
--- a/xml/page_spiral_before_conti.xml
+++ b/xml/page_spiral_before_conti.xml
@ -0,0 +1,75 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	
+    Var Timeout = 0
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+		
+	Var Timeout = Timeout + 1
+
+    If Timeout > 7 Then
+        Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml"
+    EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+
+
+<EventActionOk>
+</EventActionOk>
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Refresh> "Reload" </Refresh>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/video/taobin_thank2.mp4" </Filename>
+</Video>
+
+<Image>
+<X> 84 </X>
+<Y> 1314 </Y>
+<Width> 911 </Width>
+<Height> 265 </Height>
+<Filename> "ROOT/taobin_project/image/smoothie/proccess/bg_empty.png" </Filename>
+</Image>
+
+<Text>
+<X> 0 </X>
+<Y> 1344 </Y>
+<Width> 1080 </Width>
+<Height> 85 </Height>
+<Align> Center </Align>
+<Language>
+	<ID> 002433 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 0 </X>
+<Y> 1430 </Y>
+<Align> Center </Align>
+<Language>
+	<ID> 002434 </ID>
+</Language>
+</Text>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+</Popup>
--- a/xml/page_spiral_failed.xml
+++ b/xml/page_spiral_failed.xml
@ -17,7 +17,7 @@
 	Var Timeout = Timeout + 1

    If Timeout > 3 Then
-        Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+        ;include="ROOT/taobin_project/inc/return_condition.ev"
    EndIf

 	TimerReset
--- a/xml/page_spiral_sell.xml
+++ b/xml/page_spiral_sell.xml
@ -17,6 +17,8 @@
    SPIRAL_SELL ServiceCredit SpiralRef

    Var TimeOutSmoothiesProcess = 120
+    Var Seeker.SmoothieToPayment = SmoothieToPayment
+    Var NextSmoothie = 0
    DEBUGVAR Seeker.SmoothieToPayment

 </EventOpen>
@ -52,6 +54,13 @@
        DEBUGVAR SpiralPayDetail
        Seeker.sprial_pay_detail = SpiralPayDetail

+        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