diff --git a/image/collectiing/bd_pay_with_codeAEON.png b/image/collectiing/bd_pay_with_codeAEON.png new file mode 100644 index 00000000..0660c1c5 Binary files /dev/null and b/image/collectiing/bd_pay_with_codeAEON.png differ diff --git a/image/collectiing/bn_pay_with_codeAEON.png b/image/collectiing/bn_pay_with_codeAEON.png new file mode 100644 index 00000000..9b0240d7 Binary files /dev/null and b/image/collectiing/bn_pay_with_codeAEON.png differ diff --git a/image/collectiing/bp_pay_with_codeAEON.png b/image/collectiing/bp_pay_with_codeAEON.png new file mode 100644 index 00000000..027127a5 Binary files /dev/null and b/image/collectiing/bp_pay_with_codeAEON.png differ diff --git a/image/collectiing/img_popupAEON.png b/image/collectiing/img_popupAEON.png new file mode 100644 index 00000000..2e4dc4a6 Binary files /dev/null and b/image/collectiing/img_popupAEON.png differ diff --git a/image/collectiing/img_popupGrab2.png b/image/collectiing/img_popupGrab2.png new file mode 100644 index 00000000..6ff6ac5b Binary files /dev/null and b/image/collectiing/img_popupGrab2.png differ diff --git a/image/collectiing/text_43_2.png b/image/collectiing/text_43_2.png new file mode 100644 index 00000000..fb07e2af Binary files /dev/null and b/image/collectiing/text_43_2.png differ diff --git a/image/collectiing/text_46.png b/image/collectiing/text_46.png new file mode 100644 index 00000000..a3c752a9 Binary files /dev/null and b/image/collectiing/text_46.png differ diff --git a/image/collectiing_en/bd_pay_with_codeAEON.png b/image/collectiing_en/bd_pay_with_codeAEON.png new file mode 100644 index 00000000..0660c1c5 Binary files /dev/null and b/image/collectiing_en/bd_pay_with_codeAEON.png differ diff --git a/image/collectiing_en/bn_pay_with_codeAEON.png b/image/collectiing_en/bn_pay_with_codeAEON.png new file mode 100644 index 00000000..9b0240d7 Binary files /dev/null and b/image/collectiing_en/bn_pay_with_codeAEON.png differ diff --git a/image/collectiing_en/bp_pay_with_codeAEON.png b/image/collectiing_en/bp_pay_with_codeAEON.png new file mode 100644 index 00000000..027127a5 Binary files /dev/null and b/image/collectiing_en/bp_pay_with_codeAEON.png differ diff --git a/image/collectiing_en/img_popupAEON.png b/image/collectiing_en/img_popupAEON.png new file mode 100644 index 00000000..2e4dc4a6 Binary files /dev/null and b/image/collectiing_en/img_popupAEON.png differ diff --git a/image/collectiing_en/img_popupGrab2.png b/image/collectiing_en/img_popupGrab2.png new file mode 100644 index 00000000..6ff6ac5b Binary files /dev/null and b/image/collectiing_en/img_popupGrab2.png differ diff --git a/image/collectiing_en/text_43_2.png b/image/collectiing_en/text_43_2.png new file mode 100644 index 00000000..b5cea476 Binary files /dev/null and b/image/collectiing_en/text_43_2.png differ diff --git a/image/collectiing_en/text_46.png b/image/collectiing_en/text_46.png new file mode 100644 index 00000000..2591d2d8 Binary files /dev/null and b/image/collectiing_en/text_46.png differ diff --git a/image/menu_overlay_set/button_overlay_A_posi1.png b/image/menu_overlay_set/button_overlay_A_posi1.png new file mode 100644 index 00000000..9e4e88eb Binary files /dev/null and b/image/menu_overlay_set/button_overlay_A_posi1.png differ diff --git a/image/menu_overlay_set/button_overlay_A_posi2.png b/image/menu_overlay_set/button_overlay_A_posi2.png new file mode 100644 index 00000000..f5321df9 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_A_posi2.png differ diff --git a/image/menu_overlay_set/button_overlay_B_posi1.png b/image/menu_overlay_set/button_overlay_B_posi1.png new file mode 100644 index 00000000..035c80e0 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_B_posi1.png differ diff --git a/image/menu_overlay_set/button_overlay_B_posi2.png b/image/menu_overlay_set/button_overlay_B_posi2.png new file mode 100644 index 00000000..1ccec39e Binary files /dev/null and b/image/menu_overlay_set/button_overlay_B_posi2.png differ diff --git a/image/menu_overlay_set/button_overlay_C_posi1.png b/image/menu_overlay_set/button_overlay_C_posi1.png new file mode 100644 index 00000000..134d6bb0 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_C_posi1.png differ diff --git a/image/menu_overlay_set/button_overlay_C_posi2.png b/image/menu_overlay_set/button_overlay_C_posi2.png new file mode 100644 index 00000000..ddf60f69 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_C_posi2.png differ diff --git a/image/menu_overlay_set/button_overlay_D_posi1.png b/image/menu_overlay_set/button_overlay_D_posi1.png new file mode 100644 index 00000000..aec1e643 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_D_posi1.png differ diff --git a/image/menu_overlay_set/button_overlay_D_posi2.png b/image/menu_overlay_set/button_overlay_D_posi2.png new file mode 100644 index 00000000..0e4b4c54 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_D_posi2.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_A.png b/image/menu_overlay_set/button_overlay_catalog_A.png new file mode 100644 index 00000000..23fa2427 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_A.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_A_posi1.png b/image/menu_overlay_set/button_overlay_catalog_A_posi1.png new file mode 100644 index 00000000..23fa2427 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_A_posi1.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_A_posi2.png b/image/menu_overlay_set/button_overlay_catalog_A_posi2.png new file mode 100644 index 00000000..fd0598c5 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_A_posi2.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_B.png b/image/menu_overlay_set/button_overlay_catalog_B.png new file mode 100644 index 00000000..fa6e3a3e Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_B.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_B_posi1.png b/image/menu_overlay_set/button_overlay_catalog_B_posi1.png new file mode 100644 index 00000000..fa6e3a3e Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_B_posi1.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_B_posi2.png b/image/menu_overlay_set/button_overlay_catalog_B_posi2.png new file mode 100644 index 00000000..edc14f68 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_B_posi2.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_C.png b/image/menu_overlay_set/button_overlay_catalog_C.png new file mode 100644 index 00000000..1af3e6ca Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_C.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_C_posi1.png b/image/menu_overlay_set/button_overlay_catalog_C_posi1.png new file mode 100644 index 00000000..1af3e6ca Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_C_posi1.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_C_posi2.png b/image/menu_overlay_set/button_overlay_catalog_C_posi2.png new file mode 100644 index 00000000..b8073959 Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_C_posi2.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_D.png b/image/menu_overlay_set/button_overlay_catalog_D.png new file mode 100644 index 00000000..128b0ffa Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_D.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_D_posi1.png b/image/menu_overlay_set/button_overlay_catalog_D_posi1.png new file mode 100644 index 00000000..128b0ffa Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_D_posi1.png differ diff --git a/image/menu_overlay_set/button_overlay_catalog_D_posi2.png b/image/menu_overlay_set/button_overlay_catalog_D_posi2.png new file mode 100644 index 00000000..01c83e9c Binary files /dev/null and b/image/menu_overlay_set/button_overlay_catalog_D_posi2.png differ diff --git a/inter/sgp/xml/menu_new_layout_gen_v2.py b/inter/sgp/xml/menu_new_layout_gen_v2.py index 63f4fd67..8408b86d 100644 --- a/inter/sgp/xml/menu_new_layout_gen_v2.py +++ b/inter/sgp/xml/menu_new_layout_gen_v2.py @@ -1,6 +1,7 @@ if "v2" in param: def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code): print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] ) + # print("raw splitted line : ",spl) out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') menu_img = spl[ idx_img][1] out_xml( '\t; '+ str_hot_product_code + ' ' + str_cold_product_code + ' ' + str_blend_product_code+ ' \r\n') @@ -67,6 +68,42 @@ out_xml( '\t "' + new_default_dir + '/'+ menu_img +'" \r\n') out_xml( '\t "' + new_default_dir_press + '/'+ menu_img +'" \r\n') out_xml( '\t "' + new_default_dir_disable + '/'+ menu_img +'" \r\n') + + # overlay + + overlay_position = "_"+spl[idx_img][7] + + overlay_string1 = "" + overlay_string2 = "" + overlay_string3 = "" + gradePD1 = getOverlayGrade(pd_code_1) + gradePD2 = getOverlayGrade(pd_code_2) + gradePD3 = getOverlayGrade(pd_code_3) + print("gradePD1 ", gradePD1, "gradePD2 ", gradePD2, "gradePD3 ", gradePD3) + + if gradePD1 != None or gradePD2 != None or gradePD3 != None: + if getOverlayGrade(pd_code_1) != None: + overlay_string1 += 'xmlpro( '+pd_code_1+', '+'"ROOT/taobin_project/image/menu_overlay_set/button_overlay_'+gradePD1+overlay_position+'.png")' + + if getOverlayGrade(pd_code_2) != None: + overlay_string2 += 'xmlpro( '+pd_code_2+', '+'"ROOT/taobin_project/image/menu_overlay_set/button_overlay_'+gradePD2+overlay_position+'.png")' + + if getOverlayGrade(pd_code_3) != None: + overlay_string3 += 'xmlpro( '+pd_code_3+', '+'"ROOT/taobin_project/image/menu_overlay_set/button_overlay_'+gradePD3+overlay_position+'.png")' + # Overlay Tag for catalog page + # TODO: check if cold pd is available first then blend and hot + overlay_tag1 = overlay_string1.replace("button_overlay_", "button_overlay_catalog_") + overlay_tag2 = overlay_string2.replace("button_overlay_", "button_overlay_catalog_") + overlay_tag3 = overlay_string3.replace("button_overlay_", "button_overlay_catalog_") + + if overlay_string2 != "": + out_xml( '\t ' + overlay_tag2 + ' \r\n') + elif overlay_string3 != "": + out_xml( '\t ' + overlay_tag3 + ' \r\n') + elif overlay_string1 != "": + out_xml( '\t ' + overlay_tag1 + ' \r\n') + + out_xml( '\t "/mnt/sdcard/coffeevending/wav/click.wav" \r\n') out_xml( '\t SoundVolume \r\n') out_xml( '\t \r\n') @@ -182,6 +219,44 @@ out_xml( '\t\tVar SelectDrinkType = 0\r\n') + # Overlay Filter + out_xml( '\t\tVar OverlayMenuFilter = \"\"\r\n') + out_xml( '\t\tVar OverlayMenuFilter1 = \"\"\r\n') + out_xml( '\t\tVar OverlayMenuFilter2 = \"\"\r\n') + out_xml( '\t\tVar OverlayMenuFilter3 = \"\"\r\n') + def get_overlay_filter( stage: int, pd_code: str, assign_args: str) -> str: + + # overlay stage + overlay_stage = "OverlayMenuFilter"+str(stage) + overlay_stage_value = "OverlayMenuFilter"+str(stage)+"_Value" + + # if block + if_block = "\n\t\tIf PD_STAGE_"+str(stage)+" = \"Enable\" Then\r\n" + if_block += "\t\t\tVar "+overlay_stage+" = \""+pd_code+"\"\r\n" + if_block += "\t\t\tVar "+overlay_stage_value+" !assigned "+assign_args+"\r\n" + if_block += "\t\t\tDEBUGVAR "+overlay_stage+"\r\n" + if_block += "\t\t\tDEBUGVAR "+overlay_stage_value+"\r\n" + + # else block + else_block = "\t\tElse\r\n" + else_block += "\t\t\tVar OverlayMenuFilter = \"\"\r\n" + else_block += "\t\tEndIf\r\n" + + if pd_code == "": + return "" + else: + return if_block + else_block + + if overlay_string1 != "": + out_xml( get_overlay_filter(1, pd_code_1, overlay_string1)) + if overlay_string2 != "": + out_xml( get_overlay_filter(2, pd_code_2, overlay_string2)) + if overlay_string3 != "": + out_xml(get_overlay_filter(3, pd_code_3, overlay_string3)) + + + + out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select6.lxml"\r\n') diff --git a/inter/sgp/xml/page_catalog_group_appfast.lxml b/inter/sgp/xml/page_catalog_group_appfast.lxml index a95b04fd..b3ee2055 100644 --- a/inter/sgp/xml/page_catalog_group_appfast.lxml +++ b/inter/sgp/xml/page_catalog_group_appfast.lxml @@ -740,6 +740,10 @@ DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var OverlayMenuFilter = "" + Var OverlayMenuFilter1 = "" + Var OverlayMenuFilter2 = "" + Var OverlayMenuFilter3 = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1002,6 +1006,10 @@ DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var OverlayMenuFilter = "" + Var OverlayMenuFilter1 = "" + Var OverlayMenuFilter2 = "" + Var OverlayMenuFilter3 = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1264,6 +1272,10 @@ DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var OverlayMenuFilter = "" + Var OverlayMenuFilter1 = "" + Var OverlayMenuFilter2 = "" + Var OverlayMenuFilter3 = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1526,6 +1538,10 @@ DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var OverlayMenuFilter = "" + Var OverlayMenuFilter1 = "" + Var OverlayMenuFilter2 = "" + Var OverlayMenuFilter3 = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -1788,6 +1804,10 @@ DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var OverlayMenuFilter = "" + Var OverlayMenuFilter1 = "" + Var OverlayMenuFilter2 = "" + Var OverlayMenuFilter3 = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/inter/sgp/xml/page_catalog_group_coffee.lxml b/inter/sgp/xml/page_catalog_group_coffee.lxml index 14ed3800..a913bb44 100644 --- a/inter/sgp/xml/page_catalog_group_coffee.lxml +++ b/inter/sgp/xml/page_catalog_group_coffee.lxml @@ -731,6 +731,10 @@ DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 + Var OverlayMenuFilter = "" + Var OverlayMenuFilter1 = "" + Var OverlayMenuFilter2 = "" + Var OverlayMenuFilter3 = "" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -910,9 +914,16 @@ Flag( 52-21-01-0001.Button,$Sum5221010001) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 217 + 868 + Var( DirImage + "/img3.png" ) + + + + 244 + 882 + ShowTextNumber + "Enable" + Var( DirImage + "/text_12.png" ) + + + + + 0 + 883 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber# + + + + + + + 188 + 760 + Var( DirImage + "/text_46.png" ) + + + + 152 + 1001 + "Enable" + ShowErrorText + text_show_error + + + + 158 + 513 + Var( DirImage + "/img_popupAEON.png" ) + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + + + diff --git a/xml/page_payment_codeGrab.xml b/xml/page_payment_codeGrab.xml index 7a1f5751..ce03452e 100644 --- a/xml/page_payment_codeGrab.xml +++ b/xml/page_payment_codeGrab.xml @@ -744,7 +744,7 @@ 188 760 - Var( DirImage + "/text_43.png" ) + Var( DirImage + "/text_43_2.png" ) @@ -758,7 +758,7 @@ 158 513 - Var( DirImage + "/img_popupGrab.png" ) + Var( DirImage + "/img_popupGrab2.png" ) diff --git a/xml/page_payment_codeOther.xml b/xml/page_payment_codeOther.xml index 6b0c9a8f..68d7c6c3 100644 --- a/xml/page_payment_codeOther.xml +++ b/xml/page_payment_codeOther.xml @@ -164,22 +164,6 @@ 441 937 "Enable" - "ROOT/taobin_project/image/collectiing/bn_pay_with_codeInfinyx.png" - "ROOT/taobin_project/image/collectiing/bp_pay_with_codeInfinyx.png" - "ROOT/taobin_project/image/collectiing/bd_pay_with_codeInfinyx.png" - "ROOT/sounds/codebuttom.wav" - SoundVolume - - - Open "ROOT/taobin_project/xml/page_payment_codeInfinyx.xml" - - - - - + + - - + +