Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

This commit is contained in:
Pakin 2023-11-17 07:54:24 +07:00
commit 8320165273
46 changed files with 5949 additions and 905 deletions

View file

@ -1,6 +1,7 @@
if "v2" in param:
print("Version 1 ignore ")
else:
menu_xml_var = ""
if current_file_name == "page_catalog_group_recommend.skt":
touch_less_gen = True
else:
@ -204,10 +205,9 @@
out_xml( '\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\r\n')
out_xml( '\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\r\n')
out_xml( '\t\tVar OverlayMenuFilter !assigned ' + menu_xml_var + '\r\n')
out_xml( '\t\tDEBUGVAR OverlayMenuFilter\r\n')
if len( menu_xml_var) > 0:
out_xml( '\t\tVar OverlayMenuFilter !assigned ' + menu_xml_var + '\r\n')
out_xml( '\t\tDEBUGVAR OverlayMenuFilter\r\n')
@ -676,7 +676,7 @@
out_xml( '\t<FilenameDisable> "' + new_default_dir_disable + '/'+ menu_img +'" </FilenameDisable>\r\n')
out_xml( '\t<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
out_xml( '\t<Volume> SoundVolume </Volume>\r\n')
if len( spl) > 11:
if len( spl) > 99:
if spl[8] != '-':
out_xml( '\t<OverlayImage> xmlpro( '+spl[8]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_'+ spl[11] +'.png") </OverlayImage>\r\n')
menu_xml_var = 'xmlpro( '+spl[8]+', "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_'+ spl[11] +'.png")'
@ -711,9 +711,9 @@
out_xml( '\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\r\n')
out_xml( '\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\r\n')
out_xml( '\t\tVar OverlayMenuFilter !assigned ' + menu_xml_var + '\r\n')
out_xml( '\t\tDEBUGVAR OverlayMenuFilter\r\n')
if len( menu_xml_var) > 0:
out_xml( '\t\tVar OverlayMenuFilter !assigned ' + menu_xml_var + '\r\n')
out_xml( '\t\tDEBUGVAR OverlayMenuFilter\r\n')