pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2025-07-17 11:20:46 +07:00
commit ae8ac858a1
38 changed files with 156773 additions and 143995 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/mys/image/page_e_receipt/img_popup_eReceiptPrompt_result.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

61
inter/mys/xml/e_receipt/page_show_e_receipt.lxml
View file

@ -15,6 +15,7 @@
Var ProductDesc = "" Var ProductDesc = ""
Var Timeout = 0 Var Timeout = 0
Var TimeoutAfterShowQR = 0
Var service = "eInvoice.mys" Var service = "eInvoice.mys"
Var EReceiptQR = "" Var EReceiptQR = ""
@ -82,9 +83,13 @@
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
DEBUGVAR TimeoutAfterShowQR
DEBUGVAR VendingTSID DEBUGVAR VendingTSID
Var Seeker.VendingTSID = VendingTSID If VendingTSID = "" Then
Else
Var Seeker.VendingTSID = VendingTSID
EndIf
DEBUGVAR Seeker.VendingTSID DEBUGVAR Seeker.VendingTSID
DEBUGVAR LOADING_STATE DEBUGVAR LOADING_STATE
@ -93,31 +98,43 @@ DEBUGVAR QR_STATE
DEBUGVAR Seeker.e_receipt DEBUGVAR Seeker.e_receipt
Var Timeout = Timeout + 1 If Seeker.VendingTSID = "" Then
Var Timeout = Timeout + 1
Else
If TimeoutAfterShowQR = 0 Then
Var LOADING_STATE = "Invisible"
SAVELOG "TSID should be ready!"
TRY "ROOT/taobin_project/inter/mys/xml/process/e_receipt.ev"
Var TimeoutAfterShowQR = 1
Refresh
EndIf
EndIf
If Timeout = 5 Then If Seeker.VendingTSID = "" Then
Var LOADING_STATE = "Invisible" Var QR_STATE = "Invisible"
SAVELOG "TSID should be ready!" Refresh
TRY "ROOT/taobin_project/inter/mys/xml/process/e_receipt.ev" Else
If TimeoutAfterShowQR > 2 Then
Var QR_STATE = "Enable"
EndIf
If TimeoutAfterShowQR > 0 Then
Var TimeoutAfterShowQR = TimeoutAfterShowQR + 1
EndIf
Refresh Refresh
EndIf EndIf
If Timeout > 5 Then If Timeout > 25 Then
Var QR_STATE = "Enable" SAVELOG "Timeout after waiting .."
Refresh
EndIf
If Timeout > 15 Then
Open "ROOT/taobin_project/xml/page_drinkok.xml" Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf EndIf
If TimeoutAfterShowQR > 25 Then
SAVELOG "Timeout QR OK"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
Refresh Refresh
TimerReset TimerReset
@ -143,10 +160,10 @@ TimerReset
; need-change-position ; need-change-position
<QRCode> <QRCode>
<X> 415 </X> <X> 350 </X>
<Y> 875 </Y> <Y> 845 </Y>
<Width> 250 </Width> <Width> 360 </Width>
<Height> 250 </Height> <Height> 360 </Height>
<State> QR_STATE </State> <State> QR_STATE </State>
<Service> service </Service> <Service> service </Service>
</QRCode> </QRCode>
@ -155,7 +172,7 @@ TimerReset
<Image> <Image>
<X> 175 </X> <X> 175 </X>
<Y> 1200 </Y> <Y> 1230 </Y>
<Height> 300 </Height> <Height> 300 </Height>
<Width> 320 </Width> <Width> 320 </Width>
<Filename> Seeker.PictureDrink </Filename> <Filename> Seeker.PictureDrink </Filename>

6
inter/sgp/animation01/play_list.tsv
View file

@ -885,3 +885,9 @@ PEPSI Max BANANA 52-05-02-0077 1 14 56 23 13 24 120 14:00 23
PEPSI Max YUZU 52-05-02-0076 1 14 53 23 13 24 120 4:00 23 PEPSI Max YUZU 52-05-02-0076 1 14 53 23 13 24 120 4:00 23
PEPSI MINT 52-05-02-0068 1 14 59 12 23 24 120 15:00 23 PEPSI MINT 52-05-02-0068 1 14 59 12 23 24 120 15:00 23
Almost Dirty 52-21-02-0071 1 2 3 4 5 6 7 24 66 6:06 32 Almost Dirty 52-21-02-0071 1 2 3 4 5 6 7 24 66 6:06 32
ICED SANTA GINGER 12-03-02-0081 1 7 22 23 24 49 10:01 23
ICED SANTA GINGER 12-23-02-0081 1 7 22 23 24 49 10:01 23
CHOCO SNOWFLAKE SMOOTHIE 12-03-03-0088 1 15 7 22 40 41 24 49 10:01 23
REINDEER PEPPERMINT SMOOTHIE 12-03-03-0089 1 59 7 19 41 24 49 10:01 23
ICED CHRISTMAS CAFE LATTE 12-01-02-0084 1 6 7 12 22 23 24 49 10:01 23
ICED CHRISTMAS CAFE LATTE 12-21-02-0084 1 6 7 12 22 23 24 49 10:01 23

Can't render this file because it has a wrong number of fields in line 40.

2
inter/sgp/xml/menu_catalog_new.lxml
View file

@ -22,6 +22,8 @@
Var ice_tab_process_show = "Invisible" Var ice_tab_process_show = "Invisible"
EndIf EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
If NextPage = "-" Then If NextPage = "-" Then

216
inter/sgp/xml/menu_new_layout_gen_v2.py
View file

@ -19,11 +19,11 @@
return return
# print("get", expected_key, tryGetFromMap(map, expected_key)) # print("get", expected_key, tryGetFromMap(map, expected_key))
map[expected_key] += value_to_set map[expected_key] += value_to_set
def adjustPosition(value: str, modifiers): def adjustPosition(value: str, modifiers):
result = modifiers(int(value)) result = modifiers(int(value))
return result return result
def removePartOfText(value: str, part: str, repl = None): def removePartOfText(value: str, part: str, repl = None):
if repl != None: if repl != None:
return value.replace(part, repl) return value.replace(part, repl)
@ -35,7 +35,7 @@
"key": key, "key": key,
"append": appendValueInMap "append": appendValueInMap
} }
def cloneTextExport(key: str | list, mods=None, remove=None, replace=None, block_output=False, block_append=False): def cloneTextExport(key: str | list, mods=None, remove=None, replace=None, block_output=False, block_append=False):
return { return {
"source": season_pass_menu_big_btn_ui, "source": season_pass_menu_big_btn_ui,
@ -52,9 +52,9 @@
def GenMenuProductCodeBlock(spl, str_hot_product_code, str_cold_product_code, str_blend_product_code): def GenMenuProductCodeBlock(spl, str_hot_product_code, str_cold_product_code, str_blend_product_code):
gen_ss = "set-" in spl[idx_img][8] gen_ss = "set-" in spl[idx_img][8]
if (str_hot_product_code.startswith('52-01') or str_cold_product_code.startswith('52-01') or str_blend_product_code.startswith('52-01')) and gen_season_pass and current_file_name == "page_catalog_group_recommend_multi_pro.skt": if (str_hot_product_code.startswith('52-01') or str_cold_product_code.startswith('52-01') or str_blend_product_code.startswith('52-01')) and gen_season_pass and current_file_name == "page_catalog_group_recommend_multi_pro.skt":
return return
@ -63,46 +63,46 @@
"product_code": f"{str_hot_product_code}.{str_cold_product_code}.{str_blend_product_code}", "product_code": f"{str_hot_product_code}.{str_cold_product_code}.{str_blend_product_code}",
"point": "init", "point": "init",
"from_ss": gen_ss "from_ss": gen_ss
}) })
menu_img = spl[ idx_img][1] menu_img = spl[ idx_img][1]
out_xml( '\t; '+ str_hot_product_code + ' ' + str_cold_product_code + ' ' + str_blend_product_code+ ' \r\n') out_xml( '\t; '+ str_hot_product_code + ' ' + str_cold_product_code + ' ' + str_blend_product_code+ ' \r\n')
out_xml( '<Block>\r\n') out_xml( '<Block>\r\n')
out_xml('\t<MarginLeft> 33 </MarginLeft>\r\n') out_xml('\t<MarginLeft> 33 </MarginLeft>\r\n')
out_xml('\t<MarginTop> 22 </MarginTop>\r\n') out_xml('\t<MarginTop> 22 </MarginTop>\r\n')
out_xml('\t<Width> 225 </Width>\r\n') out_xml('\t<Width> 225 </Width>\r\n')
out_xml('\t<Height> 296 </Height>\r\n') out_xml('\t<Height> 296 </Height>\r\n')
str_con = "" str_con = ""
str_con_var = "" str_con_var = ""
#print("#########################################################################################################################") #print("#########################################################################################################################")
#print( str( spl)) #print( str( spl))
#print("#########################################################################################################################") #print("#########################################################################################################################")
if str_hot_product_code != '-': if str_hot_product_code != '-':
str_con += str_hot_product_code + '.Button,' str_con += str_hot_product_code + '.Button,'
if str_cold_product_code != '-': if str_cold_product_code != '-':
str_con += str_cold_product_code + '.Button,' str_con += str_cold_product_code + '.Button,'
if str_blend_product_code != '-': if str_blend_product_code != '-':
str_con += str_blend_product_code + '.Button,' str_con += str_blend_product_code + '.Button,'
if str_hot_product_code != '-': if str_hot_product_code != '-':
str_con_var += str_hot_product_code + '-' str_con_var += str_hot_product_code + '-'
if str_cold_product_code != '-': if str_cold_product_code != '-':
str_con_var += str_cold_product_code + '-' str_con_var += str_cold_product_code + '-'
if str_blend_product_code != '-': if str_blend_product_code != '-':
str_con_var += str_blend_product_code + '-' str_con_var += str_blend_product_code + '-'
str_con_var = str_con_var.replace("-", "") str_con_var = str_con_var.replace("-", "")
if touch_less_gen == True or (multi_pro_gen and gen_season_pass): if touch_less_gen == True or (multi_pro_gen and gen_season_pass):
str_con += "Disable=Invisible," str_con += "Disable=Invisible,"
str_con += "$Sum" + str_con_var str_con += "$Sum" + str_con_var
out_xml( '\t<State> Flag( '+ str_con + ') </State> \r\n') out_xml( '\t<State> Flag( '+ str_con + ') </State> \r\n')
pd_code_1 = str_hot_product_code pd_code_1 = str_hot_product_code
pd_stage1 = '$' + str_hot_product_code + '.Button' pd_stage1 = '$' + str_hot_product_code + '.Button'
@ -115,16 +115,16 @@
if str_cold_product_code == "-" or len(str_cold_product_code) == 0: if str_cold_product_code == "-" or len(str_cold_product_code) == 0:
pd_code_2 = pd_code_available pd_code_2 = pd_code_available
pd_stage2 = '"Disable2"' pd_stage2 = '"Disable2"'
pd_code_3 = str_blend_product_code pd_code_3 = str_blend_product_code
pd_stage3 = '$' + str_blend_product_code + '.Button' pd_stage3 = '$' + str_blend_product_code + '.Button'
if str_blend_product_code == "-" or len(str_blend_product_code) == 0: if str_blend_product_code == "-" or len(str_blend_product_code) == 0:
pd_code_3 = pd_code_available pd_code_3 = pd_code_available
pd_stage3 = '"Disable2"' pd_stage3 = '"Disable2"'
out_xml( '\t<Button>\r\n') out_xml( '\t<Button>\r\n')
out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n') out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n')
out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n') out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
@ -148,7 +148,7 @@
is_sm = True is_sm = True
if pd_code_1.startswith('52-01') or pd_code_2.startswith('52-01') or pd_code_3.startswith('52-01'): if pd_code_1.startswith('52-01') or pd_code_2.startswith('52-01') or pd_code_3.startswith('52-01'):
is_v1 = True is_v1 = True
if int(current_set_season_pass) not in season_pass_menu.keys(): if int(current_set_season_pass) not in season_pass_menu.keys():
season_pass_menu[int(current_set_season_pass)] = [] season_pass_menu[int(current_set_season_pass)] = []
print("Add season: ", season_pass_menu) print("Add season: ", season_pass_menu)
@ -156,7 +156,7 @@
# season_pass_menu[int(current_set_season_pass)].append(spl) # season_pass_menu[int(current_set_season_pass)].append(spl)
# if "#" not in pd_code_1 and (pd_code_1+f".{spl[ idx_name][1]}") not in season_pass_menu[int(current_set_season_pass)]: # if "#" not in pd_code_1 and (pd_code_1+f".{spl[ idx_name][1]}") not in season_pass_menu[int(current_set_season_pass)]:
# season_pass_menu[int(current_set_season_pass)].append(pd_code_1+f".{spl[ idx_name][1]}") # season_pass_menu[int(current_set_season_pass)].append(pd_code_1+f".{spl[ idx_name][1]}")
# if "#" not in pd_code_2 and (pd_code_2+f".{spl[ idx_name][1]}") not in season_pass_menu[int(current_set_season_pass)]: # if "#" not in pd_code_2 and (pd_code_2+f".{spl[ idx_name][1]}") not in season_pass_menu[int(current_set_season_pass)]:
# season_pass_menu[int(current_set_season_pass)].append(pd_code_2+f".{spl[ idx_name][1]}") # season_pass_menu[int(current_set_season_pass)].append(pd_code_2+f".{spl[ idx_name][1]}")
@ -181,13 +181,13 @@
season_pass_menu_script[key] = "" season_pass_menu_script[key] = ""
season_pass_menu_big_btn_ui[key] = "" season_pass_menu_big_btn_ui[key] = ""
season_pass_menu_big_btn_ui[key + ".overlay"] = "" season_pass_menu_big_btn_ui[key + ".overlay"] = ""
else: else:
season_n = spl[idx_img][8].split('-')[1] season_n = spl[idx_img][8].split('-')[1]
is_sm = False is_sm = False
is_v1 = False is_v1 = False
if "sm" in spl[idx_img][8]: if "sm" in spl[idx_img][8]:
is_sm = True is_sm = True
@ -204,7 +204,7 @@
# season_pass_menu[int(season_n)].append(spl) # season_pass_menu[int(season_n)].append(spl)
# if "#" not in pd_code_1 and (pd_code_1+f".{spl[ idx_name][1]}") not in season_pass_menu[int(season_n)]: # if "#" not in pd_code_1 and (pd_code_1+f".{spl[ idx_name][1]}") not in season_pass_menu[int(season_n)]:
# season_pass_menu[int(season_n)].append(pd_code_1+f".{spl[ idx_name][1]}") # season_pass_menu[int(season_n)].append(pd_code_1+f".{spl[ idx_name][1]}")
# if "#" not in pd_code_2 and (pd_code_2+f".{spl[ idx_name][1]}") not in season_pass_menu[int(season_n)]: # if "#" not in pd_code_2 and (pd_code_2+f".{spl[ idx_name][1]}") not in season_pass_menu[int(season_n)]:
# season_pass_menu[int(season_n)].append(pd_code_2+f".{spl[ idx_name][1]}") # season_pass_menu[int(season_n)].append(pd_code_2+f".{spl[ idx_name][1]}")
@ -253,10 +253,10 @@
if getOverlayGrade(pd_code_1) != None: if getOverlayGrade(pd_code_1) != None:
overlay_string1 += 'xmlpro( '+pd_code_1+', '+'"ROOT/taobin_project/inter/sgp/image/menu_overlay_set/grade'+gradePD1+ "/button_overlay_"+ gradePD1Sugar + overlay_position+'.png")' overlay_string1 += 'xmlpro( '+pd_code_1+', '+'"ROOT/taobin_project/inter/sgp/image/menu_overlay_set/grade'+gradePD1+ "/button_overlay_"+ gradePD1Sugar + overlay_position+'.png")'
if getOverlayGrade(pd_code_2) != None: if getOverlayGrade(pd_code_2) != None:
overlay_string2 += 'xmlpro( '+pd_code_2+', '+'"ROOT/taobin_project/inter/sgp/image/menu_overlay_set/grade'+gradePD2+ "/button_overlay_"+ gradePD2Sugar + overlay_position+'.png")' overlay_string2 += 'xmlpro( '+pd_code_2+', '+'"ROOT/taobin_project/inter/sgp/image/menu_overlay_set/grade'+gradePD2+ "/button_overlay_"+ gradePD2Sugar + overlay_position+'.png")'
if getOverlayGrade(pd_code_3) != None: if getOverlayGrade(pd_code_3) != None:
overlay_string3 += 'xmlpro( '+pd_code_3+', '+'"ROOT/taobin_project/inter/sgp/image/menu_overlay_set/grade'+gradePD3+ "/button_overlay_"+ gradePD3Sugar + overlay_position+'.png")' overlay_string3 += 'xmlpro( '+pd_code_3+', '+'"ROOT/taobin_project/inter/sgp/image/menu_overlay_set/grade'+gradePD3+ "/button_overlay_"+ gradePD3Sugar + overlay_position+'.png")'
# Overlay Tag for catalog page # Overlay Tag for catalog page
@ -279,23 +279,23 @@
out_xml( '\t<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n') out_xml( '\t<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
out_xml( '\t<Volume> SoundVolume </Volume>\r\n') out_xml( '\t<Volume> SoundVolume </Volume>\r\n')
out_xml( '\t<EventOnClick> \r\n') out_xml( '\t<EventOnClick> \r\n')
# Default # Default
#out_xml( '\t\tVar NameDrink = "' + spl[ idx_of_eng_des].replace("\\n", " ") + '"\r\n') #out_xml( '\t\tVar NameDrink = "' + spl[ idx_of_eng_des].replace("\\n", " ") + '"\r\n')
#out_xml( '\t\tVar NameDrinkTH = "' + spl[ idx_of_eng].replace("\\n", " ") + '"\r\n') #out_xml( '\t\tVar NameDrinkTH = "' + spl[ idx_of_eng].replace("\\n", " ") + '"\r\n')
#out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[ idx_of_thai].replace("\\n", " ") + '"\r\n') #out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[ idx_of_thai].replace("\\n", " ") + '"\r\n')
#out_xml( '\t\tVar DrinkDescription = "' + spl[ idx_of_thai_des].replace("\\n", " ") + '"\r\n') #out_xml( '\t\tVar DrinkDescription = "' + spl[ idx_of_thai_des].replace("\\n", " ") + '"\r\n')
out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n', export_to=packExport(menu_key))
if gen_ss: if gen_ss:
print("start copy script use key ========== ", menu_key) print("start copy script use key ========== ", menu_key)
out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PriceD1 = $' + str_hot_product_code + '.Price\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PriceD1 = $' + str_hot_product_code + '.Price\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PriceD2 = $' + str_cold_product_code + '.Price\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PriceD2 = $' + str_cold_product_code + '.Price\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PriceD3 = $' + str_blend_product_code + '.Price\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PriceD3 = $' + str_blend_product_code + '.Price\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PD_CODE3 = "' + pd_code_3 + '"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PD_CODE3 = "' + pd_code_3 + '"\r\n', export_to=packExport(menu_key))
@ -312,7 +312,7 @@
for x in range( max_can_have_lang): for x in range( max_can_have_lang):
out_xml( '\t\tVar DescLang[0]['+ str(x) +'] = "'+ get_desc_lang( pd_code_1 , x)+'"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar DescLang[0]['+ str(x) +'] = "'+ get_desc_lang( pd_code_1 , x)+'"\r\n', export_to=packExport(menu_key))
for x in range( max_can_have_lang): for x in range( max_can_have_lang):
out_xml( '\t\tVar NameLang[1]['+ str(x) +'] = "'+ get_name_lang( pd_code_2 , x)+'"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar NameLang[1]['+ str(x) +'] = "'+ get_name_lang( pd_code_2 , x)+'"\r\n', export_to=packExport(menu_key))
for x in range( max_can_have_lang): for x in range( max_can_have_lang):
@ -326,7 +326,7 @@
out_xml( '\t\t; end lang \r\n', export_to=packExport(menu_key)) out_xml( '\t\t; end lang \r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\r\n', export_to=packExport(menu_key))
@ -334,7 +334,7 @@
out_xml( '\t\tVar SelectCountDrinkType = 0\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar SelectCountDrinkType = 0\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar DefaultDrinkType = 0\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar DefaultDrinkType = 0\r\n', export_to=packExport(menu_key))
out_xml( '\t\tIf PD_STAGE_1 = "Enable" Then\r\n', export_to=packExport(menu_key)) out_xml( '\t\tIf PD_STAGE_1 = "Enable" Then\r\n', export_to=packExport(menu_key))
out_xml( '\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\r\n', export_to=packExport(menu_key)) out_xml( '\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\r\n', export_to=packExport(menu_key))
out_xml( '\t\t\tVar DefaultDrinkType = 1\r\n', export_to=packExport(menu_key)) out_xml( '\t\t\tVar DefaultDrinkType = 1\r\n', export_to=packExport(menu_key))
@ -383,17 +383,17 @@
#out_xml( '\t\tVar menu_desc_eng_blender = $' + pd_code_3 + '.descriptionE\r\n') #out_xml( '\t\tVar menu_desc_eng_blender = $' + pd_code_3 + '.descriptionE\r\n')
#out_xml( '\t\tVar menu_name_thai_blender = $' + pd_code_3 + '.Name\r\n') #out_xml( '\t\tVar menu_name_thai_blender = $' + pd_code_3 + '.Name\r\n')
#out_xml( '\t\tVar menu_desc_thai_blender = $' + pd_code_3 + '.description\r\n') #out_xml( '\t\tVar menu_desc_thai_blender = $' + pd_code_3 + '.description\r\n')
out_xml( '\t\t\r\n', export_to=packExport(menu_key)) out_xml( '\t\t\r\n', export_to=packExport(menu_key))
out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n', export_to=packExport(menu_key)) out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n', export_to=packExport(menu_key))
out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n', export_to=packExport(menu_key)) out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n', export_to=packExport(menu_key))
out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n', export_to=packExport(menu_key)) out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar SelectDrinkType = 0\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar SelectDrinkType = 0\r\n', export_to=packExport(menu_key))
# Overlay Filter # Overlay Filter
out_xml( '\t\tVar OverlayMenuFilter = \"\"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar OverlayMenuFilter = \"\"\r\n', export_to=packExport(menu_key))
out_xml( '\t\tVar OverlayMenuFilter1 = \"\"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar OverlayMenuFilter1 = \"\"\r\n', export_to=packExport(menu_key))
@ -423,7 +423,7 @@
return if_block + else_block return if_block + else_block
if overlay_string1 != "": if overlay_string1 != "":
out_xml( get_overlay_filter(1, pd_code_1, overlay_string1), export_to=packExport(menu_key)) out_xml( get_overlay_filter(1, pd_code_1, overlay_string1), export_to=packExport(menu_key))
if overlay_string2 != "": if overlay_string2 != "":
out_xml( get_overlay_filter(2, pd_code_2, overlay_string2), export_to=packExport(menu_key)) out_xml( get_overlay_filter(2, pd_code_2, overlay_string2), export_to=packExport(menu_key))
if overlay_string3 != "": if overlay_string3 != "":
@ -432,35 +432,35 @@
out_xml( '\t\tVar OverlayMenuFilter = "' + overlay_string_for_topping_first_open + '\"\r\n', export_to=packExport(menu_key)) out_xml( '\t\tVar OverlayMenuFilter = "' + overlay_string_for_topping_first_open + '\"\r\n', export_to=packExport(menu_key))
out_xml( '\t\t\r\n', export_to=packExport(menu_key)) out_xml( '\t\t\r\n', export_to=packExport(menu_key))
out_xml( '\t\t\r\n', export_to=packExport(menu_key)) out_xml( '\t\t\r\n', export_to=packExport(menu_key))
out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select6.lxml"\r\n') out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select6.lxml"\r\n')
out_xml( '\t\t\r\n', export_to=packExport(menu_key)) out_xml( '\t\t\r\n', export_to=packExport(menu_key))
# if menu_key.startswith("s"): # if menu_key.startswith("s"):
# print(f"preview script of {menu_key}", tryGetFromMap(season_pass_menu_script, menu_key)) # print(f"preview script of {menu_key}", tryGetFromMap(season_pass_menu_script, menu_key))
out_xml( '\t</EventOnClick>\r\n') out_xml( '\t</EventOnClick>\r\n')
out_xml( '\t</Button>\r\n') out_xml( '\t</Button>\r\n')
out_xml( '\t<Text>\r\n', export_to=cloneTextExport(menu_key)) out_xml( '\t<Text>\r\n', export_to=cloneTextExport(menu_key))
out_xml( '\t<X> 16 </X>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<X> 16 </X>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Y> 164 </Y>\r\n',export_to=cloneTextExport( out_xml( '\t<Y> 164 </Y>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
lambda y_pos: y_pos * 2 + 30)) lambda y_pos: y_pos * 2 + 30))
out_xml( '\t<Size> 22 </Size>\r\n',export_to=cloneTextExport( out_xml( '\t<Size> 22 </Size>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
lambda y_pos: int(y_pos * 1.5))) lambda y_pos: int(y_pos * 1.5)))
out_xml( '\t<Width> 222 </Width>\r\n',export_to=cloneTextExport( out_xml( '\t<Width> 222 </Width>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
lambda y_pos: int(y_pos * 1.5))) lambda y_pos: int(y_pos * 1.5)))
out_xml( '\t<Mode> "multi2" </Mode>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Mode> "multi2" </Mode>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Font> KanitMediumTTF </Font>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Color> HeadlineColor </Color>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Color> HeadlineColor </Color>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<LanguageGroup>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<LanguageGroup>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t\t<LanguageSlot1>' + spl[ idx_name][ idx_lang_eng] + '</LanguageSlot1>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t<LanguageSlot1>' + spl[ idx_name][ idx_lang_eng] + '</LanguageSlot1>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t\t<LanguageSlot2>' + spl[ idx_name][ idx_lang_thai] + '</LanguageSlot2>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t<LanguageSlot2>' + spl[ idx_name][ idx_lang_thai] + '</LanguageSlot2>\r\n',export_to=cloneTextExport(menu_key))
@ -469,7 +469,7 @@
out_xml( '\t\t<LanguageSlot5>' + spl[ idx_name][ idx_lang_malay] + '</LanguageSlot5>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t<LanguageSlot5>' + spl[ idx_name][ idx_lang_malay] + '</LanguageSlot5>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t\t<LanguageSlot6>' + spl[ idx_name][ idx_lang_thai] + '</LanguageSlot6>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t<LanguageSlot6>' + spl[ idx_name][ idx_lang_thai] + '</LanguageSlot6>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</LanguageGroup>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</LanguageGroup>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Text>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Text>\r\n',export_to=cloneTextExport(menu_key))
@ -529,7 +529,7 @@
out_xml( '\t<Image>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Image>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<X> 16 </X>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<X> 16 </X>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport( out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
lambda y_pos: y_pos * 2 + 10)) lambda y_pos: y_pos * 2 + 10))
if gen_ss and (not is_sm or ", " in spl[idx_img][8]): if gen_ss and (not is_sm or ", " in spl[idx_img][8]):
@ -547,16 +547,16 @@
out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True)) out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Text>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Text>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<X> TextPriceMenuHotX </X>\r\n',export_to=cloneTextExport( out_xml( '\t<X> TextPriceMenuHotX </X>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
mods=lambda y_pos: y_pos * 2 - 10, mods=lambda y_pos: y_pos * 2 - 10,
remove="TextPriceMenuHotX", remove="TextPriceMenuHotX",
replace="48")) replace="48"))
out_xml( '\t<Y> TextPriceMenuY </Y>\r\n',export_to=cloneTextExport( out_xml( '\t<Y> TextPriceMenuY </Y>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
mods=lambda y_pos: y_pos * 2 + 15, mods=lambda y_pos: y_pos * 2 + 15,
remove="TextPriceMenuY", remove="TextPriceMenuY",
replace="264")) replace="264"))
out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n',export_to=cloneTextExport( out_xml( '\t<Size> TextPriceMenuSize </Size>\r\n',export_to=cloneTextExport(
@ -566,24 +566,24 @@
replace="12" replace="12"
)) ))
out_xml( '\t<Width> 220 </Width>\r\n',export_to=cloneTextExport( out_xml( '\t<Width> 220 </Width>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
mods=lambda w: int(w * 2))) mods=lambda w: int(w * 2)))
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Font> KanitMediumTTF </Font>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Color> WTCBlueColor </Color>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Color> WTCBlueColor </Color>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key))
#out_xml( '\t<Value> Var( "฿" + $' + spl[ idx_hot_product_code] + '.Price ) </Value>\r\n') #out_xml( '\t<Value> Var( "฿" + $' + spl[ idx_hot_product_code] + '.Price ) </Value>\r\n')
if "free" in param: if "free" in param:
out_xml( '\t<Value> "Free" </Value>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Value> "Free" </Value>\r\n',export_to=cloneTextExport(menu_key))
else: else:
out_xml( '\t<Value> StringFmt( $' + str_hot_product_code + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Value> StringFmt( $' + str_hot_product_code + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key))
ice_tab_ice_show = True ice_tab_ice_show = True
shw = "$" + str_cold_product_code + ".Button" shw = "$" + str_cold_product_code + ".Button"
@ -601,9 +601,9 @@
mods=lambda x: x + 65 mods=lambda x: x + 65
)) ))
out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport( out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
lambda y_pos: y_pos * 2 + 10)) lambda y_pos: y_pos * 2 + 10))
if gen_ss and (not is_sm or ", " in spl[idx_img][8]): if gen_ss and (not is_sm or ", " in spl[idx_img][8]):
# expect season mode # expect season mode
out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key, block_output=True)) out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
@ -615,11 +615,11 @@
else: else:
out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key, block_append=True)) out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_append=True)) out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
if gen_ss and (not is_sm or "," in spl[idx_img][8]): if gen_ss and (not is_sm or "," in spl[idx_img][8]):
out_xml( '\t<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>\r\n',export_to=cloneTextExport(menu_key, block_output=True)) out_xml( '\t<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True)) out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
@ -640,10 +640,10 @@
remove="TextPriceMenuSize", remove="TextPriceMenuSize",
replace="12")) replace="12"))
out_xml( '\t<Width> 220 </Width>\r\n',export_to=cloneTextExport( out_xml( '\t<Width> 220 </Width>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
mods=lambda w: int(w * 2))) mods=lambda w: int(w * 2)))
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Font> KanitMediumTTF </Font>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Color> WTCBlueColor </Color>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Color> WTCBlueColor </Color>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key))
@ -655,7 +655,7 @@
else: else:
out_xml( '\t<Value> Var( "฿" + $' + str_cold_product_code + '.Price ) </Value>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Value> Var( "฿" + $' + str_cold_product_code + '.Price ) </Value>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key))
ice_tab_blend_show = True ice_tab_blend_show = True
shw = "$" + str_blend_product_code + ".Button" shw = "$" + str_blend_product_code + ".Button"
@ -673,10 +673,10 @@
mods=lambda x: x + 130 mods=lambda x: x + 130
)) ))
out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport( out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
mods=lambda y_pos: y_pos * 2 + 10 mods=lambda y_pos: y_pos * 2 + 10
)) ))
if gen_ss and (not is_sm or ", " in spl[idx_img][8]): if gen_ss and (not is_sm or ", " in spl[idx_img][8]):
# expect season mode # expect season mode
out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key, block_output=True)) out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
@ -684,11 +684,11 @@
out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key, block_append=True)) out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_append=True)) out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
if gen_ss and (not is_sm or "," in spl[idx_img][8]): if gen_ss and (not is_sm or "," in spl[idx_img][8]):
out_xml( '\t<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>\r\n',export_to=cloneTextExport(menu_key, block_output=True)) out_xml( '\t<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True)) out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
@ -711,11 +711,11 @@
remove="TextPriceMenuSize", remove="TextPriceMenuSize",
replace="12")) replace="12"))
out_xml( '\t<Width> 220 </Width>\r\n',export_to=cloneTextExport( out_xml( '\t<Width> 220 </Width>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
mods=lambda w: int(w * 2))) mods=lambda w: int(w * 2)))
out_xml( '\t<Font> KanitRegularTTF </Font>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Font> KanitRegularTTF </Font>\r\n',export_to=cloneTextExport(menu_key))
#out_xml( '\t<Align> end </Align>\r\n') #out_xml( '\t<Align> end </Align>\r\n')
out_xml( '\t<Color> WTCBlueColor </Color>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Color> WTCBlueColor </Color>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key))
@ -727,11 +727,11 @@
else: else:
out_xml( '\t<Value> Var( "฿" + $' + str_blend_product_code + '.Price ) </Value>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Value> Var( "฿" + $' + str_blend_product_code + '.Price ) </Value>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Image>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Image>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<X> 81 </X>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<X> 81 </X>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport( out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
lambda y_pos: y_pos * 2 + 10)) lambda y_pos: y_pos * 2 + 10))
out_xml( '\t<State> \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<State> \r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t\teval( \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\teval( \r\n',export_to=cloneTextExport(menu_key))
@ -747,7 +747,7 @@
out_xml( '\t\t\tEndIf\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t\tEndIf\r\n',export_to=cloneTextExport(menu_key))
else: else:
out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t\t\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t\tElse\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\tElse\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t\tVar ice_tab_process_show = "Invisible"\r\n',export_to=cloneTextExport(menu_key))
@ -759,7 +759,7 @@
out_xml( '\t<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Image>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Image>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<X> 49 </X>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<X> 49 </X>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Y> 117 </Y>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Y> 117 </Y>\r\n',export_to=cloneTextExport(menu_key))
@ -791,11 +791,11 @@
out_xml( '\t</State>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</State>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Text>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Text>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<X> 84 </X>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<X> 84 </X>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Y> 266 </Y>\r\n',export_to=cloneTextExport( out_xml( '\t<Y> 266 </Y>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
lambda y_pos: y_pos * 2 + 10)) lambda y_pos: y_pos * 2 + 10))
out_xml( '\t<Size> 10 </Size>\r\n',export_to=cloneTextExport( out_xml( '\t<Size> 10 </Size>\r\n',export_to=cloneTextExport(
menu_key, menu_key,
@ -833,12 +833,12 @@
# if gen_ss and not is_sm: # if gen_ss and not is_sm:
# out_xml('\t<Color> 0x322B26 </Color>',export_to=cloneTextExport(menu_key, block_output=True)) # out_xml('\t<Color> 0x322B26 </Color>',export_to=cloneTextExport(menu_key, block_output=True))
# out_xml( '\t<Value> \"UNAVAILABLE\" </Value>\r\n',export_to=cloneTextExport(menu_key, block_output=True)) # out_xml( '\t<Value> \"UNAVAILABLE\" </Value>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
out_xml( '\t<Language>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Language>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t\t<ID> 000013 </ID> \r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t\t<ID> 000013 </ID> \r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Language>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Language>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t<Align> center-vertical-horizontal </Align>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t<Align> center-vertical-horizontal </Align>\r\n',export_to=cloneTextExport(menu_key))
out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key)) out_xml( '\t</Text>\r\n',export_to=cloneTextExport(menu_key))
@ -848,10 +848,12 @@
"point": "end", "point": "end",
"from_ss": gen_ss "from_ss": gen_ss
}) })
def GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code): def GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
if "skip_blend" in param:
spl[ idx_name][ idx_blend_product_code] = "-"
GenMenuProductCodeBlock(spl, spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] ) GenMenuProductCodeBlock(spl, spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
idx_lang_malay = 5 idx_lang_malay = 5
idx_lang_japan = 4 idx_lang_japan = 4
@ -868,8 +870,8 @@
idx_hot_product_code = 7 idx_hot_product_code = 7
idx_cold_product_code = idx_hot_product_code + 1 idx_cold_product_code = idx_hot_product_code + 1
idx_blend_product_code = idx_cold_product_code + 1 idx_blend_product_code = idx_cold_product_code + 1
# #
idx_hot_product_code2 = idx_hot_product_code idx_hot_product_code2 = idx_hot_product_code
idx_cold_product_code2 = idx_cold_product_code idx_cold_product_code2 = idx_cold_product_code
idx_blend_product_code2 = idx_blend_product_code idx_blend_product_code2 = idx_blend_product_code
@ -878,20 +880,20 @@
idx_of_thai = 0 idx_of_thai = 0
idx_of_thai_des = 1 idx_of_thai_des = 1
print ("--------------------------------------------------------------------------------------------------------------------------") print ("--------------------------------------------------------------------------------------------------------------------------")
if current_file_name == "page_catalog_group_recommend.skt": if current_file_name == "page_catalog_group_recommend.skt":
touch_less_gen = True touch_less_gen = True
else: else:
touch_less_gen = False touch_less_gen = False
if current_file_name == "page_catalog_group_recommend_multi_pro.skt": if current_file_name == "page_catalog_group_recommend_multi_pro.skt":
multi_pro_gen = True multi_pro_gen = True
else: else:
multi_pro_gen = False multi_pro_gen = False
print("Found multi pro skt: ", multi_pro_gen ) print("Found multi pro skt: ", multi_pro_gen )
out_xml('<FrameScroll> \r\n') out_xml('<FrameScroll> \r\n')
if touch_less_gen == True: if touch_less_gen == True:
out_xml('<Max> 16 </Max>\r\n') out_xml('<Max> 16 </Max>\r\n')
@ -906,11 +908,11 @@
out_xml('<Column> 2 </Column>\r\n') out_xml('<Column> 2 </Column>\r\n')
else: else:
out_xml('<Column> 4 </Column>\r\n') out_xml('<Column> 4 </Column>\r\n')
out_xml('<Script>\r\n') out_xml('<Script>\r\n')
print("current_file_name " + current_file_name) print("current_file_name " + current_file_name)
if touch_less_gen == False or multi_pro_gen: if touch_less_gen == False or multi_pro_gen:
out_xml('\t Var block_index_override = 0\r\n') out_xml('\t Var block_index_override = 0\r\n')
@ -932,10 +934,10 @@
#out_xml('\t\tVar TouchLessStg = "Disable"\r\n') #out_xml('\t\tVar TouchLessStg = "Disable"\r\n')
#out_xml('\t\tVar TouchLessQrStg = "Invisible"\r\n') #out_xml('\t\tVar TouchLessQrStg = "Invisible"\r\n')
#out_xml('\tEndIf\r\n') #out_xml('\tEndIf\r\n')
out_xml('</Script>\r\n') out_xml('</Script>\r\n')
pd_code_available = '##-##-##-####' pd_code_available = '##-##-##-####'
count = 0 count = 0
count_test = 0 count_test = 0
@ -960,12 +962,12 @@
# out_xml('\t<Color> "0xeae6e1" </Color>\r\n') # out_xml('\t<Color> "0xeae6e1" </Color>\r\n')
# out_xml('\t<QRColor> "0x513C2F" </Color>\r\n') # out_xml('\t<QRColor> "0x513C2F" </Color>\r\n')
# out_xml('\t<Height> 150 </Height>\r\n') # out_xml('\t<Height> 150 </Height>\r\n')
# #
# #out_xml('\t<State> TouchLessQrStg </State>\r\n') # #out_xml('\t<State> TouchLessQrStg </State>\r\n')
# #out_xml('\t<Service> "Herr" </Service>\r\n') # #out_xml('\t<Service> "Herr" </Service>\r\n')
# out_xml('\t<State> TouchLessQrStg </State>\r\n') # out_xml('\t<State> TouchLessQrStg </State>\r\n')
# out_xml('\t<Service> testservice </Service>\r\n') # out_xml('\t<Service> testservice </Service>\r\n')
# #
# out_xml('\t</QRCode>\r\n') # out_xml('\t</QRCode>\r\n')
# out_xml('</Block>\r\n') # out_xml('</Block>\r\n')
out_xml(';dummy_layout.inc\r\n') out_xml(';dummy_layout.inc\r\n')
@ -979,7 +981,7 @@
# continue # continue
if len(spl) == 1: if len(spl) == 1:
if spl[0].startswith("TAG"): if spl[0].startswith("TAG"):
out_xml( '\t;' + spl[0] + '\r\n') out_xml( '\t;' + spl[0] + '\r\n')
print("Have TAGESP") print("Have TAGESP")
continue continue
print( '\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code] + ' ' + spl[ idx_name][ idx_blend_product_code] + ' \r\n') print( '\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code] + ' ' + spl[ idx_name][ idx_blend_product_code] + ' \r\n')
@ -1027,6 +1029,8 @@
print("\t\t==> ignore ") print("\t\t==> ignore ")
else: else:
print("\t\t==> gen ") print("\t\t==> gen ")
if "skip_blend" in param:
blend_pd[ idx] = "-"
GenMenuProductCodeBlock(spl, hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] ) GenMenuProductCodeBlock(spl, hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
else: else:
GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code) GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
@ -1038,7 +1042,7 @@
if len( spl[idx_name] ) >= 11: if len( spl[idx_name] ) >= 11:
if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-": if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-":
GenMenuBlock(spl, idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2) GenMenuBlock(spl, idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2)
if multi_pro_gen: if multi_pro_gen:
print("multi_pro_gen") print("multi_pro_gen")
@ -1067,7 +1071,7 @@
out_xml(";season-sm-block"+'\r\n') out_xml(";season-sm-block"+'\r\n')
GenListMenu() GenListMenu()
out_xml(";end-season-sm-block"+'\r\n') out_xml(";end-season-sm-block"+'\r\n')
out_xml('\t\t</FrameScroll>\r\n') out_xml('\t\t</FrameScroll>\r\n')
out_xml('\t\t</Block>\r\n') out_xml('\t\t</Block>\r\n')
out_xml(';endblock'+str(i)+'\r\n') out_xml(';endblock'+str(i)+'\r\n')
@ -1092,6 +1096,8 @@
out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n') out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n')
out_xml('</EventClick>\r\n') out_xml('</EventClick>\r\n')
out_xml('</Button>\r\n') out_xml('</Button>\r\n')
# if "v2" in param:
out_xml(';include="ROOT/taobin_project/inc/button_remove_cup.inc"\r\n')
# if "v2" in param:

2807
inter/sgp/xml/page_catalog_group_appfast.lxml
View file

File diff suppressed because it is too large Load diff

45744
inter/sgp/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

8052
inter/sgp/xml/page_catalog_group_forkid.lxml
View file

File diff suppressed because it is too large Load diff

14983
inter/sgp/xml/page_catalog_group_health.lxml
View file

File diff suppressed because it is too large Load diff

18682
inter/sgp/xml/page_catalog_group_milk.lxml
View file

File diff suppressed because it is too large Load diff

31140
inter/sgp/xml/page_catalog_group_other.lxml
View file

File diff suppressed because it is too large Load diff

28302
inter/sgp/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

108003
inter/sgp/xml/page_catalog_group_recommend_multi_pro.lxml
View file

File diff suppressed because it is too large Load diff

27405
inter/sgp/xml/page_catalog_group_tea.lxml
View file

File diff suppressed because it is too large Load diff

9551
inter/sgp/xml/page_catalog_group_whey.lxml
View file

File diff suppressed because it is too large Load diff

21
inter/whatthecup/sgp/xml/page_catalog.lxml
View file

@ -229,23 +229,7 @@
EndIf EndIf
EndIf EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
; zone cup on arm
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
Refresh Refresh
@ -711,6 +695,8 @@
<Value> ShowNetworkProblemText </Value> <Value> ShowNetworkProblemText </Value>
</Text> </Text>
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
; Cart ; Cart
<Button> <Button>
<X> 915 </X> <X> 915 </X>
@ -801,5 +787,6 @@
DEBUGVAR buttonRemoveCup DEBUGVAR buttonRemoveCup
</EventUnitTest3> </EventUnitTest3>
;include="ROOT/inc/remove_cup_tag_on_arm.inc"
</Popup> </Popup>

3
xml/page_NewBrewing3.xml
View file

@ -852,7 +852,8 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf EndIf
If BREW_CNT = 0 Then If BREW_CNT = 0 Then

3
xml/page_NewBrewing3Conti.xml
View file

@ -309,7 +309,8 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf EndIf
If CountDownBrewing = 0 Then If CountDownBrewing = 0 Then

2
xml/page_brewing3.xml
View file

@ -932,7 +932,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf EndIf
DEBUGVAR EnableDoubleCupNoError DEBUGVAR EnableDoubleCupNoError

4
xml/page_brewing3Conti.xml
View file

@ -397,8 +397,8 @@
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf EndIf

2
xml/page_collect_point_1-2.xml
View file

@ -50,7 +50,7 @@
DEBUGVAR Timeout DEBUGVAR Timeout
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1

2
xml/page_collect_point_1-3.xml
View file

@ -154,7 +154,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf
StrLen TelephoneNumber TelNumLen StrLen TelephoneNumber TelNumLen

2
xml/page_collect_point_1.xml
View file

@ -243,7 +243,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

2
xml/page_collect_point_2.xml
View file

@ -77,7 +77,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

2
xml/page_collect_point_3.xml
View file

@ -975,7 +975,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

2
xml/page_collect_point_3_28.xml
View file

@ -959,7 +959,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

2
xml/page_collect_point_3_28_lucky_draw_campaign.xml
View file

@ -1058,7 +1058,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

2
xml/page_display_get_free.xml
View file

@ -95,7 +95,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1

4
xml/page_drinkok.xml
View file

@ -317,7 +317,7 @@
Else Else
Var ShowNameMysteryName = Seeker.shownameMystery Var ShowNameMysteryName = Seeker.shownameMystery
EndIf EndIf
If CatalogLayoutV3 = 1 Then If CatalogLayoutV3 = 1 Then
SCROLL_TO_TOP "5" SCROLL_TO_TOP "5"
SCROLL_TO_TOP "6" SCROLL_TO_TOP "6"
@ -331,7 +331,7 @@
EndIf EndIf
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
LEDv4Playlist "reset" "-" "-" ;LEDv4Playlist "reset" "-" "-"
TRY "ROOT/taobin_project/xml/process/temp_ledv4_page_drinkok.ev" TRY "ROOT/taobin_project/xml/process/temp_ledv4_page_drinkok.ev"
EndIf EndIf

62
xml/page_test_color.xml
View file

@ -35,6 +35,13 @@
Var bn_off = TestColorImageDir + "bn_off.png" Var bn_off = TestColorImageDir + "bn_off.png"
Var bp_off = TestColorImageDir + "bp_off.png" Var bp_off = TestColorImageDir + "bp_off.png"
Var bn_10s = TestColorImageDir + "bn_10s.png"
Var bp_10s = TestColorImageDir + "bp_10s.png"
Var bn_20s = TestColorImageDir + "bn_20s.png"
Var bp_20s = TestColorImageDir + "bp_20s.png"
Var bn_60s = TestColorImageDir + "bn_60s.png"
Var bp_60s = TestColorImageDir + "bp_60s.png"
Var bn_toggle_off = TestColorImageDir + "btn_toggle_off.png" Var bn_toggle_off = TestColorImageDir + "btn_toggle_off.png"
Var bn_toggle_on = TestColorImageDir + "btn_toggle_on.png" Var bn_toggle_on = TestColorImageDir + "btn_toggle_on.png"
@ -181,7 +188,7 @@
Var LEDv4Toggle[41] = "Enable" Var LEDv4Toggle[41] = "Enable"
Var LEDv4Toggle[42] = "Enable" Var LEDv4Toggle[42] = "Enable"
Var PlayTestLEDv4 = "false"
</EventOpen> </EventOpen>
@ -189,7 +196,36 @@
<EventTimeout> <EventTimeout>
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 60 Then DEBUGVAR CountDownBrewing
DEBUGVAR LEDv4PlaylistStatus
DEBUGVAR PlayTestLEDv4
DEBUGVAR LEDv4CountDownValue
DEBUGVAR GEN4_POS
If CountDownBrewing > 0 Then
Var CountDownBrewing = CountDownBrewing - 1
Else
If PlayTestLEDv4 = "true" Then
LEDv4Playlist "reset" "-" "-"
EndIf
Var PlayTestLEDv4 = "false"
EndIf
If PlayTestLEDv4 = "true" Then
; check-playlist-state
If LEDv4PlaylistStatus = "Ready" Then
LEDv4Playlist "play" "-" "-"
EndIf
If LEDv4PlaylistStatus = "Running" Then
;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf
EndIf
If Timeout > 120 Then
Open "ROOT/taobin_project/xml/vending_info.xml" Open "ROOT/taobin_project/xml/vending_info.xml"
EndIf EndIf
@ -2241,4 +2277,26 @@ Var Timeout = 0
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> LEDv4HorizontalX1 </X>
<Y> 700 </Y>
<Filename> bn_10s </Filename>
<FilenamePress> bp_10s </FilenamePress>
<EventClick>
LEDv2 LedV4Top Off 0 0 0 1 0
LEDv2 LedV4Mid Off 0 0 0 1 0
Var CountDownBrewing = 10
Var Timeout = 0
LEDv4Playlist "new" "XX-XX-XX-TEST" CountDownBrewing
Var PlayTestLEDv4 = "true"
SAVELOG "TestLEDAnime60s"
</EventClick>
</Button>
</Page> </Page>

2
xml/page_thankyou.xml
View file

@ -221,7 +221,7 @@
Var CountDownBrewing = BREW_CNT Var CountDownBrewing = BREW_CNT
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
Var TimeoutThankyou = TimeoutThankyou + 1 Var TimeoutThankyou = TimeoutThankyou + 1
If TimeoutThankyou = TimeoutToNext Then If TimeoutThankyou = TimeoutToNext Then

24
xml/page_thankyouConti.xml
View file

@ -17,7 +17,7 @@
SAVELOG BrewTime SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
Var Timeout = 0 Var Timeout = 0
Var ChangeFlag = 0 Var ChangeFlag = 0
@ -174,7 +174,7 @@
SAVELOG "Thank you conti version " + thankyouContiVersion SAVELOG "Thank you conti version " + thankyouContiVersion
SAVELOG "Support NextSmoothie and fix bug next" SAVELOG "Support NextSmoothie and fix bug next"
SAVELOG "MenuErrorCode" SAVELOG "MenuErrorCode"
DEBUGVAR NextSmoothie DEBUGVAR NextSmoothie
DEBUGVAR Seeker.SmoothieToPayment DEBUGVAR Seeker.SmoothieToPayment
@ -189,7 +189,7 @@
Var CountDownFailErrorHappendClear = 30 Var CountDownFailErrorHappendClear = 30
Var ThankyouContiString = "" Var ThankyouContiString = ""
DEBUGVAR FailErrorHappend DEBUGVAR FailErrorHappend
; setvarint FailErrorHappend 1 ; setvarint FailErrorHappend 1
@ -214,10 +214,10 @@
If CountDownFailErrorHappendClear = 29 Then If CountDownFailErrorHappendClear = 29 Then
__CMD "CLI" "clear-ice-for-next-drink" "-" "-" __CMD "CLI" "clear-ice-for-next-drink" "-" "-"
EndIf EndIf
If CountDownFailErrorHappendClear = 25 Then If CountDownFailErrorHappendClear = 25 Then
;__CMD "error-code-clear-all" "-" "-" "-" ;__CMD "error-code-clear-all" "-" "-" "-"
EndIf EndIf
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1 Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
@ -348,17 +348,17 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
Var MachineState_Result = 0 Var MachineState_Result = 0
If FailErrorHappend = 1 Then If FailErrorHappend = 1 Then
EndIf EndIf
If MenuReadyForCup = "YES" Then If MenuReadyForCup = "YES" Then
Var LastMakeDrinkResult = "-" Var LastMakeDrinkResult = "-"
If New_Payment = 1 Then If New_Payment = 1 Then
@ -371,7 +371,7 @@
Var NextSmoothie = 0 Var NextSmoothie = 0
If Seeker.SmoothieToPayment = 1 Then If Seeker.SmoothieToPayment = 1 Then
Var TimeOutSmoothiesProcess = 120 Var TimeOutSmoothiesProcess = 120
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
EndIf EndIf
@ -416,11 +416,11 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
;include=ROOT/taobin_project/inc/remove_cup_step.inc ;include=ROOT/taobin_project/inc/remove_cup_step.inc
If Timeout2 < 3 Then If Timeout2 < 3 Then
Var buttonRemoveCup = "Invisible" Var buttonRemoveCup = "Invisible"
EndIf EndIf
@ -482,7 +482,7 @@
Else Else
If MenuErrorCode > 0 Then If MenuErrorCode > 0 Then
If Timeout2 > 40 Then If Timeout2 > 40 Then
SAVELOG "Timeout2 40 MenuErrorCode not zero" SAVELOG "Timeout2 40 MenuErrorCode not zero"

48
xml/page_thankyouMore.xml
View file

@ -26,30 +26,30 @@
Var MachineState_Result = 0 Var MachineState_Result = 0
Var ChangeOK = 0 Var ChangeOK = 0
If show_eng = "true" Then
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" If show_eng = "true" Then
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var BottomText = PicturePath + "text_bottom_eng.png" Var BottomText = PicturePath + "text_bottom_eng.png"
Else Else
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var BottomText = PicturePath + "text_bottom_thai2.png" Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf EndIf
;inter-image ;inter-image
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var BottomText = PicturePath + "text_bottom_eng.png" Var BottomText = PicturePath + "text_bottom_eng.png"
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
EndIf EndIf
If LanguageShow = "MSC" Then If LanguageShow = "MSC" Then
Var BottomText = PicturePath + "text_bottom_eng.png" Var BottomText = PicturePath + "text_bottom_eng.png"
@ -60,7 +60,7 @@
DEBUGVAR LidState DEBUGVAR LidState
DEBUGVAR BottomText DEBUGVAR BottomText
If StarwState = "Press" Then If StarwState = "Press" Then
Machine StrawWithDelay Machine StrawWithDelay
LED LedDoorLid Blink 255 255 255 255 LED LedDoorLid Blink 255 255 255 255
@ -72,7 +72,7 @@
If CART_INDEX = 2 Then If CART_INDEX = 2 Then
Var showname = CART2_NAME_THAI Var showname = CART2_NAME_THAI
@ -87,22 +87,22 @@
EndIf EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1 Var CountDownBrewing = CountDownBrewing - 1
Var CountDownThankyou = CountDownThankyou - 1 Var CountDownThankyou = CountDownThankyou - 1
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout = 3 Then If Timeout = 3 Then
If CART_INDEX = 0 Then If CART_INDEX = 0 Then
Else Else
;Cart "MakeID" CART_INDEX ;Cart "MakeID" CART_INDEX
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/" Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art" Var VideoFileBegin = "TaoBin2_draft02_art"
Var VideoFileEnd = ".mp4" Var VideoFileEnd = ".mp4"
@ -123,22 +123,22 @@
EndIf EndIf
EndIf EndIf
; run test; ; run test;
If CountDownThankyou = 0 Then If CountDownThankyou = 0 Then
Var CountDownBrewing = BrewTime Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0 Var CountUpBrewing = 0
SAVELOG BrewTime SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"
Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"
EndIf EndIf
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
@ -147,7 +147,7 @@
Refresh Refresh
TimerReset TimerReset
</EventTimeout> </EventTimeout>
;<Image> ;<Image>
;<X> 0 </X> ;<X> 0 </X>
@ -185,8 +185,8 @@
<EventChangeStatus> <EventChangeStatus>
If ChangeStatus = "payout-end" Then If ChangeStatus = "payout-end" Then
EndIf EndIf
</EventChangeStatus> </EventChangeStatus>

4
xml/process/ledv4_process.ev
View file

@ -2,7 +2,7 @@ DEBUGVAR FrontDoorVersionInt
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
DEBUGVAR StartLEDBrewingAnimation DEBUGVAR StartLEDBrewingAnimation
If StartLEDBrewingAnimation = 0 Then If StartLEDBrewingAnimation = 0 Then
LEDv4Playlist "new" Seeker.selected_a_drink CountDownBrewing ;LEDv4Playlist "new" Seeker.selected_a_drink CountDownBrewing
Var StartLEDBrewingAnimation = 1 Var StartLEDBrewingAnimation = 1
EndIf EndIf
@ -17,7 +17,7 @@ If FrontDoorVersionInt > 19999 Then
Else Else
; ;
If LEDv4PlaylistStatus = "Running" Then If LEDv4PlaylistStatus = "Running" Then
;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
Else Else
LEDv4Playlist "pause" "processEv" "_notReady" LEDv4Playlist "pause" "processEv" "_notReady"
EndIf EndIf

1
xml/process/temp_ledv4_page_thankyou.ev
View file

@ -9,5 +9,4 @@ If FrontDoorVersionInt > 19999 Then
SAVELOG "LEDv4.PageThankYou" SAVELOG "LEDv4.PageThankYou"
Var
EndIf EndIf

5
xmlprofile/main.json
View file

@ -28,5 +28,10 @@
"enable": true, "enable": true,
"except": [], "except": [],
"modifiers": [] "modifiers": []
},
"y18IDCardExSodaTeaMilk": {
"enable": true,
"except": [],
"modifiers": []
} }
} }

5613
xmlprofile/y18IDCardExSodaTeaMilk.json Normal file
View file

File diff suppressed because it is too large Load diff

2
xmlprofile/y18IDCardExTeaMilk.json
View file

@ -1547,7 +1547,7 @@
}, },
{ {
"productCode": "12-05-03-0034", "productCode": "12-05-03-0034",
"enable": false "enable": true
}, },
{ {
"productCode": "12-05-03-0035", "productCode": "12-05-03-0035",