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

DUBAI: rm sound thai & fix bug next order (dubai) not show

Browse source
This commit is contained in:
Pakin 2024-10-02 15:14:06 +07:00
parent c86afed35d
commit 95025531da
12 changed files with 132 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

44
inter/uae_dubai/xml/menu_catalog_new.lxml
View file

@ -114,38 +114,18 @@
EndIf
;inter-image
If CountryName = "UnitedArabEmirates Dubai" Then
;Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/inter/whatthecup/image/page3_en"
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
If LanguageShow = "UAE_DUBAI" Then
;Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
Var DirImage = "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/page3_2/"
EndIf
If UsePepsiTheme = 1 Then
Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var DirImage2 = DirImage2 + "/image/drink_option_en/"
If LanguageShow = "UAE_DUBAI" Then
Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var DirImageAlter = DirImageAlter + "/image/page3_2/"
Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var DirImage = DirImage + "/image/page3/"
Else
Var DirImageAlter = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var DirImageAlter = DirImageAlter + "/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var DirImage = DirImage + "/image/page3_en/"
Var ice_tab_text = "Ice will be ready at "
EndIf
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
Var DirImage = "ROOT/taobin_project/inter/uae_dubai/image/page3_2/"
EndIf
SAVELOG "EventLanguageOnChange menu -list"
@ -171,7 +151,7 @@
<Image>
<X> 0 </X>
<Y> 494 </Y>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page3_2_en/tab_line_bottom.png" </Filename>
<Filename> "ROOT/taobin_project/image/page3/tab_line_bottom.png" </Filename>
</Image>
@ -187,8 +167,8 @@
<Button>
<X> 19 </X>
<Y> 381 </Y>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.png" </FilenamePress>
<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -492,7 +472,7 @@
<Width> 170 </Width>
<Height> 30 </Height>
<Font> KanitMediumTTF </Font>
<Color> WTCBlueColor </Color>
<Color> HeadlineColor </Color>
<Value> PriceUnitText </Value>
</Text>

18
inter/uae_dubai/xml/menu_catalog_new.py
View file

@ -8,15 +8,21 @@ if param == "old":
f.close()
else:
if "v2" in param:
print("new layout catalog ============================> inter.")
f = open( directory_to_process + "/menu_catalog_new.lxml", "r")
#print(f.read())
out_xml(f.read())
f.close()
if "pepsi" in param:
print("new layout catalog ============================> inter.")
f = open( directory_to_process + "/menu_catalog_new_pepsi.lxml", "r")
#print(f.read())
out_xml(f.read())
f.close()
else:
print("new layout catalog ============================> inter.")
f = open( directory_to_process + "/menu_catalog_new.lxml", "r")
#print(f.read())
out_xml(f.read())
f.close()
else:
print("new layout catalog enable.")
f = open( directory_to_process + "/menu_catalog_new.xml", "r")
#print(f.read())
out_xml(f.read())
f.close()

25
inter/uae_dubai/xml/menu_new_layout_gen_v2.py
View file

@ -269,9 +269,12 @@
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> WTCBlueColor </Color>\r\n')
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n')
if "pepsi" in param:
out_xml( '\t<Color> WTCBlueColor </Color>\r\n')
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n')
else:
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
#out_xml( '\t<Value> Var( "฿" + $' + spl[ idx_hot_product_code] + '.Price ) </Value>\r\n')
@ -314,8 +317,12 @@
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> WTCBlueColor </Color>\r\n')
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n')
if "pepsi" in param:
out_xml( '\t<Color> WTCBlueColor </Color>\r\n')
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n')
else:
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
if "inter" in param:
if "free" in param:
@ -353,8 +360,12 @@
out_xml( '\t<Font> KanitRegularTTF </Font>\r\n')
#out_xml( '\t<Align> end </Align>\r\n')
out_xml( '\t<Color> WTCBlueColor </Color>\r\n')
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n')
if "pepsi" in param:
out_xml( '\t<Color> WTCBlueColor </Color>\r\n')
out_xml( '\t<ColorDisable> WTCWhiteColor </ColorDisable>\r\n')
else:
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
if "inter" in param:
if "free" in param:

2
inter/uae_dubai/xml/page_brewing3.lxml
View file

@ -1813,7 +1813,7 @@
<Y> 1787 </Y>
<State>SelectMenuBetweenBrewEnable2</State>
<Filename> Var( DirImageDoing + "/bn_next_order.png" ) </Filename>
<FilenamePress> Var( DirImageDoing + "/bp_next_order.png" )"/bp_next_order.png" </FilenamePress>
<FilenamePress> Var( DirImageDoing + "/bp_next_order.png" ) </FilenamePress>
<EventClick>
If MachineState_Result = 0 Then

16
inter/uae_dubai/xml/page_brewing3Conti.xml
View file

@ -6,6 +6,9 @@
<Volume> SoundVolume </Volume>
<EventOpen>
;
Var DirImageDoing = "ROOT/taobin_project/inter/uae_dubai/image/page_doing"
Var ActionOKCase = 0
Var Seeker = "curr"
@ -36,8 +39,10 @@
DEBUGVAR Seeker
DEBUGVAR IMG_CNT
Var next_pic_bn = DirImage + "/bn_add_order.png"
Var next_pic_bp = DirImage + "/bp_add_order.png"
Var next_pic_bn = DirImageDoing + "/bn_next_order.png"
Var next_pic_bp = DirImageDoing + "/bp_next_order.png"
Var text_next_order = DirImage + "/text_next_order.png"
If NextOrder = "true" Then
@ -1074,6 +1079,13 @@
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
</EventClick>
<Language>
<X> 0 </X>
<Y> 20 </Y>
<Width> 297 </Width>
<Height> 96 </Height>
<ID> 000407 </ID>
</Language>
</Button>