diff --git a/campaign1/page_catalog.mp4 b/campaign1/page_catalog.mp4 deleted file mode 100644 index 8436b8f9..00000000 Binary files a/campaign1/page_catalog.mp4 and /dev/null differ diff --git a/campaign1/page_catalog_menu.mp4 b/campaign1/page_catalog_menu.mp4 deleted file mode 100644 index 7ab357cf..00000000 Binary files a/campaign1/page_catalog_menu.mp4 and /dev/null differ diff --git a/campaign1/page_main.mp4 b/campaign1/page_main.mp4 deleted file mode 100755 index 18a9df3f..00000000 Binary files a/campaign1/page_main.mp4 and /dev/null differ diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml index 81bd0e96..d5724498 100644 --- a/xml/page_catalog_choose_drink2.pml +++ b/xml/page_catalog_choose_drink2.pml @@ -40,6 +40,7 @@ product_code.append('12-01-02-0007') product_code.append('12-01-02-0008') product_code.append('12-01-02-0009') + product_code.append('11-01-02-0009') #product_code.append('') menu_count = len( product_code) diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 81a7fd04..2b3c1c32 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -2493,6 +2493,99 @@ showengText $12-01-02-0009.descriptionE + + ; button i=25 11-01-02-0009 + + 33 + 22 + 225 + 296 + $11-01-02-0009.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $11-01-02-0009.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $11-01-02-0009.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $11-01-02-0009.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $11-01-02-0009.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $11-01-02-0009.descriptionE + diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 2074315b..2287b9e1 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -6,48 +6,7 @@ SoundVolume ; On open - Var LidState = Lid1Status - ;Lid1Status - Var StarwState = "Enable" - Var LidStrawCountDown = 15 - - Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/" - Var VideoFileBegin = "TaoBin2_draft02_art" - Var VideoFileEnd = ".mp4" - - Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/" - Var PictureBegin = "txt_" - - If Lid1Status = "Disable" Then - Var LidState = "Invisible" - EndIf - - If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/page_lid_straw_en" - Var PictureEnd = "_en.png" - Var BottomText = PicturePath + "text_bottom_eng.png" - - Var lid_straw_bg_iamge = DirImage + "/img4.png" - - If LidState = "Enable" Then - Var lid_straw_bg_iamge = DirImage + "/img3.png" - EndIf - - Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Wait_a_moment.mp3" - Else - Var DirImage = "ROOT/taobin_project/image/page_lid_straw" - Var PictureEnd = ".png" - Var BottomText = PicturePath + "text_bottom_thai2.png" - - Var lid_straw_bg_iamge = DirImage + "/img4.png" - - If LidState = "Enable" Then - Var lid_straw_bg_iamge = DirImage + "/img3.png" - EndIf - - Play "ROOT/sounds/pleaseWait.wav" - EndIf Var CountUpBrewing = BrewTime - CountDownBrewing @@ -80,11 +39,65 @@ Var PictureFile = PictureFile + PictureEnd + Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/" + Var VideoFileBegin = "TaoBin2_draft02_art" + Var VideoFileEnd = ".mp4" + + Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/" + Var PictureBegin = "txt_" + If lidAndStrawOldPageIgnore = "true" Then Var lidAndStrawOldPageIgnore = "false" + + If StarwState = "Press" Then + Machine Straw + LED LedDoorLid Blink 255 255 255 255 + EndIf + If LidState = "Press" Then + Machine Lid + LED LedDoorLid Blink 255 255 255 255 + EndIf + Open "ROOT/taobin_project/xml/page_brewing3.xml" EndIf + Var LidState = Lid1Status + ;Lid1Status + Var StarwState = "Enable" + Var LidStrawCountDown = 15 + + + If Lid1Status = "Disable" Then + Var LidState = "Invisible" + EndIf + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/page_lid_straw_en" + Var PictureEnd = "_en.png" + Var BottomText = PicturePath + "text_bottom_eng.png" + + Var lid_straw_bg_iamge = DirImage + "/img4.png" + + If LidState = "Enable" Then + Var lid_straw_bg_iamge = DirImage + "/img3.png" + EndIf + + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Wait_a_moment.mp3" + + Else + Var DirImage = "ROOT/taobin_project/image/page_lid_straw" + Var PictureEnd = ".png" + Var BottomText = PicturePath + "text_bottom_thai2.png" + + Var lid_straw_bg_iamge = DirImage + "/img4.png" + + If LidState = "Enable" Then + Var lid_straw_bg_iamge = DirImage + "/img3.png" + EndIf + + Play "ROOT/sounds/pleaseWait.wav" + EndIf + STRCONTAIN "9701" BrewParam IgnoreLidStraw DEBUGVAR BrewParam diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 07d7a0d8..2ff388ce 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -38,14 +38,6 @@ DEBUGVAR LidState - If StarwState = "Press" Then - Machine Straw - LED LedDoorLid Blink 255 255 255 255 - EndIf - If LidState = "Press" Then - Machine Lid - LED LedDoorLid Blink 255 255 255 255 - EndIf diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index f743fa7d..0821ff68 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -10,6 +10,9 @@ DEBUGVAR video_menu_0 Var DisableUsingCode = "false" + Var ShowLidStraw = "Invisible" + Var ShowLidOnly = "Invisible" + Var ShowCollagenOnly = "Invisible" ; On open Var lidAndStrawOldPageIgnore = "true" @@ -36,8 +39,9 @@ Var topping1 = "1" - Var topping2 = "31" + Var topping3 = "31" + Var BugFlag = 0 @@ -95,13 +99,15 @@ 2000 - + DEBUGVAR Timeout Var Timeout = Timeout + 1 - If Timeout > 10 Then + If Timeout > 20 Then Var Timeout = 0 Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf + + TimerReset @@ -204,7 +210,10 @@ DEBUGVAR toppingID2Default DEBUGVAR toppingID3Default - + + DEBUGVAR toppingID2price2 + DEBUGVAR toppingID3price2 + DEBUGVAR BrewParam If BugFlag = 1 Then @@ -335,15 +344,15 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" - If toppingID1index3 = toppingID1Default Then + If toppingID1index1 = toppingID1Default Then Var SugarState3 = "PressForever" EndIf - If toppingID1index4 = toppingID1Default Then + If toppingID1index2 = toppingID1Default Then Var SugarState4 = "PressForever" EndIf - If toppingID1index5 = toppingID1Default Then + If toppingID1index3 = toppingID1Default Then Var SugarState5 = "PressForever" EndIf @@ -377,7 +386,7 @@ - + Var ShowCollagenOnly = "Enable" Var BugFlag = 1 @@ -394,16 +403,25 @@ EndIf Refresh - + Var collagenShow = "true" ;-BEGIN shot layout + Var topping3 = toppingID3Default + Var shot_h_layout = 218 + If TOPPING2 = "shot coffee" Then Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" - - - DEBUGVAR TOPPING2 + + DEBUGVAR TOPPING3 + If TOPPING3 = "Collagen" Then + + Var ShowCollagenOnly = "Invisible" + Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" + Var shot_h_layout = 310 + + EndIf Refresh EndIf @@ -422,11 +440,26 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + If TOPPING3 = "Collagen" Then + + Var ShowCollagenOnly = "Invisible" + Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" + Var shot_h_layout = 310 + + EndIf DEBUGVAR TOPPING2 Refresh EndIf + ;-END - + If TOPPING3 = "Collagen" Then + Var CollagenState = "Enable" + Else + Var CollagenState = "Invisible" + Var ShowCollagenOnly = "Invisible" + EndIf + + SAVELOG ToppingGotoPayment If ToppingGotoPayment = "true" Then @@ -766,7 +799,7 @@ ;-BEGIN shot layout 986 - 224 + shot_h_layout 5 ShotCoffeeBG @@ -788,7 +821,7 @@ If showShotEnable = "Press" Then Var showShotEnable = "Enable" - Var PriceDrinkTmp = PriceDrinkNoTop + Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 Var topping2 = toppingID2index1 Var DisableUsingCode = "false" Else @@ -798,6 +831,7 @@ Var DisableUsingCode = "true" EndIf + Var PriceDrinkNoTop = PriceDrinkTmp Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp SAVELOG PriceDrinkTmp @@ -821,16 +855,19 @@ If showShotEnable = "Press" Then Var showShotEnable = "Enable" - Var PriceDrinkTmp = PriceDrinkNoTop + Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 Var topping2 = toppingID2index1 Var DisableUsingCode = "false" Else Var showShotEnable = "Press" Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + Var topping2 = toppingID2index2 Var DisableUsingCode = "true" EndIf + Var PriceDrinkNoTop = PriceDrinkTmp + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp @@ -839,6 +876,69 @@ + + +; Collagen left + + + + ;-END ; @@ -875,7 +975,7 @@ If showShotEnable = "Press" Then Var showShotEnable = "Enable" - Var PriceDrinkTmp = PriceDrinkNoTop + Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 Var topping2 = toppingID2index1 Var DisableUsingCode = "false" Else @@ -885,6 +985,8 @@ Var DisableUsingCode = "true" EndIf + Var PriceDrinkNoTop = PriceDrinkTmp + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp SAVELOG PriceDrinkTmp @@ -908,7 +1010,7 @@ If showShotEnable = "Press" Then Var showShotEnable = "Enable" - Var PriceDrinkTmp = PriceDrinkNoTop + Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 Var topping2 = toppingID2index1 Var DisableUsingCode = "false" Else @@ -918,6 +1020,8 @@ Var DisableUsingCode = "true" EndIf + Var PriceDrinkNoTop = PriceDrinkTmp + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp @@ -926,6 +1030,68 @@ + + +; Collagen left + + + ;-END ; @@ -936,14 +1102,86 @@ ; ; ; -; +; +;-BEGIN Collagen + + 986 + 242 + 5 + ShowCollagenOnly + + "Enable" + Var( DirImage + "/img_ontop_collagen.png" ) + - + +; straw left + + + + + +;- END +; +; +; ;-BEGIN Lid straw 986 232 - 5 + 10 ShowLidOnly "Enable" @@ -1004,7 +1242,7 @@ 986 274 - 5 + 10 ShowLidStraw Var( DirImage + "/block_strawlid.png" )