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

Thai Inter: fix overlapping text

Browse source
This commit is contained in:
thanawat saiyota 2024-12-02 13:04:46 +07:00
parent e538193843
commit 6ca757b953
4 changed files with 146 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inter/tha/xml/multi/page_catalog_group_recommend.lxml
View file

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

2
inter/tha/xml/multi/page_instance2.xml
View file

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

4
xml/page_board.xml
View file

@ -1885,7 +1885,7 @@ PRICE "Reset" "-"
If InternationalEnable = 1 Then If InternationalEnable = 1 Then
If CountryName = "Thailand" Then If CountryName = "Thailand" Then
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
Else Else
; show language icon ; show language icon
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@ -2334,7 +2334,7 @@ PRICE "Reset" "-"
If CountryName = "Thailand" Then If CountryName = "Thailand" Then
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
Else ; show language icon Else ; show language icon
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RootLayoutVisible 3 "show" RootLayoutVisible 3 "show"

273
xml/page_check_member2.xml
View file

@ -7,7 +7,7 @@
<EventOpen> <EventOpen>
; On open ; On open
RootLayoutVisible 3 "show"
If LuckyDrawCampaign = 1 Then If LuckyDrawCampaign = 1 Then
;Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml" ;Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
EndIf EndIf
@ -223,6 +223,7 @@
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/display_point_en" Var DirImage = "ROOT/taobin_project/image/display_point_en"
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
Var text5Img = "/text5.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"
If TaobinExpireMonth = "01" Then If TaobinExpireMonth = "01" Then
@ -346,7 +347,7 @@
Var TaobinLeveImg = "/taoLevel4.png" Var TaobinLeveImg = "/taoLevel4.png"
EndIf EndIf
If CouponIDA = "" Then If CouponIDA = "" Then
Else Else
@ -458,6 +459,7 @@
Var CouponExireA_M = "December" Var CouponExireA_M = "December"
EndIf EndIf
Var CouponExpireA = ""
Var CouponExpireA = CouponExpireA + CouponExireA_D Var CouponExpireA = CouponExpireA + CouponExireA_D
Var CouponExpireA = CouponExpireA + " " Var CouponExpireA = CouponExpireA + " "
Var CouponExpireA = CouponExpireA + CouponExireA_M Var CouponExpireA = CouponExpireA + CouponExireA_M
@ -465,7 +467,7 @@
Var CouponExpireA = CouponExpireA + CouponExireA_Y Var CouponExpireA = CouponExpireA + CouponExireA_Y
Var CouponExpireA = "Expires " + CouponExpireA Var CouponExpireA = "Expires " + CouponExpireA
Var CouponExpireAPosittion = 1375
EndIf EndIf
@ -580,6 +582,7 @@
Var CouponExireB_M = "December" Var CouponExireB_M = "December"
EndIf EndIf
Var CouponExpireB = CouponExpireB + CouponExireB_D Var CouponExpireB = CouponExpireB + CouponExireB_D
Var CouponExpireB = CouponExpireB + " " Var CouponExpireB = CouponExpireB + " "
Var CouponExpireB = CouponExpireB + CouponExireB_M Var CouponExpireB = CouponExpireB + CouponExireB_M
@ -587,6 +590,7 @@
Var CouponExpireB = CouponExpireB + CouponExireB_Y Var CouponExpireB = CouponExpireB + CouponExireB_Y
Var CouponExpireB = "Expires " + CouponExpireB Var CouponExpireB = "Expires " + CouponExpireB
EndIf EndIf
@ -597,6 +601,7 @@
If LanguageShow = "THAI" Then If LanguageShow = "THAI" Then
Var DirImage = "ROOT/taobin_project/image/display_point" Var DirImage = "ROOT/taobin_project/image/display_point"
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
Var text5Img = "/text5.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"
If TaobinExpireMonth = "01" Then If TaobinExpireMonth = "01" Then
@ -719,7 +724,7 @@
Var TaobinLeveImg = "/taoLevel4.png" Var TaobinLeveImg = "/taoLevel4.png"
EndIf EndIf
If CouponIDA = "" Then If CouponIDA = "" Then
Else Else
@ -829,6 +834,7 @@
Var CouponExireA_M = "ธันวาคม" Var CouponExireA_M = "ธันวาคม"
EndIf EndIf
Var CouponExpireA = ""
Var CouponExpireA = CouponExpireA + CouponExireA_D Var CouponExpireA = CouponExpireA + CouponExireA_D
Var CouponExpireA = CouponExpireA + " " Var CouponExpireA = CouponExpireA + " "
Var CouponExpireA = CouponExpireA + CouponExireA_M Var CouponExpireA = CouponExpireA + CouponExireA_M
@ -836,7 +842,7 @@
Var CouponExpireA = CouponExpireA + CouponExireA_Y Var CouponExpireA = CouponExpireA + CouponExireA_Y
Var CouponExpireA = "หมดอายุ " + CouponExpireA Var CouponExpireA = "หมดอายุ " + CouponExpireA
Var CouponExpireAPosittion = 1375
EndIf EndIf
@ -950,6 +956,7 @@
Var CouponExireB_M = "ธันวาคม" Var CouponExireB_M = "ธันวาคม"
EndIf EndIf
Var CouponExpireB = CouponExpireB + CouponExireB_D Var CouponExpireB = CouponExpireB + CouponExireB_D
Var CouponExpireB = CouponExpireB + " " Var CouponExpireB = CouponExpireB + " "
Var CouponExpireB = CouponExpireB + CouponExireB_M Var CouponExpireB = CouponExpireB + CouponExireB_M
@ -957,6 +964,7 @@
Var CouponExpireB = CouponExpireB + CouponExireB_Y Var CouponExpireB = CouponExpireB + CouponExireB_Y
Var CouponExpireB = "หมดอายุ " + CouponExpireB Var CouponExpireB = "หมดอายุ " + CouponExpireB
EndIf EndIf
@ -966,133 +974,134 @@
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/display_point_mmr" Var DirImage = "ROOT/taobin_project/image/display_point_mmr"
If TaobinExpireMonth = "01" Then Var text5Img = "/text5-MMR.png"
Var TaobinExpireMonth = "Jan" If TaobinExpireMonth = "01" Then
Var TaobinExpireMonthX = "ဇန္နဝါရီလ" Var TaobinExpireMonth = "Jan"
EndIf Var TaobinExpireMonthX = "ဇန္နဝါရီလ"
EndIf
If TaobinExpireMonth = "02" Then
Var TaobinExpireMonth = "Feb" If TaobinExpireMonth = "02" Then
Var TaobinExpireMonthX = "ေဖေဖာ္ဝါရီလ" Var TaobinExpireMonth = "Feb"
EndIf Var TaobinExpireMonthX = "ေဖေဖာ္ဝါရီလ"
EndIf
If TaobinExpireMonth = "03" Then
Var TaobinExpireMonth = "Mar" If TaobinExpireMonth = "03" Then
Var TaobinExpireMonthX = "မတ္လ" Var TaobinExpireMonth = "Mar"
EndIf Var TaobinExpireMonthX = "မတ္လ"
EndIf
If TaobinExpireMonth = "04" Then
Var TaobinExpireMonth = "Apr" If TaobinExpireMonth = "04" Then
Var TaobinExpireMonthX = "ဧျပီလ" Var TaobinExpireMonth = "Apr"
EndIf Var TaobinExpireMonthX = "ဧျပီလ"
EndIf
If TaobinExpireMonth = "05" Then
Var TaobinExpireMonth = "May" If TaobinExpireMonth = "05" Then
Var TaobinExpireMonthX = "ေမလ" Var TaobinExpireMonth = "May"
EndIf Var TaobinExpireMonthX = "ေမလ"
EndIf
If TaobinExpireMonth = "06" Then
Var TaobinExpireMonth = "Jun" If TaobinExpireMonth = "06" Then
Var TaobinExpireMonthX = "ဇြန္လ" Var TaobinExpireMonth = "Jun"
EndIf Var TaobinExpireMonthX = "ဇြန္လ"
EndIf
If TaobinExpireMonth = "07" Then
Var TaobinExpireMonth = "Jul" If TaobinExpireMonth = "07" Then
Var TaobinExpireMonthX = "ဇူလိုင္လ" Var TaobinExpireMonth = "Jul"
EndIf Var TaobinExpireMonthX = "ဇူလိုင္လ"
EndIf
If TaobinExpireMonth = "08" Then
Var TaobinExpireMonth = "Aug" If TaobinExpireMonth = "08" Then
Var TaobinExpireMonthX = "ၾသဂုတ္လ" Var TaobinExpireMonth = "Aug"
EndIf Var TaobinExpireMonthX = "ၾသဂုတ္လ"
EndIf
If TaobinExpireMonth = "09" Then
Var TaobinExpireMonth = "Sep" If TaobinExpireMonth = "09" Then
Var TaobinExpireMonthX = "စက္တင္ဘာလ" Var TaobinExpireMonth = "Sep"
EndIf Var TaobinExpireMonthX = "စက္တင္ဘာလ"
EndIf
If TaobinExpireMonth = "10" Then
Var TaobinExpireMonth = "Oct" If TaobinExpireMonth = "10" Then
Var TaobinExpireMonthX = "ေအာက္တိုဘာလ" Var TaobinExpireMonth = "Oct"
EndIf Var TaobinExpireMonthX = "ေအာက္တိုဘာလ"
EndIf
If TaobinExpireMonth = "11" Then
Var TaobinExpireMonth = "Nov" If TaobinExpireMonth = "11" Then
Var TaobinExpireMonthX = "ႏိုဝင္ဘာလ" Var TaobinExpireMonth = "Nov"
EndIf Var TaobinExpireMonthX = "ႏိုဝင္ဘာလ"
EndIf
If TaobinExpireMonth = "12" Then
Var TaobinExpireMonth = "Dec" If TaobinExpireMonth = "12" Then
Var TaobinExpireMonthX = "ဒီဇင္ဘာလ" Var TaobinExpireMonth = "Dec"
EndIf Var TaobinExpireMonthX = "ဒီဇင္ဘာလ"
EndIf
INT TaobinExpireYear
INT TaobinExpireDay INT TaobinExpireYear
INT TaobinExpireDay
Var TaobinExpireYear = TaobinExpireYear + 0
Var TaobinExpireYear = TaobinExpireYear + 0
;Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ "
;Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons ;Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ "
;Var TaobinLevelDesc3 = TaobinLevelDesc3 + " နံပါတ်များ" ;Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
;Var TaobinLevelDesc3 = TaobinLevelDesc3 + " နံပါတ်များ"
If TaobinLevel = "1" Then
Var TaobinLevelDesc1 = "ရှက်လိပ်အဆင့်" If TaobinLevel = "1" Then
Var TaobinLevelDesc1 = "ရှက်လိပ်အဆင့်"
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel1.png"
EndIf
If TaobinLevel = "2" Then
Var TaobinLevelDesc1 = "လမ်းလျှောက်လိပ်အဆင့်"
Var PointDiff = 150 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Flying turtle အဆင့်သို့ ရွှေ့ရန်"
Var TaobinLeveImg = "/taoLevel2.png"
If CoffeePointRank > 149 Then
;Var TaobinLeveImg = "/taoLevel3.png"
;Var TaobinLevelDesc1 = "လိပ်အဆင့် "
Var TaobinLevelDesc2 = "" Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 150
Var TaobinLeveImg = "/taoLevel1.png"
EndIf EndIf
If TaobinLevel = "2" Then EndIf
Var TaobinLevelDesc1 = "လမ်းလျှောက်လိပ်အဆင့်"
Var PointDiff = 150 - CoffeePointRank If TaobinLevel = "3" Then
Var TaobinLevelDesc2 = "Earn " + PointDiff Var TaobinLevelDesc1 = "လိပ်ပျံအဆင့်အထိ " + ExpireStrTmp
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Flying turtle အဆင့်သို့ ရွှေ့ရန်" Var PointDiff = 200 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLeveImg = "/taoLevel2.png" Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Master လိပ်အဆင့်သို့ ပြောင်းရွှေ့ရန်"
If CoffeePointRank > 149 Then
;Var TaobinLeveImg = "/taoLevel3.png" Var TaobinLeveImg = "/taoLevel3.png"
;Var TaobinLevelDesc1 = "လိပ်အဆင့် " If CoffeePointRank > 199 Then
Var TaobinLevelDesc2 = "" ;Var TaobinLeveImg = "/taoLevel4.png"
;Var CoffeePointRank = CoffeePointRank - 150
;Var TaobinLevelDesc1 = "သခင်လိပ်အဆင့် "
EndIf
EndIf
If TaobinLevel = "3" Then
Var TaobinLevelDesc1 = "လိပ်ပျံအဆင့်အထိ " + ExpireStrTmp
Var PointDiff = 200 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " အခွံများ "
Var TaobinLevelDesc2 = TaobinLevelDesc2 + "Master လိပ်အဆင့်သို့ ပြောင်းရွှေ့ရန်"
Var TaobinLeveImg = "/taoLevel3.png"
If CoffeePointRank > 199 Then
;Var TaobinLeveImg = "/taoLevel4.png"
;Var TaobinLevelDesc1 = "သခင်လိပ်အဆင့် "
Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 350
EndIf
EndIf
If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "မာစတာလိပ်အဆင့်အထိ " + ExpireStrTmp
Var TaobinLevelDesc2 = "" Var TaobinLevelDesc2 = ""
;Var CoffeePointRank = CoffeePointRank - 350
Var TaobinLeveImg = "/taoLevel4.png"
EndIf EndIf
EndIf
If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "မာစတာလိပ်အဆင့်အထိ " + ExpireStrTmp
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel4.png"
EndIf
If CouponIDA = "" Then If CouponIDA = "" Then
Else Else
Var CouponSTA = "Enable" Var CouponSTA = "Enable"
@ -1201,6 +1210,7 @@
Var CouponExireA_M = "ဒီဇင္ဘာလ" Var CouponExireA_M = "ဒီဇင္ဘာလ"
EndIf EndIf
Var CouponExpireA = ""
Var CouponExpireA = CouponExpireA + CouponExireA_D Var CouponExpireA = CouponExpireA + CouponExireA_D
Var CouponExpireA = CouponExpireA + " " Var CouponExpireA = CouponExpireA + " "
Var CouponExpireA = CouponExpireA + CouponExireA_M Var CouponExpireA = CouponExpireA + CouponExireA_M
@ -1208,7 +1218,7 @@
Var CouponExpireA = CouponExpireA + CouponExireA_Y Var CouponExpireA = CouponExpireA + CouponExireA_Y
Var CouponExpireA = "သက်တမ်းကုန် " + CouponExpireA Var CouponExpireA = "သက်တမ်းကုန် " + CouponExpireA
Var CouponExpireAPosittion = 1400
EndIf EndIf
@ -1322,6 +1332,7 @@
Var CouponExireB_M = "ဒီဇင္ဘာလ" Var CouponExireB_M = "ဒီဇင္ဘာလ"
EndIf EndIf
Var CouponExpireB = CouponExpireB + CouponExireB_D Var CouponExpireB = CouponExpireB + CouponExireB_D
Var CouponExpireB = CouponExpireB + " " Var CouponExpireB = CouponExpireB + " "
Var CouponExpireB = CouponExpireB + CouponExireB_M Var CouponExpireB = CouponExpireB + CouponExireB_M
@ -1335,8 +1346,8 @@
Var CouponText = "ကူပွန်စုဆောင်းခြင်း။ (" + CouponNum Var CouponText = "ကူပွန်စုဆောင်းခြင်း။ (" + CouponNum
Var CouponText = CouponText + ")" Var CouponText = CouponText + ")"
;inter-image
Var text5Img = "/text5-MMR.png"
EndIf EndIf
SAVELOG "EventLanguageOnChange menu -list" SAVELOG "EventLanguageOnChange menu -list"
@ -1640,7 +1651,7 @@
<Text> <Text>
<X> 372 </X> <X> 372 </X>
<Y> 1375 </Y> <Y> CouponExpireAPosittion </Y>
<Size> 15 </Size> <Size> 15 </Size>
<Width> 600 </Width> <Width> 600 </Width>
<Font> KanitRegularTTF </Font> <Font> KanitRegularTTF </Font>