Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
44831b9c84
345 changed files with 67 additions and 22 deletions
|
|
@ -778,17 +778,20 @@
|
|||
Var PointEndDate = ""
|
||||
GetDateEndOfMonth PointEndDate
|
||||
DEBUGVAR PointEndDate
|
||||
Var xPointEndDate = 490
|
||||
|
||||
Var xPointEndDate = 485
|
||||
Var yPointEndDate = 1570
|
||||
Var xDescEndDate = 172
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var xPointEndDate = 575
|
||||
Var xPointEndDate = 566
|
||||
Var yPointEndDate = 1563
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var xPointEndDate = 520
|
||||
Var yPointEndDate = 1568
|
||||
Var xDescEndDate = 265
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -1262,7 +1265,7 @@
|
|||
</Text>
|
||||
|
||||
<Image>
|
||||
<X> 172 </X>
|
||||
<X> xDescEndDate </X>
|
||||
<Y> 1570 </Y>
|
||||
<Filename> Var( DirImage + "/text8_28.png" )</Filename>
|
||||
</Image>
|
||||
|
|
|
|||
|
|
@ -45,6 +45,25 @@
|
|||
Var FeedbackLevel[4].Pressed = DirImage + "bp_feedback_level_5_en.png"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var PopupTitle = "စက်သန့်ရှင်းမှု အမှတ်"
|
||||
Var Description = "ကျွန်တော်တို့ နေ့စဉ် တိုးတက်ချင်လို့ပါ။"
|
||||
|
||||
Var TitleSize = 60
|
||||
|
||||
Var FeedbackLevel[0] = DirImage + "bn_feedback_level_1_mmr.png"
|
||||
Var FeedbackLevel[0].Pressed = DirImage + "bp_feedback_level_1_mmr.png"
|
||||
Var FeedbackLevel[1] = DirImage + "bn_feedback_level_2_mmr.png"
|
||||
Var FeedbackLevel[1].Pressed = DirImage + "bp_feedback_level_2_mmr.png"
|
||||
Var FeedbackLevel[2] = DirImage + "bn_feedback_level_3_mmr.png"
|
||||
Var FeedbackLevel[2].Pressed = DirImage + "bp_feedback_level_3_mmr.png"
|
||||
Var FeedbackLevel[3] = DirImage + "bn_feedback_level_4_mmr.png"
|
||||
Var FeedbackLevel[3].Pressed = DirImage + "bp_feedback_level_4_mmr.png"
|
||||
Var FeedbackLevel[4] = DirImage + "bn_feedback_level_5_mmr.png"
|
||||
Var FeedbackLevel[4].Pressed = DirImage + "bp_feedback_level_5_mmr.png"
|
||||
|
||||
EndIf
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
|
|||
|
|
@ -777,6 +777,7 @@
|
|||
Var PointEndDate = ""
|
||||
GetDateEndOfMonth PointEndDate
|
||||
DEBUGVAR PointEndDate
|
||||
Var TextEndDateX = 172
|
||||
Var xPointEndDate = 570
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
|
@ -784,7 +785,8 @@
|
|||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var xPointEndDate = 658
|
||||
Var xPointEndDate = 490
|
||||
Var TextEndDateX = 190
|
||||
EndIf
|
||||
|
||||
Var Point2XState = "Invisible"
|
||||
|
|
@ -1356,7 +1358,7 @@
|
|||
</Text>
|
||||
|
||||
<Image>
|
||||
<X> 172 </X>
|
||||
<X> TextEndDateX </X>
|
||||
<Y> TextEndDateY </Y>
|
||||
<Filename> Var( DirImage + "/text8.png" )</Filename>
|
||||
</Image>
|
||||
|
|
|
|||
|
|
@ -794,14 +794,17 @@
|
|||
DEBUGVAR PointEndDate
|
||||
Var xPointEndDate = 490
|
||||
Var yPointEndDate = 1570
|
||||
Var xDescEndDate = 172
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var xPointEndDate = 575
|
||||
Var yPointEndDate = 1563
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var xPointEndDate = 520
|
||||
Var yPointEndDate = 1568
|
||||
Var xDescEndDate = 265
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -1310,7 +1313,7 @@
|
|||
</Text>
|
||||
|
||||
<Image>
|
||||
<X> 172 </X>
|
||||
<X> xDescEndDate </X>
|
||||
<Y> 1570 </Y>
|
||||
<Filename> Var( DirImage + "/text8_28.png" )</Filename>
|
||||
</Image>
|
||||
|
|
|
|||
|
|
@ -54,6 +54,19 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/page_thankyou"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
||||
If CountryName = "Singapore" Then
|
||||
Var show_btp = ""
|
||||
Var show_btn = ""
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
|
||||
EndIf
|
||||
|
||||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Dont_forget_your_changes_below.mp3"
|
||||
Else
|
||||
|
|
@ -62,6 +75,11 @@
|
|||
|
||||
Var imgGetChange = "/imgGetChange.png"
|
||||
|
||||
;inter-th-mmr
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var imgGetChange = "/imgGetChange-MMR.png"
|
||||
EndIf
|
||||
|
||||
;inter-image
|
||||
If CountryName = "Malaysia" Then
|
||||
Var imgGetChange = "/imgGetChange-MYR.png"
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@
|
|||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
|
||||
Var RemainAmountStr = RemainAmountStr + "###size=90"
|
||||
Var RemainAmountStr = RemainAmountStr + "###size=60"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -2606,7 +2606,7 @@
|
|||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
|
||||
Var RemainAmountStr = RemainAmountStr + "###size=90"
|
||||
Var RemainAmountStr = RemainAmountStr + "###size=60"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -3412,7 +3412,7 @@ eval(
|
|||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 1041 </Y>
|
||||
<Y> RemainAmountStrY </Y>
|
||||
<Size> 144 </Size>
|
||||
<Align> Center </Align>
|
||||
<Width> 1080 </Width>
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
Var ReqFlag = 0
|
||||
|
||||
Var Xtext = 246
|
||||
Var Ytext_16 = 699
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
|
@ -46,6 +47,7 @@
|
|||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
|
||||
Var Ytext_16 = 640
|
||||
EndIf
|
||||
|
||||
Var Ext1a = ""
|
||||
|
|
@ -893,7 +895,7 @@
|
|||
|
||||
<Image>
|
||||
<X> 188 </X>
|
||||
<Y> 699 </Y>
|
||||
<Y> Ytext_16 </Y>
|
||||
<Filename> Var( DirImage + "/text_16.png" )</Filename>
|
||||
</Image>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
If CountryName = "Thailand" Then
|
||||
; ignore
|
||||
Else
|
||||
|
||||
If LanguageShow = "ENG" Then
|
||||
Var show_eng = "true"
|
||||
EndIf
|
||||
If LanguageShow = "THAI" Then
|
||||
Var show_eng = "false"
|
||||
EndIf
|
||||
|
||||
;for 3 langs
|
||||
If LanguageShow = "ENG" Then
|
||||
Var show_eng = "true"
|
||||
EndIf
|
||||
If LanguageShow = "THAI" Then
|
||||
Var show_eng = "false"
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -20,6 +15,7 @@ If show_eng = "true" Then
|
|||
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
|
||||
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
Var LOADING_STATE_X = 267
|
||||
Var RemainAmountStrY = 1041
|
||||
Else
|
||||
Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
|
||||
Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
|
||||
|
|
@ -28,6 +24,7 @@ Else
|
|||
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
|
||||
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
Var LOADING_STATE_X = 267
|
||||
Var RemainAmountStrY = 1041
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
|
@ -38,6 +35,7 @@ If LanguageShow = "MYANMAR" Then
|
|||
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr"
|
||||
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
Var LOADING_STATE_X = 267
|
||||
Var RemainAmountStrY = 1061
|
||||
EndIf
|
||||
|
||||
If RoadShow = "true" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue