add truewallet new icons

This commit is contained in:
miggaze 2022-03-14 11:17:37 +07:00
commit 39bead6b3c
112 changed files with 4472 additions and 1599 deletions

View file

@ -35,7 +35,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -6,6 +6,11 @@
default_dir_press = 'ROOT/taobin_project/image/page_drink_press/'
default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/'
new_default_dir = 'ROOT/taobin_project/image/page_drink_n/'
new_default_dir2 = 'ROOT/taobin_project/image/page_drink_select_n/'
new_default_dir_press = 'ROOT/taobin_project/image/page_drink_press_n/'
new_default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable_n/'
menu_count = 0
x1 = 44

183
xml/menu_new_layout_gen.py Normal file
View file

@ -0,0 +1,183 @@
out_xml('<FrameScroll> \r\n')
out_xml('<X> 10 </X>\r\n')
out_xml('<Y> 497 </Y>\r\n')
out_xml('<Width> 1080 </Width>\r\n')
out_xml('<ScrollHeight> "auto" </ScrollHeight>\r\n')
out_xml('<Scroll> "Vertical" </Scroll>\r\n')
out_xml('<Column> 4 </Column>\r\n')
count_test = 0
out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
for spl in menu_new_list:
#product_code = s
menu_img = spl[7]
out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n')
out_xml( '<Block>\r\n')
out_xml('\t<MarginLeft> 33 </MarginLeft>\r\n')
out_xml('\t<MarginTop> 22 </MarginTop>\r\n')
out_xml('\t<Width> 225 </Width>\r\n')
out_xml('\t<Height> 296 </Height>\r\n')
out_xml( '\t<State> Flag( \" ' + spl[4] + '.Button,' + spl[5] + '.Button,' + spl[6] + '.Button\") </State> \r\n')
out_xml( '\t<Button>\r\n')
out_xml( '\t<State> "Enable" </State> \r\n')
out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
out_xml( '\t<FilenamePress> "' + new_default_dir_press + '/'+ menu_img +'" </FilenamePress>\r\n')
out_xml( '\t<FilenameDisable> "' + new_default_dir + '/'+ 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')
out_xml( '\t<EventOnClick> \r\n')
out_xml( '\t</EventOnClick>\r\n')
out_xml( '\t</Button>\r\n')
out_xml( '\t<Text>\r\n')
out_xml( '\t<X> 16 </X>\r\n')
out_xml( '\t<Y> 164 </Y>\r\n')
out_xml( '\t<Size> 24 </Size>\r\n')
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Mode> "multi2" </Mode>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x322B26 </Color>\r\n')
out_xml( '\t<State> showthaiText </State>\r\n')
out_xml( '\t<Value> "' + spl[0] + '" </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '\t<Text>\r\n')
out_xml( '\t<X> 16 </X>\r\n')
out_xml( '\t<Y> 220 </Y>\r\n')
out_xml( '\t<Size> 14 </Size>\r\n')
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<State> showthaiText </State>\r\n')
out_xml( '\t<Value> "' + spl[2] + '" </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '\t<Text>\r\n')
out_xml( '\t<X> 16 </X>\r\n')
out_xml( '\t<Y> 164 </Y>\r\n')
out_xml( '\t<Size> 22 </Size>\r\n')
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Mode> "multi2" </Mode>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x322B26 </Color>\r\n')
out_xml( '\t<State> showengText </State>\r\n')
out_xml( '\t<Value> "' + spl[1] + '" </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '\t<Text>\r\n')
out_xml( '\t<X> 16 </X>\r\n')
out_xml( '\t<Y> 220 </Y>\r\n')
out_xml( '\t<Size> 14 </Size>\r\n')
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<State> showengText </State>\r\n')
out_xml( '\t<Value> "' + spl[3] + '" </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '\t<Image>\r\n')
out_xml( '\t<X> 16 </X>\r\n')
out_xml( '\t<Y> 264 </Y>\r\n')
out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n')
out_xml( '\t</Image>\r\n')
shw = "Enable"
if spl[4] == "-" :
shw = "Invisible"
out_xml( '\t<Image>\r\n')
out_xml( '\t<X> 16 </X>\r\n')
out_xml( '\t<Y> 264 </Y>\r\n')
out_xml( '\t<State> "' + shw + '" </State>\r\n')
out_xml( '\t<Filename> Var( DirImage2 + "hot.png" ) </Filename>\r\n')
out_xml( '\t</Image>\r\n')
out_xml( '\t<Text>\r\n')
out_xml( '\t<X> 50 </X>\r\n')
out_xml( '\t<Y> 265 </Y>\r\n')
out_xml( '\t<Size> 14 </Size>\r\n')
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<State> "' + shw + '" </State>\r\n')
out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n')
shw = "Enable"
if spl[5] == "-" :
shw = "Invisible"
out_xml( '\t<Image>\r\n')
out_xml( '\t<X> 81 </X>\r\n')
out_xml( '\t<Y> 264 </Y>\r\n')
out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n')
out_xml( '\t<State> "' + shw + '" </State>\r\n')
out_xml( '\t</Image>\r\n')
out_xml( '\t<Text>\r\n')
out_xml( '\t<X> 115 </X>\r\n')
out_xml( '\t<Y> 265 </Y>\r\n')
out_xml( '\t<Size> 14 </Size>\r\n')
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<State> "' + shw + '" </State>\r\n')
out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n')
shw = "Enable"
if spl[6] == "-" :
shw = "Invisible"
out_xml( '\t<Image>\r\n')
out_xml( '\t<X> 146 </X>\r\n')
out_xml( '\t<Y> 264 </Y>\r\n')
out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n')
out_xml( '\t<State> "' + shw + '" </State>\r\n')
out_xml( '\t</Image>\r\n')
out_xml( '\t<Text>\r\n')
out_xml( '\t<X> 180 </X>\r\n')
out_xml( '\t<Y> 265 </Y>\r\n')
out_xml( '\t<Size> 14 </Size>\r\n')
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<State> "' + shw + '" </State>\r\n')
out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '</Block>\r\n')
count_test = count_test + 1
#if count_test > 8 :
# break
out_xml('</FrameScroll>\r\n')
out_xml('; Cart\r\n')
out_xml('<Button>\r\n')
out_xml('<X> 915 </X>\r\n')
out_xml('<Y> 1769 </Y>\r\n')
out_xml('<State> showCart </State>\r\n')
out_xml('<Filename> cart_image_bn </Filename>\r\n')
out_xml('<FilenamePress> cart_image_bp </FilenamePress>\r\n')
out_xml('<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
out_xml('<Volume> SoundVolume </Volume>\r\n')
out_xml('<EventClick> \r\n')
out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n')
out_xml('</EventClick>\r\n')
out_xml('</Button>\r\n')

View file

@ -558,7 +558,7 @@
EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
@ -567,7 +567,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml"
;Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf

View file

@ -197,7 +197,12 @@
Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf
; Hide
Var bg_strawlid_ST = "Invisible"
Var bg_strawProblem_ST = "Invisible"
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
</EventOpen>

View file

@ -101,6 +101,11 @@
Var DirImage = "ROOT/taobin_project/image/complete/"
Var next_pic_bg = DirImage + "/Preparing.png"
Var bg_strawlid_ST = "Invisible"
Var bg_strawProblem_ST = "Invisible"
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
</EventOpen>

View file

@ -196,6 +196,11 @@
Var Seeker.lidAction = 2
EndIf
; Disable
Var bg_strawlid_ST = "Invisible"
Var bg_strawProblem_ST = "Invisible"
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
</EventOpen>

View file

@ -140,6 +140,10 @@
Var ButtontoTopupMenu = "Disable"
EndIf
READ_FILE "/mnt/sdcard/new_layout" new_layout
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -271,7 +275,11 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>

View file

@ -107,7 +107,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -174,7 +174,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -162,7 +162,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -150,7 +150,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -149,7 +149,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -147,7 +147,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -140,7 +140,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -146,7 +146,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -162,7 +162,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -142,7 +142,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -0,0 +1,88 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.xml
?>
If SpiralOnline = "true" Then
Var Menu1Selected2 = "PressForever"
Else
; coffee show
Var Menu1Selected = "PressForever"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0
Var showCart = "Invisible"
If MultiPayEnable = "true" Then
If CART_COUNT = 1 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart1.png"
Var cart_image_bp = DirImageCart + "/bp_cart1.png"
EndIf
If CART_COUNT = 2 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart2.png"
Var cart_image_bp = DirImageCart + "/bp_cart2.png"
EndIf
If CART_COUNT = 3 Then
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
EndIf
EndIf
If show_eng = "true" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Else
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
EndIf
</EventOpen>
<?hurr
#include=menu_catalog.xml
?>
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
</EventClick>
</Button>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -84,8 +84,8 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
Var CountDownBrewing = BREW_CNT
; run test;
;If CountDownBrewing = 40 Then
; Open "ROOT/taobin_project/xml/page_drinkok.xml"

View file

@ -32,8 +32,8 @@
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing

View file

@ -619,9 +619,7 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing

View file

@ -163,8 +163,10 @@
EndIf
Var bg_strawlid_ST = "Invisible"
Var bg_strawProblem_ST = "Invisible"
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
</EventOpen>
<Timeout> 500 </Timeout>
@ -246,11 +248,14 @@
If CART_INDEX < CART_COUNT Then
If HaveCup = "false" Then
If CupChecking = "false" Then
Var CART_INDEX = CART_INDEX + 1
Cart "PreparID" CART_INDEX
Cart "MakeID" CART_INDEX
Open "ROOT/taobin_project/xml/page_thankyouMore.xml"
Var CART_INDEX = CART_INDEX + 1
Cart "PreparID" CART_INDEX
Cart "MakeID" CART_INDEX
Open "ROOT/taobin_project/xml/page_thankyouMore.xml"
EndIf
Else
If CupOnArm = "true" Then

View file

@ -172,6 +172,8 @@
Var CountStepPackPayment = CountStepPackPayment + 1
EndIf
;Var CountStepPackPayment = 1
DEBUGVAR Seeker
DEBUGVAR HaveCup
DEBUGVAR CupChecking
@ -185,6 +187,7 @@
SAVELOG ExtendData
If GetPayInfoFlag = 0 Then
SaveLog "RoadShow test"
If RoadShow = "false" Then
;CoinVending ON
CoinVending XBILL

View file

@ -43,27 +43,32 @@
EndIf
EndIf
DEBUGVAR stop_now
DEBUGVAR MachineStage
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
Else
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/close_en/"
Else
Var DirImage = "ROOT/taobin_project/image/close_th"
EndIf
EndIf
EndIf
DEBUGVAR DirImage
If MachineStage = "drink-failed" Then
If stop_now = "true" Then
If show_eng = "true" Then
@ -94,7 +99,7 @@
LED LedDoorLid Off 255 255 255 255
EndIf
Var MaintenanceCard = 16
Var MaintenanceCard = 20
Random MaintenanceCard
Var index = 1 + MaintenanceCard
@ -111,6 +116,7 @@
DEBUGVAR DoorLidPosition
DEBUGVAR EmergencyStop
Var TimeOut = 0
</EventOpen>
<Timeout> 5000 </Timeout>
<EventTimeout>
@ -158,6 +164,13 @@
EndIf
EndIf
Var TimeOut = TimeOut + 1
If TimeOut > 12 Then
Var TimeOut = 0
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf

File diff suppressed because it is too large Load diff

View file

@ -197,7 +197,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

View file

@ -197,7 +197,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
@ -1252,14 +1252,37 @@
;-BEGIN shot layout
<Block>
<Width> 986 </Width>
<Height> 157 </Height>
<Height> 280 </Height>
<MarginTop> 20 </MarginTop>
<State> ShotCoffeeBG </State>
<State> "Enable" </State>
<Image>
<Filename> backGroundAddExtra </Filename>
<X> 0 </X>
<Y> 10 </Y>
<Filename> Var( DirImage + "/block_top.png" ) </Filename>
</Image>
<Image>
<X> 0 </X>
<Y> 184 </Y>
<Filename> Var( DirImage + "/block_bottom.png" ) </Filename>
</Image>
;
<Image>
<X> 0 </X>
<Y> 68 </Y>
<Filename> Var( DirImage + "/block_middle.png" ) </Filename>
</Image>
<Image>
<X> 40 </X>
<Y> 70 </Y>
<Filename> Var( DirImage + "/img_shot_esp.png" ) </Filename>
</Image>
<Button>
<X> 40 </X>
<Y> 72 </Y>
@ -1290,19 +1313,28 @@
</Animation>
</Button>
;
<Image>
<X> 0 </X>
<Y> 140 </Y>
<Filename> Var( DirImage + "/block_middle.png" ) </Filename>
</Image>
<Image>
<X> 40 </X>
<Y> 142 </Y>
<Filename> Var( DirImage + "/img_shot_esp.png" ) </Filename>
</Image>
<Button>
<X> 896 </X>
<Y> 79 </Y>
<X> 40 </X>
<Y> 142 </Y>
<State> showShotEnable </Stage>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/image/topping2/bn_add_shot.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_shot.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_shot.png" ) </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "Press add normal shot"
If showShotEnable = "Press" Then
@ -1322,12 +1354,6 @@
</Animation>
</Button>
<Image>
<State> showText4 </Stage>
<X> 602 </X>
<Y> 64 </Y>
<Filename> Var( DirImage + "/text4.png" ) </Filename>
</Image>
</Block>
;-END
;