THAI INTER: Fix Layout-Text-Image ,Myanmar show, LanguageObjectShow, Add Image

xml/page_brewing3.xml

@@ -91,6 +91,8 @@
 	Else
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
 
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+
 		; Play Sound #zone
 		If SoundBackToSchoolEnable = 1 Then
 
@@ -128,28 +130,36 @@
 	EndIf
 	
 	If LanguageShow = "MYANMAR" Then 
-			Var IMG_CNT = DirImageDoing + "/img2_mmr.png"
+		;for test
+		Var IMG_CNT = DirImageDoing + "/img2_en.png"
+		;Var IMG_CNT = DirImageDoing + "/img2_mmr.png"
 
-			Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
 
-			Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw.png"
+		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
-			Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw.png"
+		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
 
-			Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_mmr.png"
+		Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_mmr.png"
-			Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_mmr.png"
+		Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_mmr.png"
 
-			Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_mmr.png"
+		Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_mmr.png"
-			Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_mmr.png"
+		Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_mmr.png"
 
 
-			Var bn_get_lid_image = DirImageDoing + "/bn_get_lid.png"
+		Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png"
-			Var bp_get_lid_image = DirImageDoing + "/bp_get_lid.png"
+		Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png"
 
-			Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_mmr.png"
+		Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_mmr.png"
-			Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_mmr.png"
+		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_mmr.png"
 
-			Var XStraw = 274
+		;Var XStraw = 274
-		EndIf
+		Var XStraw = 142
+	EndIf
+
+	If LanguageObjectShow = "Enable" Then
+		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
+		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
+	EndIf
 
 
 	Var waitAckPay = 0
@@ -1789,6 +1799,24 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 <EventUnitTest1>
 	Var BREW_COUNT_DOWN_FROM_APP = "off"
 	Var CountDownBrewing = 121

xml/page_brewing3Conti.xml

@@ -53,6 +53,11 @@
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png"
 	EndIf
 
+	If LanguageObjectShow = "Enable" Then
+		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
+		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
+	EndIf
+
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
 	Var next_pic_bp = DirImage + "/bp_add_order.png"
 	Var text_next_order = DirImage + "/text_next_order.png"

xml/page_collect_point_3.xml

@@ -40,16 +40,19 @@
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+		Var TextEndDateY = 1570
 
 	Else
 		Var DirImage = "ROOT/taobin_project/image/display_point"
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+		Var TextEndDateY = 1570
 	EndIf
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/display_point_mmr"
+		Var TextEndDateY = 1580
 	EndIf
 
 	If LanguageObjectShow = "Enable" Then
@@ -711,6 +714,10 @@
 		Var xPointEndDate = 618
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var xPointEndDate = 658
+	EndIf
+
 	Var Point2XState = "Invisible"
 	Var Point2XImage = ""
 	If Point2X = 1 Then 
@@ -1281,7 +1288,7 @@
 
 <Image>
 <X> 172 </X>
-<Y> 1570 </Y>
+<Y> TextEndDateY </Y>
 <Filename> Var( DirImage + "/text8.png" )</Filename>
 </Image>
 

xml/page_collect_point_3_28.xml

@@ -39,6 +39,15 @@
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/display_point_mmr/"
+	EndIf
+
+	If LanguageObjectShow = "Enable" Then
+		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
+		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
+	EndIf
+
 	Var CoffeePointTmp = CoffeePoint
 
 	If CoffeePoint > 29 Then
@@ -1210,6 +1219,24 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 <EventUnitTest1>
 	Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
 </EventUnitTest1>

xml/page_collect_point_3_28_lucky_draw_campaign.xml

@@ -41,6 +41,15 @@
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/display_point_mmr/"
+	EndIf
+
+	If LanguageObjectShow = "Enable" Then
+		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
+		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
+	EndIf
+
 	Var CoffeePointTmp = CoffeePoint
 
 	If CoffeePoint > 29 Then
@@ -1361,6 +1370,24 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 <EventUnitTest1>
 	Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
 </EventUnitTest1>

xml/page_lid_straw.xml

@@ -115,7 +115,8 @@
 
 			Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing_mmr/"
 			Var PictureBegin = "txt_"
-			Var PictureEnd = "_mmr.png"
+			;Var PictureEnd = "_mmr.png"
+			Var PictureEnd = "_en.png"
 		EndIf
 
 	Else

xml/page_member_topupCode.xml

@@ -32,12 +32,15 @@
 	
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+		Var ShowErrorTextY = 935
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collectiing"
+		Var ShowErrorTextY = 935
 	EndIf
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"	
+		Var ShowErrorTextY = 925
     EndIf
 
 	RootLayoutVisible 3 "hide"
@@ -644,7 +647,7 @@
 
 <Image>
 <X> 152 </X>
-<Y> 935 </Y>
+<Y> ShowErrorTextY </Y>
 <Refresh> "Enable" </Refresh>
 <State> ShowErrorText </State>
 <Filename> text_show_error </Filename>

xml/page_member_topupSuccess.xml

@@ -45,6 +45,11 @@
 	If CountryName = "Indonesia" Then
 		Var text_4 = "/text_4-IDR.png"
 	EndIf 
+
+	;inter-image
+	If LanguageShow = "MYANMAR" Then 
+		Var text_4 = "/text_4-MMR.png"
+	EndIf 
     
 
     
@@ -100,6 +105,10 @@
 		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr"
 		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png"
+		;inter-image
+		If LanguageShow = "MYANMAR" Then 
+			Var text_4 = "/text_4-MMR.png"
+		EndIf 
     EndIf
 	
 	SAVELOG "EventLanguageOnChange menu -list"

xml/page_payment_credit.xml

@@ -25,12 +25,18 @@
 
     If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+		Var ShowErrorTextX = 424
+		Var ShowErrorTextY = 945
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collectiing"
+		Var ShowErrorTextX = 444
+		Var ShowErrorTextY = 945
 	EndIf
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
+		Var ShowErrorTextX = 150
+		Var ShowErrorTextY = 905
 	EndIf
 
 	
@@ -611,8 +617,8 @@
 </Image>
 
 <Image>
-<X> 444 </X>
+<X> ShowErrorTextX </X>
-<Y> 945 </Y>
+<Y> ShowErrorTextY </Y>
 <State> ShowErrorText </State>
 <Refresh> "Enable" </Refresh>
 <Filename> Var( DirImage + "/text_show_notfound.png") </Filename>

xml/page_payment_storeCredit0.xml

@@ -34,6 +34,11 @@
 		
 	EndIf
 
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_mmr"
+	EndIf
+
 
 	If show_eng = "true" Then 
 		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/keep_your_change_credits_or_receive.mp3"

xml/page_topup_credit3-Topup.xml

@@ -122,7 +122,7 @@
 
 	If LanguageShow = "MYANMAR" Then 
 		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"	
-		Var Text_X = 188
+		Var Text_X = 128
 		Var posX = 350
     EndIf
 
@@ -191,15 +191,15 @@ If ViewBill > 0 Then
 	If  GetPayInfoFlag = 1 Then
 		Var QRCODE99 = ""
 		If show_eng = "true" Then 
-			If LanguageShow = "MYANMAR" Then 
+			Var TextWaiting = "Unable to use QR, please try again later."
-				Var TextWaiting = "QR ကို အသုံးမပြုနိုင်ပါ၊ ကျေးဇူးပြု၍ နောက်မှ ထပ်စမ်းကြည့်ပါ။"
-			Else
-				Var TextWaiting = "Unable to use QR, please try again later."
-			EndIf
 		Else
 				Var TextWaiting = "ระบบ QR ขัดข้อง โปรดใช้ใหม่ภายหลัง."
 		EndIf
 
+		If LanguageShow = "MYANMAR" Then 
+			Var TextWaiting = "QR ကို အသုံးမပြုနိုင်ပါ၊ ကျေးဇူးပြု၍ နောက်မှ ထပ်စမ်းကြည့်ပါ။"
+		EndIf
+
 		
 		Var AmountNumber = ""
 		Var Tel_Confirm_State = "Invisible"
@@ -660,15 +660,15 @@ If ViewBill > 0 Then
 					Var ReqPayInfoFlag = 1
 
 					If show_eng = "true" Then 
-						If LanguageShow = "MYANMAR" Then 
+						Var TextWaiting = "Please wait..."
-							Var TextWaiting = "ခဏစောင့်ပါ။..."
-						Else
-							Var TextWaiting = "Please wait..."
-						EndIf
 					Else
 						Var TextWaiting = "กรุณารอซักครู่..."
 					EndIf
 
+					If LanguageShow = "MYANMAR" Then 
+						Var TextWaiting = "ခဏစောင့်ပါ။..."
+					EndIf
+
 					Var loadingReqState = "Enable"
 
 					Refresh

xml/page_topup_credit3-TopupCode.xml

@@ -619,6 +619,10 @@
 				Var TextWaiting = "กรุณารอซักครู่..."
 			EndIf
 
+			If LanguageShow = "MYANMAR" Then 
+				Var TextWaiting = "ခဏစောင့်ပါ။..."
+			EndIf
+
 			Var goBackBtnState = "Disable"
 			
 	        Var Seeker.CodeChannel = 1

xml/page_topup_credit3-TopupSuccess.xml

@@ -33,6 +33,11 @@
 	If CountryName = "Indonesia" Then
 		Var text_4 = "/text_4-IDR.png"
 	EndIf 
+
+	;inter-image
+		If LanguageShow = "MYANMAR" Then 
+			Var text_4 = "/text_4-MMR.png"
+		EndIf 
     
 
     

xml/payment_cash.ev

@@ -20,7 +20,7 @@ If LanguageShow = "MYANMAR" Then
     Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
     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 = 560
+    Var LOADING_STATE_X = 267
 EndIf
 
 If RoadShow = "true" Then