pre release

This commit is contained in:
wanlop run 2024-01-22 13:06:50 +07:00
parent 06d13549b5
commit 073bfb25fb
9 changed files with 7305 additions and 3081 deletions

View file

@ -512,6 +512,52 @@ Name=ProMyMintMyMoment,file=page_catalog_group_pro_mymint.skt
รวยเงินเดือน\nสุดท้ายเงินทอน MINT LYCHEE\nLEMON SODA น้ำเชื่อมมินต์ น้ำเชื่อมลิ้นจี่ มะนาว และโซดา Mint Syrup,Lychee Syrup, Lime, Soda & Ice - 12-05-02-0066 - bn_Mint_Wealthy_Lychee_lime_soda.png - - - posi1
รวยเป๊ปเด้อ\nเออ โอเค! PEPSI MINT เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา Pepsi, Mint Syrup& Ice - 12-05-02-0067 - bn_Mint_Wealthy_pepsi.png - - - posi1
NameRerun,file=page_catalog_group_pro_rerun.skt
ชาเขียวบ้านผีปอบ MATCHA HAUNTED\nHOUSE ชาเขียว น้ำเชื่อมสตรอเบอรี โซดา Match, Strawberry Syrup,Soda - 12-02-02-0044 - bn_iced_Matcha_Haunted_House_rerun.png - - - posi1
ชาดำปาโป่ง PAPONG TEA SODA ชาไทย มะนาว โซดา Thai tea, Limenade,soda - 12-02-02-0043 - bn_iced_Papong_Tea_Soda_rerun.png - - - posi1 - ฿17.50 - NN NN
เป๊ปซี่นมแน่นะวิ Freaky Everyday เป๊ปซี่ นม Pepsi, Milk - 12-99-02-0003 - bn_PEPSI_MILK_rerun.png - - - posi1
เข้มจัดเลยพี่ THAT'S LIT กาแฟ เป๊ปซี่ Espresso, Pepsi, Water - 12-99-02-0001 - bn_PEPSI_COFFEE_rerun.png - - - posi1
นี่สิตัวแม่ JASMINE TEA ชามะลิ น้ำ Jasmine Tea ,Water - - 12-99-03-0046 bn_jasmine_tea_motherday_rerun.png - - - posi1
มาลอน่า MALONNA น้ำเชื่อมเมล่อน ผงมะนาว ชาไทย และน้ำแข็ง melon, Limenade, Thai tea and ice - 12-99-02-0011 - bn_Melon_Lime_rerun.png - - - posi1
เมโบซ่า MEBOZA น้ำเชื่อมเมล่อน น้ำเชื่อมบ๊วย โซดา และน้ำแข็ง melon, Ume , soda and ice - 12-99-02-0015 - bn_Melon_PLUM_Soda_rerun.png - - - posi1
ห้องเชือด\nหมายเลข 13 Room no.13 เป๊ปซี่ น้ำเชื่อมลิ้นจี่ มะนาว และโซดา pepsi, lychee , Lime and Soda - 12-99-05-0059 - bn_room_no_13_rerun.png - - - posi1
พยาบาทชาติที่แล้ว The Haunting of\nthe Past เป๊ปซี่ น้ำเชื่อมชูกำลัง มะนาว และโซดา Pepsi Energy, Lime and Soda - 12-99-05-0057 - bn_haunting_of_the_past_rerun.png - - - posi1
รวยจนช็อก!\nน็อคแล้วไหม COCOA MINT น้ำเชื่อมมินต์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa - - 12-03-03-0035 bn_Mint_Wealthy_Cocoa_rerun.png - - - posi1
รวยไม่รู้ล้ม\nเอาผมลงไหมล่ะ MINT MILK น้ำเชื่อมมินต์ และนม Mint Syrup and Milk - 12-03-02-0036 - bn_Mint_Wealthy_Milk_rerun.png - - - posi1
ดิน 7 ป่าช้า 7 Haunted Woods เป๊ปซี่ นม และโอริโอ้ Pepsi, Milk, Oreo and Ice - - 12-99-03-0066 bn_haunted_woods_rerun.png - - - posi1
Bad Valentine
tokyo banana mocha กาแฟ น้ำ นม โกโก้ และ น้ำเชื่อมกล้วย Espresso, Banana Syrup,\ncocoa, Milk - 12-01-02-0061 12-01-03-0061
tokyo banana matcha cafe latte กาแฟ น้ำ นม มัทฉะ และ น้ำเชื่อมกล้วย Espresso, Banana Syrup,\nMatcha, Milk - 12-01-02-0062 -
tokyo banana straw cocoa น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ นม และโกโก้ banana syrup, Strawberry syrup,\nMilk, cocoa - - 12-03-03-0044
tokyo banana straw milk น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ และนม banana syrup, Strawberry syrup,\nMilk - - 12-03-03-0045
tokyo Banana Milk Oreo Smoothie น้ำเชื่อมกล้วย นม น้ำตาล Oreo Banana Syrup, Milk,\nSugar, Oreo - - 12-03-03-0029
tokyo banana ginger tea น้ำเชื่อมกล้วย ขิง และน้ำแข็ง Banana Syrup, Ginger and Ice - 12-02-02-0053 -
tokyo banana thai milk tea น้ำเชื่อมกล้วย ชาไทย นม และน้ำแข็ง Banana Syrup, Thai tea, milk and Ice - 12-02-02-0054 -
tokyo banana matcha น้ำเชื่อมกล้วย มัทฉะ และน้ำแข็ง Banana Syrup, Matcha and Ice - 12-02-02-0055 -
tokyo banana power drink soda น้ำเชื่อมกล้วย เต่าทรงพลัง \n(มีคาเฟอีน) Banana Syrup, Medicine drink, Soda and Ice - 12-05-02-0078 -
Name=CockTail,file=page_catalog_group_cocktail.skt
STX On The Beach STX On The Beach Pineapple juice, Limeade, \nSoda, Ice, Malibu Pineapple juice, Limeade, \nSoda, Ice, Malibu - 11-99-05-0001 - bn_Alcohol_ILYSB.png - - - posi1 - #N/A - #N/A #N/A
Noxious Nitrous Noxious Nitrous Mint syrup, Limeade, Ice, Rum Mint syrup, Limeade, Ice, Rum - 11-99-05-0002 - bn_Alcohol_Gale_Jail.png - - - posi1 - #N/A - #N/A #N/A

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

View file

@ -696,7 +696,7 @@
800628 Powder position ตำแหน่ง
800629 Powder drive all slot ทดสอบทุกช่อง
800630 Powder all position ทุกตำแหน่ง
800631 Full test ทดสอบทั้งหมด

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

View file

@ -0,0 +1,47 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.py
?>
Var Timeout = 0
Var RerunProCode = ""
Var FromRerunPro = 0
<?hurr
#include=menu_catalog_new_menu.py
?>
</EventOpen>
<?hurr
#include=menu_catalog_new.py
?>
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -13,7 +13,7 @@
Var img_press_main_page = "ROOT/taobin_project/image/main_page/bp_main_page_start.png"
Var CNTDOWN_PROTECT_SCREEN_BLANK = 180
Var CNTDOWN_PROTECT_SCREEN_BLANK = 120
DEBUGVAR SoundVolume
Var credit_card_enable = ""
@ -1134,13 +1134,21 @@
EndIf
If NoWaitMachineEnable = 1 Then
If RecoveryRunning = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
If stop_now = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
EndIf
Else
If MachineStage = "close-maintenance" Then
If InternationalEnable = 1 Then

File diff suppressed because it is too large Load diff

474
xml/page_drink_stuck.xml Normal file
View file

@ -0,0 +1,474 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<Sound> "ROOT/sounds/Ding-dong.wav" </Sound>
<EventOpen>
DEBUGVAR StarwState
DEBUGVAR LidState
DEBUGVAR Seeker.PictureDrink
DEBUGVAR Seeker.showname
Var buttonRemoveCup = "Invisible"
Var TextBottomShow = "Enable"
If show_eng = "true" Then
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
Else
Var DirImage2 = "ROOT/taobin_project/image/topping2"
EndIf
Var bg_strawlid_ST = "Enable"
Var bg_strawProblem_ST = "Invisible"
;Var bg_strawProblem_Y = 1470
Var bg_strawProblem = DirImage2 + "/bg_strawProblem.png"
Var straw_problem_flag = 0
If Seeker.strawAction = 1 Then
Machine Straw
;Var bg_strawlid = DirImage2 + "/bg_strawProblem.png"
Var bg_strawProblem_ST = "Enable"
If Seeker.lidAction = 0 Then
Else
;Var bg_strawProblem_Y = 1680
Var bg_strawlid_ST = "Invisible"
Var LidStateX = "Invisible"
Var StrawStateX = "Invisible"
EndIf
EndIf
If Seeker.lidAction = 1 Then
Machine Lid
EndIf
Var ExtendData = Seeker.ExtendData
; On open
Var LidState = "Enable"
Var StarwState = "Enable"
Var videoEnd = 0
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/complete_en/"
Else
Var DirImage = "ROOT/taobin_project/image/complete/"
EndIf
Var VideoPlayFile = VideoPath
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
Var VideoPlayFile = VideoPlayFile + "24"
Var VideoPlayFile = VideoPlayFile + VideoFileEnd
Var Timeout = 0
Var Timeout2 = 0
StopLongPlay
;Var show_eng = "false"
Var sendPayMultiFlag = 0
Var next_pic = ""
Var next_name = ""
Var nextCount = ""
Var next_pic_bg = ""
Var BlinkImg = 0
Var txtDrinkOKState = "Invisible"
Var MultiGo = 1
Var sendPayMultiFlag = 1
Var bg_strawlid_ST = "Invisible"
Var bg_strawProblem_ST = "Invisible"
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
LED LedDoorCup 1 255 255 255 255
Var DelayButton = 0
DEBUGVAR GetMoreStrawCount
If GetMoreStrawCount <= 0 Then
If StrawProblemStatus = 1 Then
Var bg_strawProblem_ST = "Enable"
EndIf
EndIf
</EventOpen>
<Timeout> 500 </Timeout>
<EventTimeout>
DEBUGVAR LastMakeDrinkResult
DEBUGVAR MachineStage
DEBUGVAR CupOnArm
DEBUGVAR buttonRemoveCup
DEBUGVAR CART_COUNT
DEBUGVAR HaveCup
DEBUGVAR CHECKCUP
DEBUGVAR CupChecking
DEBUGVAR MaybeHaveCup
DEBUGVAR NextOrder
DEBUGVAR DoorCupPosition
Var Timeout = Timeout + 1
If BrewTimeoutExtend = 1 Then
DEBUGVAR BrewTimeoutExtend
EndIf
If Timeout > 840 Then
SAVELOG "Longer Time out"
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup with close-maintenance"
Var error_code_stop_now = 1221
If DoorCupPosition = "bottom" Then
Else
Var error_code_stop_now = 1296
__CMD "error-code-1296" 0 "-" "-"
EndIf
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
If Timeout > 30 Then
Var MultiGo = 1
EndIf
If BlinkImg = 1 Then
Var next_pic_bg = DirImage + "/Preparing.png"
Var BlinkImg = 2
Else
If BlinkImg = 2 Then
Var next_pic_bg = DirImage + "/Preparing.png"
Var BlinkImg = 1
EndIf
EndIf
; Do not change
;
If MachineStage = "show-menu" Then
EndIf
If DoorCupPosition = "bottom" Then
Var buttonRemoveCup = "Enable"
Var txtDrinkOKState = "Enable"
EndIf
; away
If NextOrder = "true" Then
; Fast-forward to page_cannotConti
If RejectOrder = "true" Then
; BEGIN
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by RejectOrder"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
; END
EndIf
; next order set. Havecup and checkup value must false. Certain cup not on any arm.
If PaySuccessWithDaemonTask = 1 Then
Var NextOrder = "false"
SAVELOG "Make next order by pass"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
If HaveCup = "false" Then
If MaybeHaveCup = "true" Then
Else
If CupChecking = "true" Then
Else
If CupOnArm = "false" Then
If DoorCupPosition = "bottom" Then
; BEGIN
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
; END
Else
Machine DoorClose
EndIf
EndIf
EndIf
EndIf
EndIf
EndIf
EndIf
;
If MachineStage = "remove-cup" Then
If CART_COUNT = 0 Then
If NextOrder = "false" Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
Else
Var buttonRemoveCup = "Enable"
Var txtDrinkOKState = "Enable"
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
Var Timeout2 = 0
EndIf
EndIf
Else
Var buttonRemoveCup = "Enable"
Var txtDrinkOKState = "Enable"
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
Var Timeout2 = 0
EndIf
EndIf
EndIf
If Timeout = 5 Then
If show_eng = "true" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
; Play Sound #zone
If SoundBackToSchoolEnable = 1 Then
If SoundBackToSchoolType = 1 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
EndIf
If SoundBackToSchoolType = 2 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
EndIf
Var PlaySoundLag = RootPathSoundBackToSchool + "drinkfinish.wav"
EndIf
Play PlaySoundLag
EndIf
EndIf
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup with close-maintenance"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
EndIf
If txtDrinkOKState = "Enable" Then
Var TextBottomShow = "Invisible"
Else
Var TextBottomShow = "Enable"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventChangeStatus>
If ChangeStatus = "payout-end" Then
Var MultiGo = 1
EndIf
</EventChangeStatus>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Video>
<X> 0 </X>
<Y> 380 </Y>
<Refresh> "Reload" </Refresh>
<Loop> "true" </Loop>
<Filename> VideoPlayFile </Filename>
</Video>
<Image>
<X> 757 </X>
<Y> 424 </Y>
<Filename> next_pic_bg </Filename>
</Image>
<Image>
<X> 125 </X>
<Y> 1700 </Y>
<Height> 300 </Height>
<Width> 320 </Width>
<Filename> Seeker.PictureDrink </Filename>
</Image>
<Text>
<X> 300 </X>
<Y> 1750 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<Size> 48 </Size>
<Color> 0x513C2F </Color>
<Value>
eval(
STRCONTAIN "size" Seeker.showname SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.showname "###" 1 PureName
Var return = PureName
Else
Var return = Seeker.showname
EndIf
)
</Value>
</Text>
<Image>
<X> 0 </X>
<Y> 1418 </Y>
<State> TextBottomShow </State>
<Filename> Var( DirImage + "text_bottom.png") </Filename>
</Image>
<Text>
<X> 757 </X>
<Y> 448 </Y>
<Size> 20 </Size>
<Width> 280</Width>
<Align> Center </Align>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> nextCount </Value>
</Text>
<Text>
<X> 757 </X>
<Y> 538 </Y>
<Size> 20 </Size>
<Width> 280</Width>
<Align> Center </Align>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> next_name </Value>
</Text>
<Image>
<X> 823 </X>
<Y> 600 </Y>
<Width> 148 </Width>
<Height> 200 </Height>
<Filename> next_pic </Filename>
</Image>
<Image>
<X> 77 </X>
<Y> 1378 </Y>
<State> txtDrinkOKState </State>
<Filename> Var( DirImage + "/txtDrinkOK.png" ) </Filename>
</Image>
<Button>
<X> 160 </X>
<Y> 1673 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
<EventClick>
;Var buttonRemoveCup = "Invisible"
Machine RemoveCup
Machine DoorLidOpen
Refresh
</EventClick>
</Button>
<EventUnitTest1>
Var MachineStage = "show-menu"
</EventUnitTest1>
</Popup>

View file

@ -184,7 +184,7 @@
EndIf
Var TimeDelayDefault = 1200
</EventOpen>
<Timeout> 500 </Timeout>
@ -208,9 +208,23 @@
Var Timeout = Timeout + 1
; Timeout 10*60*2
If Timeout > 900 Then
SAVELOG "Timeout 900"
If BrewTimeoutExtend = 1 Then
DEBUGVAR BrewTimeoutExtend
EndIf
; 420 sec
If Timeout > 840 Then
Var CountForRetryStuck = 1
Open "ROOT/taobin_project/xml/page_drink_stuck.xml"
EndIf
; obsolete
If Timeout > TimeDelayDefault Then
SAVELOG "Longer Time out"
DEBUGVAR TimeDelayDefault
If NextOrder = "true" Then
Var NextOrder = "false"

View file

@ -145,6 +145,8 @@
Var Text2_9 = Text2_9 + ","
Var Text2_9 = Text2_9 + android_text3_2
Var strCountryName = " " + CountryName
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -713,6 +715,26 @@
<Value> "NDF Taobin 1.2.1" </Value>
</Text>
<Image>
<X> info1_startX </X>
<Y> info_11Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
</EventClick>
</Image>
<Text>
<X> info1_text_startX </X>
<Y> info_text_11Y </Y>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> strCountryName </Value>
</Text>
;<QRCode>
;<X> 930 </X>