diff --git a/image/topping_inter/bn_cancel.png b/image/topping_inter/bn_cancel.png new file mode 100644 index 00000000..8fe0df60 Binary files /dev/null and b/image/topping_inter/bn_cancel.png differ diff --git a/image/topping_inter/bn_next.png b/image/topping_inter/bn_next.png new file mode 100644 index 00000000..beb1c326 Binary files /dev/null and b/image/topping_inter/bn_next.png differ diff --git a/image/topping_inter/bp_cancel.png b/image/topping_inter/bp_cancel.png new file mode 100644 index 00000000..074ca526 Binary files /dev/null and b/image/topping_inter/bp_cancel.png differ diff --git a/image/topping_inter/bp_next.png b/image/topping_inter/bp_next.png new file mode 100644 index 00000000..e757aa04 Binary files /dev/null and b/image/topping_inter/bp_next.png differ diff --git a/video/brewing_adv3.mp4 b/video/brewing_adv3.mp4 index 518f5e18..bcc1ec1e 100755 Binary files a/video/brewing_adv3.mp4 and b/video/brewing_adv3.mp4 differ diff --git a/xml/page_board.xml b/xml/page_board.xml index ea84cdf9..72156e9b 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -588,7 +588,7 @@ EndIf DEBUGVAR CountryName - DEBUGVAR LanguageShow + DEBUGVAR LanguageListEnable DEBUGVAR DisplayFormat DEBUGVAR ScaleValueForCalculation DEBUGVAR PreScaleConvertShow @@ -757,38 +757,6 @@ EndIf - If TermTemOnline = "true" Then - - If CountDownShowButton = 31 Then - Var ShowButtonClickFull = "Enable" - Var ShowButtonClick = "Invisible" - Refresh - EndIf - - If CountDownShowButton = 3 Then - - Var ShowButtonClick = "Enable" - Var ShowButtonClickFull = "Invisible" - Refresh - EndIf - - If CountDownPauseVideo > 0 Then - ; ignore - Var CountDownPauseVideo = CountDownPauseVideo - 1 - If CountDownPauseVideo = 0 Then - - Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt__catalog_choose_drink1.xml" - - TopView "show" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" - - EndIf - EndIf - EndIf - If TimerFirst = "true" Then @@ -915,6 +883,7 @@ ; "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If CocktailShow = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 6f615ef6..9b896a25 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -48,29 +48,7 @@ ; Clear value Topping "clear" "-" - If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/page2_en/page2" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_en" - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var DirImage = "ROOT/taobin_project/image/page2" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_th" - - Var text_unavailable = "หมด###size=32" - EndIf - Var DirImage = "ROOT/taobin_project/image/page2_inter/" @@ -328,6 +306,7 @@ + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" @@ -338,6 +317,7 @@ EndIf Play PlaySoundLag + Var countDownRetrun = 300 Refresh diff --git a/xml/page_topping_select6.lxml b/xml/page_topping_select6.lxml index 10690407..42df631c 100644 --- a/xml/page_topping_select6.lxml +++ b/xml/page_topping_select6.lxml @@ -5,7 +5,7 @@ ; "0xeae6e1" SoundVolume - ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" Var UserSeletedSugar = 0 @@ -204,38 +204,31 @@ Var text_cold_color = "0x84776F" Var text_blender_color = "0x84776F" - If new_layout = "true" Then - Var PriceDrinkTmpShow = "---" + Var PriceDrinkTmpShow = "---" - Var show_select_type = "Enable" + Var show_select_type = "Enable" - Var hot_button_state = PD_STAGE_1 - Var cold_button_state = PD_STAGE_2 - Var blend_button_state = PD_STAGE_3 + Var hot_button_state = PD_STAGE_1 + Var cold_button_state = PD_STAGE_2 + Var blend_button_state = PD_STAGE_3 - ; Protect have product-code but menu disable or invalid. - If hot_button_state = "Invisible" Then + ; Protect have product-code but menu disable or invalid. + If hot_button_state = "Invisible" Then - Var hot_button_state = "Disable2" - EndIf - If cold_button_state = "Invisible" Then - - Var cold_button_state = "Disable2" - EndIf - If blend_button_state = "Invisible" Then - - Var blend_button_state = "Disable2" - EndIf - - - Function 2 - - Else - Var show_select_type = "Invisible" - - ; assume auto select - Var SelectDrinkType = 1 + Var hot_button_state = "Disable2" EndIf + If cold_button_state = "Invisible" Then + + Var cold_button_state = "Disable2" + EndIf + If blend_button_state = "Invisible" Then + + Var blend_button_state = "Disable2" + EndIf + + + Function 2 + DEBUGVAR show_select_type DEBUGVAR PriceD1 @@ -298,6 +291,8 @@ Var showname = aliasName[LanguageShowByIndex] Var showdesc = aliasName[LanguageShowByIndex] + + 1000 @@ -454,17 +449,20 @@ DEBUGVAR LanguageShowByIndex + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var topping_shot_price_x = 630 Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 + Var text_show_blend_x = 872 Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" EndIf If LanguageShow = "THAI" Then Var topping_shot_price_x = 600 Var text_x_add_oreo_price = 490 Var text_show_normal_x = 386 + Var text_show_blend_x = 852 Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf @@ -475,6 +473,8 @@ Var showname = aliasName[LanguageShowByIndex] Var showdesc = aliasName[LanguageShowByIndex] EndIf + + Var Timeout = 0 @@ -491,7 +491,7 @@ ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" Open OpenFromXML @@ -1373,6 +1373,8 @@ + + @@ -1475,6 +1486,13 @@ Var IndexDrinktType = 1 + + 40 + 8 + 60 + 42 + 000082 + @@ -1525,6 +1543,13 @@ Var IndexDrinktType = 2 + + 26 + 8 + 75 + 42 + 000083 + @@ -1545,7 +1570,10 @@ text_price_d2 - 852 + +; x for blend rng. + + text_show_blend_x 85 KanitRegularTTF 23 @@ -1553,15 +1581,7 @@ text_blender_color text_price_d3 - - 872 - 85 - KanitRegularTTF - text_show_eng - 23 - text_blender_color - text_price_d3 - + @@ -2907,7 +2927,7 @@ LidDeactiveButton 602 - 158 + 144 290 72 @@ -3025,12 +3045,12 @@ - - StrawDeactiveButton - 602 - 64 - Var( DirImage + "/text20.png" ) - +; +; StrawDeactiveButton +; 602 +; 64 +; Var( DirImage + "/text20.png" ) +; @@ -3059,8 +3079,8 @@ @@ -3163,8 +3190,8 @@ @@ -3471,12 +3512,15 @@ If SelectCountDrinkType = 1 Then If DefaultDrinkType = 1 Then Var hot_button_state = "PressForever" + Var IndexDrinktType = 0 EndIf If DefaultDrinkType = 2 Then Var cold_button_state = "PressForever" + Var IndexDrinktType = 1 EndIf If DefaultDrinkType = 3 Then Var blend_button_state = "PressForever" + Var IndexDrinktType = 2 EndIf EndIf diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 5f24945b..dad879b1 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -5,7 +5,7 @@ ; "0xeae6e1" SoundVolume - ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" Var UserSeletedSugar = 0 @@ -456,7 +456,7 @@ ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" Open OpenFromXML diff --git a/xml/topview2.xml b/xml/topview2.xml index 43c6787e..ff7010ff 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -9,7 +9,7 @@ 1000 - DEBUGVAR Top2Timeout + ;DEBUGVAR Top2Timeout Var Top2Timeout = Top2Timeout + 1 If Top2Timeout = 30 Then @@ -23,7 +23,7 @@ 1 1 KanitTTF - 40 + 20 1080 0xFF0000 "Beta" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index e1eea752..e7574ac4 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.98" - Var XMLPageVersionInt = 698 + Var XMLPageVersion = "6.99" + Var XMLPageVersionInt = 699