diff --git a/adv/taobin_adv_menu2_07.mp4 b/adv/taobin_adv_menu2_07.mp4 index ab9efdb5..37aea826 100644 Binary files a/adv/taobin_adv_menu2_07.mp4 and b/adv/taobin_adv_menu2_07.mp4 differ diff --git a/xml/menu_catalog_new.lxml b/xml/menu_catalog_new.lxml index fda32969..f65374ad 100644 --- a/xml/menu_catalog_new.lxml +++ b/xml/menu_catalog_new.lxml @@ -83,7 +83,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -95,7 +95,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -136,7 +136,7 @@ - + diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 5c33c00b..546898fd 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -301,9 +301,20 @@ "0xeae6e1" - + + + If LanguageShow = "ENG" Then + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" + EndIf + + If LanguageShow = "THAI" Then + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3" + EndIf + + Play PlaySoundLag + Refresh - + ; back diff --git a/xml/page_catalog_group_appfast.lxml b/xml/page_catalog_group_appfast.lxml index d55c4cb7..532a7241 100644 --- a/xml/page_catalog_group_appfast.lxml +++ b/xml/page_catalog_group_appfast.lxml @@ -230,7 +230,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -242,7 +242,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -283,7 +283,7 @@ - + diff --git a/xml/page_catalog_group_cocktail.lxml b/xml/page_catalog_group_cocktail.lxml index 804ac73c..9dcd93c1 100644 --- a/xml/page_catalog_group_cocktail.lxml +++ b/xml/page_catalog_group_cocktail.lxml @@ -222,7 +222,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -234,7 +234,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -275,7 +275,7 @@ - + diff --git a/xml/page_catalog_group_coffee.lxml b/xml/page_catalog_group_coffee.lxml index 36adc183..9954d19d 100644 --- a/xml/page_catalog_group_coffee.lxml +++ b/xml/page_catalog_group_coffee.lxml @@ -222,7 +222,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -234,7 +234,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -275,7 +275,7 @@ - + diff --git a/xml/page_catalog_group_forkid.lxml b/xml/page_catalog_group_forkid.lxml index d1b71396..9a1886b5 100644 --- a/xml/page_catalog_group_forkid.lxml +++ b/xml/page_catalog_group_forkid.lxml @@ -231,7 +231,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -243,7 +243,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -284,7 +284,7 @@ - + diff --git a/xml/page_catalog_group_health.lxml b/xml/page_catalog_group_health.lxml index 0e2d9675..ace99409 100644 --- a/xml/page_catalog_group_health.lxml +++ b/xml/page_catalog_group_health.lxml @@ -222,7 +222,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -234,7 +234,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -275,7 +275,7 @@ - + diff --git a/xml/page_catalog_group_milk.lxml b/xml/page_catalog_group_milk.lxml index 46b767d4..70ed2308 100644 --- a/xml/page_catalog_group_milk.lxml +++ b/xml/page_catalog_group_milk.lxml @@ -220,7 +220,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -232,7 +232,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -273,7 +273,7 @@ - + diff --git a/xml/page_catalog_group_other.lxml b/xml/page_catalog_group_other.lxml index 3bf95009..570761db 100644 --- a/xml/page_catalog_group_other.lxml +++ b/xml/page_catalog_group_other.lxml @@ -221,7 +221,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -233,7 +233,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -274,7 +274,7 @@ - + diff --git a/xml/page_catalog_group_recommend.lxml b/xml/page_catalog_group_recommend.lxml index 567f0e4e..69c5898c 100644 --- a/xml/page_catalog_group_recommend.lxml +++ b/xml/page_catalog_group_recommend.lxml @@ -228,7 +228,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -240,7 +240,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -281,7 +281,7 @@ - + diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index c7b9f281..07f921fc 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -1062,6 +1062,256 @@ PLANT PROTEIN" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; - - 12-03-03-0009 + + 33 + 22 + 225 + 296 + Flag( 12-03-03-0009.Button,Disable=Invisible,$Sum1203030009) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โอริโอ้ปั่นภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "นม น้ำตาล โอริโอ้ + " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OREO SMOOTHIE +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Sugar, Oreo" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0009.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0009.Button + StringFmt( $12-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1203030009 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0009.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203030009 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -9693,256 +9943,6 @@ SMOOTHIE" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 16 - ; - - 12-03-03-0009 - - 33 - 22 - 225 - 296 - Flag( 12-03-03-0009.Button,Disable=Invisible,$Sum1203030009) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โอริโอ้ปั่นภูเขาไฟ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "นม น้ำตาล โอริโอ้ - " - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "OREO SMOOTHIE -VOLCANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Sugar, Oreo" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0009.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0009.Button - StringFmt( $12-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1203030009 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0009.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1203030009 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog_group_tea.lxml b/xml/page_catalog_group_tea.lxml index eb4c5616..e84dd5b3 100644 --- a/xml/page_catalog_group_tea.lxml +++ b/xml/page_catalog_group_tea.lxml @@ -222,7 +222,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -234,7 +234,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -275,7 +275,7 @@ - + diff --git a/xml/page_catalog_group_whey.lxml b/xml/page_catalog_group_whey.lxml index bfe5b669..946a6fc6 100644 --- a/xml/page_catalog_group_whey.lxml +++ b/xml/page_catalog_group_whey.lxml @@ -227,7 +227,7 @@ TimerReset - + DEBUGVAR LanguageShow If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" @@ -239,7 +239,7 @@ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf RefreshAll - + ; under line @@ -280,7 +280,7 @@ - + diff --git a/xml/page_topping_select6.lxml b/xml/page_topping_select6.lxml index f70cfeca..e3b4985b 100644 --- a/xml/page_topping_select6.lxml +++ b/xml/page_topping_select6.lxml @@ -433,6 +433,26 @@ + + 1000 + 381 + show_btn + show_btp + "/mnt/sdcard/coffeevending/wav/click.wav" + SoundVolume + + ; + + + + + If show_eng = "true" Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" + Else + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + EndIf + + ;