Merge remote-tracking branch 'origin/wso' into wso

This commit is contained in:
Ittipat Lusuk 2024-12-02 14:49:51 +07:00
commit a82a22c724
9 changed files with 251 additions and 162 deletions

View file

@ -221,15 +221,19 @@
Page_before_check_member
Font=Montserrat,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=72 Font=Kanit,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=72 Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center,LineHeight=86
002001 Please enter your mobile number\nto topup Tao bin credit. กรุณาใส่เบอร์มือถือ\nเพื่อเติมเต่าบินเครดิต Tao bin ခရက်ဒစ်ငွေဖြည့်ရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်သွင်းပါ။
002002 Please enter your mobile number\nto check reward point. กรุณาใส่เบอร์มือถือ\nเพื่อเช็กคะแนนสะสมของคุณ ဆုလာဘ်အမှတ်ကို စစ်ဆေးရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်သွင်းပါ။
002003 Please enter your mobile number\nto change password. กรุณาใส่เบอร์มือถือ\nเพื่อเปลี่ยนรหัสผ่าน စကားဝှက်ပြောင်းရန်\nသင့်မိုဘိုင်းနံပါတ်ကို ထည့်ပါ။
Topup
Font=Montserrat,Type=Light,Size=26,Color=0x513C2F,Align=Center,LineHeight=72 Font=Kanit,Type=Light,Size=26,Color=0x513C2F,Align=Center,LineHeight=72 Font=Kanit,Type=Medium,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Light,Size=26,Color=0x513C2F,Align=Center,LineHeight=86
002004 Top up phone เติมเงินมือถือ ဖုန်းငွေဖြည့်ပါ။
002005 Reward Points / Top up credit เติมเงินเข้าเครดิต / เช็คคูปองสะสม ဆုအမှတ်များ / ငွေဖြည့်ခရက်ဒစ်
@ -1318,14 +1322,14 @@
2100045 Coffee module Coffee module
2100046 Cofee module type Cofee module type
2100047 Coffee module serial number Coffee module serial number
2100048 Lid sensor will be inactive when machine operating Lid sensor will be inactive when machine operating
2100049 Lid sensor will be active when machine operating Lid sensor will be active when machine operating
2100050 Request straw button will appear on machine's sale screen Request straw button will appear on machine's sale screen
2100051 Request straw button will disappear on machine's sale screen Request straw button will disappear on machine's sale screen
2100052 Pulse compressor will be active when machine operating. Pulse compressor will be active when machine operating.
2100053 Pulse compressor will be inactive when machine operating. Pulse compressor will be inactive when machine operating.
2100054 Sleep mode will be turn onwhen machine operating. Sleep mode will be turn onwhen machine operating.
2100055 Sleep mode will be turn offwhen machine operating. Sleep mode will be turn offwhen machine operating.
2100048 Lid sensor will be inactive when machine operating Lid sensor will be inactive when machine operating
2100049 Lid sensor will be active when machine operating Lid sensor will be active when machine operating
2100050 Request straw button will appear on machine's sale screen Request straw button will appear on machine's sale screen
2100051 Request straw button will disappear on machine's sale screen Request straw button will disappear on machine's sale screen
2100052 Pulse compressor will be active when machine operating. Pulse compressor will be active when machine operating.
2100053 Pulse compressor will be inactive when machine operating. Pulse compressor will be inactive when machine operating.
2100054 Sleep mode will be turn onwhen machine operating. Sleep mode will be turn onwhen machine operating.
2100055 Sleep mode will be turn offwhen machine operating. Sleep mode will be turn offwhen machine operating.
2100056 Please check before confirming Please check before confirming
2100057 Fan module Fan module

Can't render this file because it contains an unexpected character in line 183 and column 14.

View file

@ -39,9 +39,7 @@
EndIf
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
RootLayoutVisible 13 "show"
RootLayoutVisible 3 "show"
RootLayoutVisible 13 "show"
SetInstanceIgnoreTouch

View file

@ -28,7 +28,7 @@
SAVELOG PreviseXMLFileName2
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
Var Timeout = 0

View file

@ -29,7 +29,7 @@
RootLayoutVisible 12 "show"
Var Timeout = 0
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
SetInstanceIgnoreTouch

View file

@ -32,7 +32,7 @@
RootLayoutVisible 12 "show"
Var Timeout = 0
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
SetInstanceIgnoreTouch

View file

@ -6,7 +6,7 @@
; open from page_catalog.lxml
RootLayoutVisible 3 "show"
RootLayoutVisible 3 "show"
RootLayoutVisible 13 "show"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"

View file

@ -2695,6 +2695,7 @@
<X> 0 </X>
<Y> 752 </Y>
<Width> 1080</Width>
<WidthText> 900 </WidthText>
<Align> Center </Align>
<Size> Auto </Size>
<Font> KanitMediumTTF </Font>