Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2025-05-13 12:22:31 +07:00
commit dbcb792fb9
68 changed files with 376 additions and 254 deletions

View file

@ -18,6 +18,8 @@
DEBUGVAR FromSmoothieProcess
DEBUGVAR FromBrewingProcess
Var ChooseProblem = ""
Var show_btn_next_help = "Invisible"
Var Problem_Cash_State[0] = "Enable"
@ -56,6 +58,7 @@
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
@ -117,23 +120,20 @@
<Volume> SoundVolume </Volume>
<EventClick>
If Seeker = "next" Then
RootLayoutVisible 3 "hide"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
If BaseOnPageBoard = 1 Then
Var BaseOnPageBoard = 0
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 608
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
If BaseOnPageBoard = 1 Then
Var BaseOnPageBoard = 0
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 608
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
</EventClick>
</Button>
@ -199,6 +199,8 @@
Var Problem_Cash_State[2] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Inserted money, amount unchanged"
Refresh
</EventClick>
@ -220,6 +222,8 @@
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Bill was rejected by the machine"
Refresh
</EventClick>
</Button>
@ -240,6 +244,8 @@
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Other"
Refresh
</EventClick>
</Button>
@ -306,6 +312,8 @@
Var Problem_Brewing_State[8] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Found a foreign object"
Refresh
</EventClick>
@ -332,6 +340,8 @@
Var Problem_Brewing_State[8] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Some ingredients missing"
Refresh
</EventClick>
@ -358,6 +368,8 @@
Var Problem_Brewing_State[8] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Under-filled cup"
Refresh
</EventClick>
@ -384,6 +396,8 @@
Var Problem_Brewing_State[8] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Wrong item received"
Refresh
</EventClick>
@ -410,6 +424,8 @@
Var Problem_Brewing_State[8] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Drink wasnt blended"
Refresh
</EventClick>
@ -436,6 +452,8 @@
Var Problem_Brewing_State[8] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Drink didnt dissolve properly"
Refresh
</EventClick>
@ -462,6 +480,8 @@
Var Problem_Brewing_State[8] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Cup is messy/dirty"
Refresh
</EventClick>
@ -488,6 +508,8 @@
Var Problem_Brewing_State[8] = "Enable"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "The cup tipped over / drink spilled"
Refresh
</EventClick>
@ -514,6 +536,8 @@
Var Problem_Brewing_State[8] = "PressForever"
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Other"
Refresh
</EventClick>
@ -625,28 +649,30 @@
<Height> "auto" </Height>
<State> FromSmoothieProcess </State>
;<Button>
;<X> 0 </X>
;<Y> 0 </Y>
;<State> Problem_Process_State[0] </State>
;<Filename> "ROOT/taobin_project/image/page_help_center/cb_uncheck_problem.png" </Filename>
;<FilenamePress> "ROOT/taobin_project/image/page_help_center/cb_checked_problem.png" </FilenamePress>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;Var Problem_Process_State[0] = "PressForever"
;Var Problem_Process_State[1] = "Enable"
;Var show_btn_next_help = "Enable"
;Var ChooseProblem = "Item not received"
;Refresh
;</EventClick>
;</Button>
<Button>
<X> 0 </X>
<Y> 0 </Y>
<State> Problem_Process_State[0] </State>
<Filename> "ROOT/taobin_project/image/page_help_center/cb_uncheck_problem.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_help_center/cb_checked_problem.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Problem_Process_State[0] = "PressForever"
Var Problem_Process_State[1] = "Enable"
Var show_btn_next_help = "Enable"
Refresh
</EventClick>
</Button>
<Button>
<X> 0 </X>
<Y> 100 </Y>
<State> Problem_Process_State[1] </State>
<Filename> "ROOT/taobin_project/image/page_help_center/cb_uncheck_problem.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_help_center/cb_checked_problem.png" </FilenamePress>
@ -659,24 +685,26 @@
Var show_btn_next_help = "Enable"
Var ChooseProblem = "Other"
Refresh
</EventClick>
</Button>
<Text>
<X> 100 </X>
<Y> 0 </Y>
<Width> 500 </Width>
<Height> 75 </Height>
<State> Problem_Process_State[0] </State>
<Language>
<ID> 002312 </ID>
</Language>
</Text>
;<Text>
;<X> 100 </X>
;<Y> 0 </Y>
;<Width> 500 </Width>
;<Height> 75 </Height>
;<State> Problem_Process_State[0] </State>
;<Language>
;<ID> 002312 </ID>
;</Language>
;</Text>
<Text>
<X> 100 </X>
<Y> 100 </Y>
<Y> 0 </Y>
<Width> 500 </Width>
<Height> 75 </Height>
<State> Problem_Process_State[1] </State>

View file

@ -30,18 +30,25 @@
If Timeout > 300 Then
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
If Seeker = "next" Then
RootLayoutVisible 3 "hide"
OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
If BaseOnPageBoard = 1 Then
Var BaseOnPageBoard = 0
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 608
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
EndIf
EndIf
@ -97,17 +104,10 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If Seeker = "next" Then
RootLayoutVisible 3 "hide"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
If BoxID = 210699 Then
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml"
</EventClick>
</Button>
@ -505,8 +505,20 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
StrLen TelephoneNumber TelNumLen
If TelNumLen >= MinPhoneNumber Then
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
DEBUGVAR TelephoneNumber
DEBUGVAR ChooseProblem
PROBLEM TelephoneNumber ChooseProblem
If MachineStage = "remove-cup" Then
OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml"
Else
Open "ROOT/taobin_project/inter/tha/xml/page_help_center_sending_conti.lxml"
EndIf
EndIf
</EventClick>
</Button>

View file

@ -0,0 +1,99 @@
<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 > 5 Then
If Seeker = "next" Then
RootLayoutVisible 3 "hide"
OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 608
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
TimerReset
Refresh
</EventTimeout>
<EventActionOk>
</EventActionOk>
;include="ROOT/taobin_project/inc/video.inc"
;<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> 380 </X>
<Y> 724 </Y>
<Width> 911 </Width>
<Height> 265 </Height>
<Width> 361 </Width>
<Height> 486 </Height>
<Filename> "ROOT/taobin_project/image/collectiing/Businessman_sorry.png" </Filename>
</Image>
<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> 002354 </ID>
</Language>
</Text>
<Text>
<X> 0 </X>
<Y> 1430 </Y>
<Align> Center </Align>
<Language>
<ID> 002355 </ID>
</Language>
</Text>
;include="ROOT/taobin_project/inc/video.inc"
</Popup>

View file

@ -60,6 +60,7 @@
Var FromSmoothieProcess = "Enable"
Var FromPaymentCash = "Invisible"
Var FromBrewingProcess = "Invisible"
Var BaseOnPageBoard = 0
Var TimeOutHandPoint = 0
Var ShowHandPoint = "Invisible"