diff --git a/inter/sgp/xml/event/dummy_layout_promotion.py b/inter/sgp/xml/event/dummy_layout_promotion.py index ea70899e..a547b79f 100644 --- a/inter/sgp/xml/event/dummy_layout_promotion.py +++ b/inter/sgp/xml/event/dummy_layout_promotion.py @@ -315,6 +315,9 @@ if "multi_promotion" in param: #read config multi_pro_config_file = open(directory_to_process + "/event/"+ filename) multi_pro_config = json.load(multi_pro_config_file) + + # if has any 'reorder' + order_list: list = [] index = 0 promotion_name = [] @@ -424,6 +427,33 @@ if "multi_promotion" in param: filter_sm = [ pd for pd in season_pass_menu[current_season] if pd.endswith("sm")] print("[SM] expect at least 4, ", len(filter_sm)) + has_reorder = "reorder" in promotion_config.keys() + # interact_idx = (-1, -1) + # do load list + if has_reorder: + print("reorder mode") + order_list = promotion_config["reorder"] + print(json.dumps(order_list, indent=2), " while ", json.dumps(filter_sm, indent=2)) + buffer_key = "" + # sort by has_order + for filtered in filter_sm: + print("try reorder", filtered, order_list) + # get index from order + expect_index = order_list.index(filtered) + # interact_idx[0] = expect_index + print("get expect = ", expect_index) + current_index = filter_sm.index(filtered) + # interact_idx[1] = current_index + print("get current = ", current_index) + is_matched_index = expect_index != -1 and expect_index == current_index + print(f"check match {filtered}: ", not is_matched_index) + if not is_matched_index: + print(f"swap current={filtered}@{current_index} to position@{expect_index} was {filter_sm[expect_index]}") + buffer_key = filter_sm[expect_index] + filter_sm[expect_index] = filtered + filter_sm[current_index] = buffer_key + buffer_key = "" + # try get block generated_block_buffer = "" for sm_menu in filter_sm: diff --git a/inter/sgp/xml/event/multi_promotion_config_season1.json b/inter/sgp/xml/event/multi_promotion_config_season1.json index 4fd8fd5f..36592fda 100644 --- a/inter/sgp/xml/event/multi_promotion_config_season1.json +++ b/inter/sgp/xml/event/multi_promotion_config_season1.json @@ -11,7 +11,13 @@ "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bd_hot_caramel_latte.png", "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bd_hot_caramel_latte.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" - } + }, + "reorder": [ + "-.52-05-02-0076.-.sm", + "52-21-01-0004.52-21-02-0002.52-21-03-0002.sm", + "52-02-01-0024.52-02-02-0024.52-02-03-0024.sm", + "-.52-05-02-0025.52-05-03-0025.sm" + ] }, { "name": "s1topright", diff --git a/inter/sgp/xml/event/multi_promotion_config_season2.json b/inter/sgp/xml/event/multi_promotion_config_season2.json index 8e6dbb45..baf7f015 100644 --- a/inter/sgp/xml/event/multi_promotion_config_season2.json +++ b/inter/sgp/xml/event/multi_promotion_config_season2.json @@ -11,7 +11,13 @@ "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_mocha.png", "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_mocha.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" - } + }, + "reorder": [ + "-.52-05-02-0045.-.sm", + "52-21-01-0005.52-31-02-0002.52-31-03-0002.sm", + "52-02-01-0026.52-02-02-0026.52-02-03-0026.sm", + "-.52-05-02-0074.52-05-03-0074.sm" + ] }, { "name": "s2topright", diff --git a/inter/sgp/xml/event/multi_promotion_config_season3.json b/inter/sgp/xml/event/multi_promotion_config_season3.json index e50eeb44..9ac63c0c 100644 --- a/inter/sgp/xml/event/multi_promotion_config_season3.json +++ b/inter/sgp/xml/event/multi_promotion_config_season3.json @@ -11,7 +11,13 @@ "disable_eng": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png", "disable_thai": "ROOT/taobin_project/inter/sgp/image/event/season_pass/bn_hot_cappuccino.png", "event_on_click": "ROOT/taobin_project/xml/page_topping_select6.lxml" - } + }, + "reorder": [ + "-.52-05-02-0117.-.sm", + "52-21-01-0003.52-21-02-0001.-.sm", + "52-02-01-0039.52-02-02-0039.52-02-03-0039.sm", + "-.52-05-02-0033.52-05-03-0033.sm" + ] }, { "name": "s3topright", diff --git a/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml b/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml index 1232c321..987ee8c2 100644 --- a/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml +++ b/inter/sgp/xml/event/triple_promotion_s1topleft_and_s1topright_and_s1botleft.lxml @@ -1233,6 +1233,291 @@ eval( Var block_index_move = 0 ; ==================> Len = 3 + ; - 52-05-02-0076 - + + 33 + 22 + 225 + 296 + Flag( 52-05-02-0076.Button,Disable=Invisible,Disable=Invisible,$Sum5205020076) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + PEPSI YUZU + เป๊ปซี่ยูซุ + PEPSI YUZU + เป๊ปซี่ยูซุ + + เป๊ปซี่ยูซุ + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Pepsi, Yuzu Syrup& Ice + เป๊ปซี่ น้ำเชื่อมยูซุ โซดา + Pepsi, Yuzu Syrup& Ice + เป๊ปซี่ น้ำเชื่อมยูซุ โซดา + + เป๊ปซี่ น้ำเชื่อมยูซุ โซดา + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $52-05-02-0076.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $52-05-02-0076.Button + StringFmt( $52-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.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 $Sum5205020076 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $52-05-02-0076.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.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 + "disable-show" + $Sum5205020076 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 ; 52-21-01-0004 52-21-02-0002 52-21-03-0002 33 @@ -1540,83 +1825,83 @@ eval( ; ==================> Len = 3 - ; - 52-05-02-0076 - + ; 52-02-01-0039 52-02-02-0039 52-02-03-0039 33 22 225 296 - Flag( 52-05-02-0076.Button,Disable=Invisible,Disable=Invisible,$Sum5205020076) + Flag( 52-02-01-0039.Button,52-02-02-0039.Button,52-02-03-0039.Button,Disable=Invisible,$Sum520201003952020200395202030039) - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - THAI MILK TEA - ชานมไทย - THAI MILK TEA - ชานมไทย - - ชานมไทย - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Thai tea, Sugar, milk - ชาไทย และ นม - Thai tea, Sugar, milk - ชาไทย และ นม - - ชาไทย และ นม - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $52-02-01-0039.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $52-02-01-0039.Button - StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $52-02-02-0039.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $52-02-02-0039.Button - StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $52-02-03-0039.Button - - - TextPriceMenuBlendX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $52-02-03-0039.Button - StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum520201003952020200395202030039 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum520201003952020200395202030039 = "Disable" Then - STRCONTAIN "ERR" $52-02-01-0039.TAG tag1_is_disable - STRCONTAIN "ERR" $52-02-02-0039.TAG tag2_is_disable - STRCONTAIN "ERR" $52-02-03-0039.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 - "disable-show" - $Sum520201003952020200395202030039 - - 000013 - - center-vertical-horizontal - - diff --git a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml index db3f1dc4..ea2ab7ad 100644 --- a/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml +++ b/inter/sgp/xml/event/triple_promotion_s2topleft_and_s2topright_and_s2botleft.lxml @@ -1233,35 +1233,35 @@ eval( Var block_index_move = 0 ; ==================> Len = 3 - ; 52-02-01-0026 52-02-02-0026 52-02-03-0026 + ; - 52-05-02-0045 - 33 22 225 296 - Flag( 52-02-01-0026.Button,52-02-02-0026.Button,52-02-03-0026.Button,Disable=Invisible,Disable=Invisible,$Sum520201002652020200265202030026) + Flag( 52-05-02-0045.Button,Disable=Invisible,$Sum5205020045) + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + THAI MILK TEA + ชานมไทย + THAI MILK TEA + ชานมไทย + + ชานมไทย + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Thai tea, Sugar, milk + ชาไทย และ นม + Thai tea, Sugar, milk + ชาไทย และ นม + + ชาไทย และ นม + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $52-02-01-0039.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $52-02-01-0039.Button + StringFmt( $52-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $52-21-02-0001.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $52-02-02-0039.Button + StringFmt( $52-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $52-02-03-0039.Button + StringFmt( $52-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum520201003952020200395202030039 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum520201003952020200395202030039 = "Disable" Then + STRCONTAIN "ERR" $52-02-01-0039.TAG tag1_is_disable + STRCONTAIN "ERR" $52-02-02-0039.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0039.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 + "disable-show" + $Sum520201003952020200395202030039 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 ; 52-21-01-0003 52-21-02-0001 - 33 @@ -1515,83 +1822,83 @@ eval( ; ==================> Len = 3 - ; 52-02-01-0039 52-02-02-0039 52-02-03-0039 + ; - 52-05-02-0117 - 33 22 225 296 - Flag( 52-02-01-0039.Button,52-02-02-0039.Button,52-02-03-0039.Button,Disable=Invisible,$Sum520201003952020200395202030039) + Flag( 52-05-02-0117.Button,Disable=Invisible,$Sum5205020117) - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - COCONUT PEPSI - - COCONUT PEPSI - - - - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Coconut Syrup, Pepsi and Soda - - Coconut Syrup, Pepsi and Soda - - - - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $52-05-02-0117.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $52-05-02-0117.Button - StringFmt( $52-05-02-0117.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - TextPriceMenuBlendX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.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 $Sum5205020117 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $52-05-02-0117.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.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 - "disable-show" - $Sum5205020117 - - 000013 - - center-vertical-horizontal - - diff --git a/inter/sgp/xml/page_catalog_group_recommend.lxml b/inter/sgp/xml/page_catalog_group_recommend.lxml index 5e7fcdba..3e6f34a4 100644 --- a/inter/sgp/xml/page_catalog_group_recommend.lxml +++ b/inter/sgp/xml/page_catalog_group_recommend.lxml @@ -1,643 +1,643 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - DEBUGVAR LanguageShow - DEBUGVAR CountryName - - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var DirImage = "ROOT/taobin_project/image/page3" - EndIf - - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - ;inter-image - If CountryName = "Australia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - Var Menu1Selected = "PressForever" - - Var OreoBigButtonEnable = "Enable" - - If $12-01-01-0001.Button = "Invisible" Then - Var esp102101001Enable = "Invisible" - Var esp122101001Enable = "Enable" - - Else - Var esp102101001Enable = "Enable" - Var esp122101001Enable = "Invisible" - - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If show_eng = "true" Then - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var text_unavailable = "หมด###size=32" - - EndIf - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - - DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Var ice_tab_text = "Ice will be ready at " - EndIf - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - ;inter-image - If CountryName = "Malaysia" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var ice_tab_text = "Ice will be ready at " - EndIf - - SAVELOG "EventLanguageOnChange menu -list" - - Refresh - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - - - - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 - 462 - 22 - 170 - 30 - KanitMediumTTF - 0x6F5F51 - PriceUnitText - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + DEBUGVAR LanguageShow + DEBUGVAR CountryName + + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + ;inter-image + If CountryName = "Australia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + Var Menu1Selected = "PressForever" + + Var OreoBigButtonEnable = "Enable" + + If $12-01-01-0001.Button = "Invisible" Then + Var esp102101001Enable = "Invisible" + Var esp122101001Enable = "Enable" + + Else + Var esp102101001Enable = "Enable" + Var esp122101001Enable = "Invisible" + + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + If show_eng = "true" Then + + Var text_unavailable = "UNAVAILABLE###size=16" + Else + Var text_unavailable = "หมด###size=32" + + EndIf + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Var ice_tab_text = "Ice will be ready at " + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + ;inter-image + If CountryName = "Malaysia" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + EndIf + + SAVELOG "EventLanguageOnChange menu -list" + + Refresh + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 - 38 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + + + + + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 940 + 462 + 22 + 170 + 30 + KanitMediumTTF + 0x6F5F51 + PriceUnitText + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + 16 10 @@ -647,8 +647,8 @@ "Vertical" 4 ;dummy_layout.inc ; menu_new_list 39 @@ -1041,7 +1041,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0001" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -1609,7 +1609,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0003" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0003, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -1618,7 +1618,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-21-02-0001" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -8045,7 +8045,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-21-01-0004" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-21-01-0004, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png") @@ -8054,7 +8054,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-21-02-0002" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") @@ -8063,7 +8063,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-21-03-0002" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-21-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -8631,7 +8631,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-02-01-0026" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-02-01-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -8640,7 +8640,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0026" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") @@ -8649,7 +8649,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0026" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0026, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -9217,7 +9217,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0002" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -9226,7 +9226,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0002" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_3_posi1.png") @@ -9235,7 +9235,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0002" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_4_posi1.png") @@ -9524,7 +9524,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0001" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png") @@ -9533,7 +9533,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0001" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png") @@ -9542,7 +9542,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0001" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png") @@ -10106,7 +10106,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0011" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0011, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png") @@ -10391,7 +10391,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0022" Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_15_posi1.png") @@ -10400,7 +10400,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0022" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png") @@ -10409,7 +10409,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0022" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0022, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_16_posi1.png") @@ -10698,7 +10698,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0009" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0009, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi2.png") @@ -11258,7 +11258,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0049" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0049, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_14_posi1.png") @@ -11543,7 +11543,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0062" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") @@ -11828,7 +11828,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0076" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0076, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_4_posi1.png") @@ -12113,7 +12113,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0035" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0035, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png") @@ -12398,7 +12398,7 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - + If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0025" Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_9_posi1.png") @@ -12407,7 +12407,7 @@ Else Var OverlayMenuFilter = "" EndIf - + If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0025" Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0025, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_12_posi1.png") @@ -12596,28 +12596,28 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - -;BigLogoLayout - - - - + + + + + + + +;BigLogoLayout + + + + diff --git a/inter/sgp/xml/page_collect_point_3.lxml b/inter/sgp/xml/page_collect_point_3.lxml index 82e3a4ac..3042b592 100644 --- a/inter/sgp/xml/page_collect_point_3.lxml +++ b/inter/sgp/xml/page_collect_point_3.lxml @@ -1109,7 +1109,7 @@ - -