DO
This commit is contained in:
kong
parent
4302a22b1d
commit
9cae57703e
16 changed files with 339 additions and 18 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
BIN
image/topping/bd_next.png
Normal file
BIN
image/topping/bd_next.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
BIN
image/topping2/bd_next.png
Normal file
BIN
image/topping2/bd_next.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
image/topping2/bg_milk_choice.png
Normal file
BIN
image/topping2/bg_milk_choice.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
image/topping2/bg_top_milk.png
Normal file
BIN
image/topping2/bg_top_milk.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.8 KiB |
BIN
image/topping2/bn_cereal.png
Normal file
BIN
image/topping2/bn_cereal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
image/topping2/bp_cereal.png
Normal file
BIN
image/topping2/bp_cereal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
image/topping2/please_wait.png
Normal file
BIN
image/topping2/please_wait.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
BIN
image/topping2_en/please_wait.png
Normal file
BIN
image/topping2_en/please_wait.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.1 KiB |
BIN
image/topping2_en/topping2/bg_top_milk.png
Normal file
BIN
image/topping2_en/topping2/bg_top_milk.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7 KiB |
11
ui/lang.tsv
11
ui/lang.tsv
|
|
@ -647,6 +647,7 @@ TextID Note English Thai China Japan Malaysia
|
|||
800515 Current version เวอร์ชันปัจจุบัน
|
||||
800516 Last version เวอร์ชันล่าสุด
|
||||
800517 Upgrade status สถานะอัพเกรด
|
||||
800518 Select file เลือกไฟล์
|
||||
|
||||
800600 Turn around หมุนกลับ
|
||||
800601 Call arm Call แขน
|
||||
|
|
@ -656,4 +657,12 @@ TextID Note English Thai China Japan Malaysia
|
|||
800605 200g place at ARM and press Yes. นำ 200g วางที่แขน แล้วกด ใช่
|
||||
800606
|
||||
800607
|
||||
800608
|
||||
800608 Bean tray no close ถาดเมล็ดกาแฟปิดไม่สนิท
|
||||
800609 Door cash not close. ประตูเก็บเงินเปิด
|
||||
800610 Powder and arm not close. ชุดแขน (ผง แก้ว) ปิดไม่สนิท
|
||||
800611 Coffee ground is full. กากกาแฟเต็ม
|
||||
800612 Waste water full น้ำทิ้งเต็ม
|
||||
800613 Main Gate still open. ประตูตู้เปิด
|
||||
800614
|
||||
800615 LID 1 disable ฝาช่องที่ 1 ปิด
|
||||
800616 LID 2 disable ฝาช่องที่ 2 ปิด
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 21.
|
|
|
@ -84,6 +84,13 @@ If BoxID = 200000 Then
|
|||
Var PepsiProCodeEnable = 0
|
||||
EndIf
|
||||
|
||||
If BoxID = 173149 Then
|
||||
Var OreoDueEnable = 0
|
||||
Var OreoForFreeEnable = 0
|
||||
Var PepsiProEnable = 0
|
||||
Var PepsiProCodeEnable = 0
|
||||
EndIf
|
||||
|
||||
If BoxID = 172053 Then
|
||||
Var PepsiProEnable = 1
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
Var web_readyOK = "false"
|
||||
|
||||
Var GetFreeFromError = 0
|
||||
Var taobin_version = "1.00"
|
||||
|
||||
|
||||
Cart "DeleteMenuID" "ALL"
|
||||
|
|
@ -114,8 +113,28 @@
|
|||
|
||||
EndIf
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
If BoxID = 200001 Then
|
||||
Var NoWaitMachineEnable = 1
|
||||
EndIf
|
||||
If BoxID = 173149 Then
|
||||
Var NoWaitMachineEnable = 1
|
||||
EndIf
|
||||
If BoxID = 172527 Then
|
||||
Var NoWaitMachineEnable = 1
|
||||
EndIf
|
||||
|
||||
|
||||
If NoWaitMachineEnable = 1 Then
|
||||
If stop_now = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -130,8 +149,6 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
Var TestLoopMakeDrink = 0
|
||||
Var TestLoopSuccess = 0
|
||||
Var TestLoopFailed = 0
|
||||
|
|
@ -836,8 +853,9 @@
|
|||
</EventOpen>
|
||||
|
||||
<EventUnitTest1>
|
||||
Var SongkranEnable = 0
|
||||
Var NoWaitMachineEnable = 1
|
||||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
||||
|
|
@ -863,6 +881,10 @@
|
|||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest3>
|
||||
Var NoWaitMachineEnable = 0
|
||||
</EventUnitTest3>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
If IgnoreNetCore = "true" Then
|
||||
|
|
@ -876,9 +898,15 @@
|
|||
Open "/ROOT/xml/offline.xml"
|
||||
EndIf
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
If NoWaitMachineEnable = 1 Then
|
||||
If stop_now = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
EndIf
|
||||
Else
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If MachineStage = "mcu-upgrade" Then
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@
|
|||
|
||||
SAVELOG "Event Open Select 6"
|
||||
|
||||
If NoWaitMachineEnable = 1 Then
|
||||
Var ConfirmDrinkButtonState = "Enable"
|
||||
Else
|
||||
|
||||
Var ConfirmDrinkButtonState = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var y_topping_bg = 912
|
||||
|
||||
Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1
|
||||
|
|
@ -78,6 +85,8 @@
|
|||
;Var ShotCoffeePremium = "Enable"
|
||||
;Var showOreoAddEnable = "Enable"
|
||||
|
||||
Var CerealMilkToppingEnable = "Invisible"
|
||||
|
||||
Var ExtraTopping = "Invisible"
|
||||
|
||||
; On open
|
||||
|
|
@ -374,6 +383,26 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If NoWaitMachineEnable = 1 Then
|
||||
DEBUGVAR MachineStage
|
||||
DEBUGVAR ConfirmDrinkButtonState
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Var ConfirmDrinkButtonState = "Enable"
|
||||
|
||||
If stop_now = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
EndIf
|
||||
Else
|
||||
Var ConfirmDrinkButtonState = "Invisible"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
@ -1364,6 +1393,10 @@
|
|||
EndIf
|
||||
;topping_price_refresh = 0
|
||||
|
||||
If MenuCodeName1 = "Cereal-Milk" Then
|
||||
Var CerealMilkToppingEnable = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
SAVELOG ToppingGotoPayment
|
||||
If ToppingGotoPayment = "true" Then
|
||||
|
|
@ -1485,11 +1518,13 @@
|
|||
;
|
||||
;
|
||||
;- FRAME SCORELLL
|
||||
; zone scroll
|
||||
<FrameScroll>
|
||||
<X> 52 </X>
|
||||
<Y> 881 </Y>
|
||||
<Width> 1080 </Width>
|
||||
<ScrollHeight> "auto-all" </ScrollHeight>
|
||||
<Height> 900 </Height>
|
||||
;<ScrollHeight> "auto-all" </ScrollHeight>
|
||||
<Scroll> "Vertical" </Scroll>
|
||||
<Column> 1 </Column>
|
||||
|
||||
|
|
@ -1700,6 +1735,9 @@
|
|||
</Block>
|
||||
|
||||
|
||||
|
||||
;-END
|
||||
|
||||
;
|
||||
;
|
||||
;
|
||||
|
|
@ -2653,6 +2691,153 @@
|
|||
;
|
||||
;
|
||||
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;-BEGIN
|
||||
;
|
||||
;-BEGIN Lid straw
|
||||
<Block>
|
||||
<Width> 986 </Width>
|
||||
<Height> 240 </Height>
|
||||
<MarginTop> 20 </MarginTop>
|
||||
<State> ShowLidStraw </State>
|
||||
<Image>
|
||||
<Filename> bg_strawlid </Filename>
|
||||
</Image>
|
||||
|
||||
; straw left
|
||||
<Button>
|
||||
<X> 40 </X>
|
||||
<Y> 72 </Y>
|
||||
<State> StrawState </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
|
||||
<EventClick>
|
||||
SAVELOG "Click straw cb"
|
||||
If StrawState = "Press" Then
|
||||
Var StrawState = "Enable"
|
||||
|
||||
Var Seeker.thankStrawFlag = 0
|
||||
|
||||
Else
|
||||
Var StrawState = "Press"
|
||||
|
||||
Var Seeker.thankStrawFlag = 1
|
||||
|
||||
EndIf
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 896 </X>
|
||||
<Y> 79 </Y>
|
||||
<State> StrawState </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
|
||||
<EventClick>
|
||||
SAVELOG "Click straw cb"
|
||||
If StrawState = "Press" Then
|
||||
Var StrawState = "Enable"
|
||||
|
||||
Var Seeker.thankStrawFlag = 0
|
||||
|
||||
Else
|
||||
Var StrawState = "Press"
|
||||
|
||||
Var Seeker.thankStrawFlag = 1
|
||||
|
||||
EndIf
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
|
||||
; LID left
|
||||
<Button>
|
||||
<X> 40 </X>
|
||||
<Y> 148 </Y>
|
||||
<State> LidState </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
|
||||
<EventClick>
|
||||
SAVELOG "Click LID pic"
|
||||
If LidState = "Press" Then
|
||||
Var LidState = "Enable"
|
||||
|
||||
Var Seeker.thankLidFlag = 0
|
||||
|
||||
Else
|
||||
Var LidState = "Press"
|
||||
|
||||
Var Seeker.thankLidFlag = 1
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR SugarState1
|
||||
Refresh
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 896 </X>
|
||||
<Y> 155 </Y>
|
||||
<State> LidState </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
|
||||
<EventClick>
|
||||
SAVELOG "Click LID cb"
|
||||
If LidState = "Press" Then
|
||||
Var LidState = "Enable"
|
||||
|
||||
Var Seeker.thankLidFlag = 0
|
||||
|
||||
Else
|
||||
Var LidState = "Press"
|
||||
|
||||
Var Seeker.thankLidFlag = 1
|
||||
|
||||
EndIf
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Image>
|
||||
<State> StrawDeactiveButton </State>
|
||||
<X> 602 </X>
|
||||
<Y> 64 </Y>
|
||||
<Filename> Var( DirImage + "/text20.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
<Image>
|
||||
<State> LidDeactiveButton </State>
|
||||
<X> 602 </X>
|
||||
<Y> 150 </Y>
|
||||
<Filename> Var( DirImage + "/text21.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
</Block>
|
||||
|
||||
;-END
|
||||
;
|
||||
;
|
||||
|
|
@ -2684,6 +2869,85 @@
|
|||
<Filename> Var( DirImage + "/bg_top.png" ) </Filename>
|
||||
</Image>
|
||||
</Row1>
|
||||
|
||||
;
|
||||
;
|
||||
;
|
||||
<Row1>
|
||||
<Width> 986 </Width>
|
||||
<Height> "auto" </Height>
|
||||
<State> CerealMilkToppingEnable </State>
|
||||
;
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<Filename> Var( DirImage + "/bg_top_milk.png") </Filename>
|
||||
</Image>
|
||||
|
||||
<Button>
|
||||
<X> 40 </X>
|
||||
<Y> 5 </Y>
|
||||
<State> CerealMilkEnable </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_cereal.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
SAVELOG " CerealMilkEnable "
|
||||
|
||||
|
||||
If CerealMilkEnable = "Press" Then
|
||||
Var CerealMilkEnable = "Enable"
|
||||
Else
|
||||
Var CerealMilkEnable = "Press"
|
||||
EndIf
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
;
|
||||
<Button>
|
||||
<X> 896 </X>
|
||||
<Y> 14 </Y>
|
||||
<State> CerealMilkEnable </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
SAVELOG " CerealMilkEnable "
|
||||
|
||||
|
||||
If CerealMilkEnable = "Press" Then
|
||||
Var CerealMilkEnable = "Enable"
|
||||
Else
|
||||
Var CerealMilkEnable = "Press"
|
||||
EndIf
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Text>
|
||||
<X> topping_shot_price_x </X>
|
||||
<Y> 2 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "ShotCoffeePremium"</State>
|
||||
<Size> 36 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> text_price_topping </Value>
|
||||
</Text>
|
||||
|
||||
</Row1>
|
||||
;
|
||||
;
|
||||
;
|
||||
|
|
@ -2984,8 +3248,14 @@
|
|||
|
||||
</ListView1>
|
||||
</Block>
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
;
|
||||
|
||||
;-END
|
||||
;
|
||||
;
|
||||
;
|
||||
|
|
@ -2996,7 +3266,7 @@
|
|||
;
|
||||
;
|
||||
;
|
||||
;-BEGIN Collagen
|
||||
;-BEGIN
|
||||
;
|
||||
;-BEGIN Lid straw
|
||||
<Block>
|
||||
|
|
@ -4048,6 +4318,16 @@
|
|||
</Text>
|
||||
|
||||
|
||||
; next2 button Protect
|
||||
<Button>
|
||||
<State> ConfirmDrinkButtonState </State>
|
||||
<X> 526 </X>
|
||||
<Y> 1785 </Y>
|
||||
<Filename> Var( DirImage + "/please_wait.png" )</Filename>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
|
||||
</Button>
|
||||
|
||||
; zone
|
||||
|
||||
|
|
|
|||
|
|
@ -74,9 +74,6 @@
|
|||
|
||||
Var ShowVersionAll = BrewMachineFirmwareVersion + " | "
|
||||
Var ShowVersionAll = ShowVersionAll + XMLPageVersion
|
||||
Var ShowVersionAll = ShowVersionAll + " | "
|
||||
Var ShowVersionAll = ShowVersionAll + taobin_version
|
||||
|
||||
Var ShowVersionAll = ShowVersionAll + " | "
|
||||
Var ShowVersionAll = ShowVersionAll + JXMLVersion
|
||||
|
||||
|
|
|
|||
|
|
@ -108,8 +108,8 @@
|
|||
Var RandomPromotionMyworld = 0
|
||||
Var RandomSalePackage = 0
|
||||
|
||||
Var XMLPageVersion = "7.33"
|
||||
Var XMLPageVersionInt = 733
|
||||
Var XMLPageVersion = "7.34"
|
||||
Var XMLPageVersionInt = 734
|
||||
</EventOpen>
|
||||
|
||||
<Text>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue