From 43f6fa4e7660319450206437624e3b8b73fd25a7 Mon Sep 17 00:00:00 2001 From: Ittipat Lusuk Date: Tue, 6 May 2025 14:49:23 +0700 Subject: [PATCH] next smoothie flow --- inter/tha/menu/lang.tsv | 10 ++- .../xml/page_smoothie_suggest_and_process.xml | 24 +----- ...3.mp4 => TaoBin_Tao_Pun_motion_proof3.mp4} | Bin ...=> TaoBin_Tao_Pun_motion_proof3_pause.mp4} | Bin xml/page_NewBrewing3.xml | 13 +++ xml/page_spiral_before_conti.xml | 75 ++++++++++++++++++ xml/page_spiral_failed.xml | 2 +- xml/page_spiral_sell.xml | 9 +++ 8 files changed, 106 insertions(+), 27 deletions(-) rename video/{TaoBin_Tao Pun_motion_proof3.mp4 => TaoBin_Tao_Pun_motion_proof3.mp4} (100%) rename video/{TaoBin_Tao Pun_motion_proof3_pause.mp4 => TaoBin_Tao_Pun_motion_proof3_pause.mp4} (100%) create mode 100644 xml/page_spiral_before_conti.xml diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index 291c4d51..627636e3 100644 --- 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. ทดสอบการบด diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index 2e07cddc..2eec409e 100644 --- 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 diff --git a/video/TaoBin_Tao Pun_motion_proof3.mp4 b/video/TaoBin_Tao_Pun_motion_proof3.mp4 similarity index 100% rename from video/TaoBin_Tao Pun_motion_proof3.mp4 rename to video/TaoBin_Tao_Pun_motion_proof3.mp4 diff --git a/video/TaoBin_Tao Pun_motion_proof3_pause.mp4 b/video/TaoBin_Tao_Pun_motion_proof3_pause.mp4 similarity index 100% rename from video/TaoBin_Tao Pun_motion_proof3_pause.mp4 rename to video/TaoBin_Tao_Pun_motion_proof3_pause.mp4 diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 574569e3..80dbbfbd 100644 --- 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 diff --git a/xml/page_spiral_before_conti.xml b/xml/page_spiral_before_conti.xml new file mode 100644 index 00000000..c517f391 --- /dev/null +++ b/xml/page_spiral_before_conti.xml @@ -0,0 +1,75 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + + Var Timeout = 0 + + + 1000 + + + Var Timeout = Timeout + 1 + + If Timeout > 7 Then + Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml" + EndIf + + TimerReset + Refresh + + + + + + + + + + + 84 + 1314 + 911 + 265 + "ROOT/taobin_project/image/smoothie/proccess/bg_empty.png" + + + + 0 + 1344 + 1080 + 85 + Center + + 002433 + + + + + 0 + 1430 + Center + + 002434 + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + \ No newline at end of file diff --git a/xml/page_spiral_failed.xml b/xml/page_spiral_failed.xml index d0e3c665..b9a0f6cb 100644 --- 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 diff --git a/xml/page_spiral_sell.xml b/xml/page_spiral_sell.xml index fb42efce..dd64cf1d 100644 --- 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 @@ -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