THAI INTER : New langs MSC and multiinstance, Fix bug page_board to catalog image not load, Add new image

2025-03-21 07:13:03 +07:00 · 2025-03-21 07:13:03 +07:00 · 6180272122
commit 6180272122
parent 172c4d2907
188 changed files with 41480 additions and 17575 deletions
--- a/xml/page_NewBrewing3.xml
+++ b/xml/page_NewBrewing3.xml
@ -56,6 +56,19 @@

 	Var PrintCoinAmount = 0

+	Var DirImageDoing = "ROOT/taobin_project/image/page_doing"
+
+	If show_eng = "true" Then 
+		Var DirImageDoing = "ROOT/taobin_project/image/page_doing_en"
+	EndIf
+
+	If LanguageShow = "MYANMAR" Then 
+		Var DirImageDoing = "ROOT/taobin_project/image/page_doing_mmr/"
+	EndIf
+
+	If LanguageShow = "MSC" Then 
+		Var DirImageDoing = "ROOT/taobin_project/inter/hkg/image/page_doing/"
+	EndIf

    If show_eng = "true" Then

@ -146,6 +159,32 @@
 		Var XStraw = 142
 	EndIf

+	If LanguageShow = "MSC" Then 
+		;for test
+		Var IMG_CNT = DirImageDoing + "/img2_en.png"
+
+		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+
+		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
+		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
+
+		Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_msc.png"
+		Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_msc.png"
+
+		Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_msc.png"
+		Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_msc.png"
+
+
+		Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_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_en.png"
+		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
+
+		;Var XStraw = 274
+		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"
@ -201,6 +240,12 @@
 		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
 	EndIf

+	If LanguageShow = "MSC" Then
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_en"
+	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"
@ -428,6 +473,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf

+				If LanguageShow = "MSC" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)

 				; reset
@ -458,6 +507,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf

+				If LanguageShow = "MSC" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)

 				; reset
@ -737,6 +790,9 @@
 			If LanguageShow = "MYANMAR" Then
 				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
 			EndIf
+			If LanguageShow = "MSC" Then
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
+			EndIf
 		EndIf
 		If Timeout = 9 Then
 			If OpenFromCollectPoint3 = 0 Then
--- a/xml/page_NewBrewing3Conti.xml
+++ b/xml/page_NewBrewing3Conti.xml
@ -24,6 +24,11 @@
 		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
 	EndIf

+	If LanguageShow = "MSC" Then
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_en"
+	EndIf
+
 	If LanguageObjectShow = "Enable" Then
 		Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/"
 		Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png"
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -1228,9 +1228,12 @@

 				Var WebAppShow = "Invisible"
 				Var ENABLE_UAE_DUBAI = "Invisible"
+
+				Var LanguageShow = "THAI" 
 				EnableLanguage "ENG"
 				EnableLanguage "THAI"
-				;EnableLanguage "MYANMAR"
+				EnableLanguage "MYANMAR"
+				EnableLanguage "MSC"

 				If MyanmarLangEnable = "true" Then
 					EnableLanguage "MYANMAR"
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@ -62,6 +62,10 @@
 		Var DirImageDoing = "ROOT/taobin_project/image/page_doing_mmr/"
 	EndIf

+	If LanguageShow = "MSC" Then 
+		Var DirImageDoing = "ROOT/taobin_project/inter/hkg/image/page_doing/"
+	EndIf
+

    If show_eng = "true" Then

@ -156,6 +160,32 @@
 		Var XStraw = 142
 	EndIf

+	If LanguageShow = "MSC" Then 
+		;for test
+		Var IMG_CNT = DirImageDoing + "/img2_en.png"
+
+		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+
+		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
+		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
+
+		Var bnStrawProblemReport = DirImageDoing + "/bn_send_report_straw_msc.png"
+		Var bpStrawProblemReport = DirImageDoing + "/bp_send_report_straw_msc.png"
+
+		Var bnLidProblemReport = DirImageDoing + "/bn_send_report_lid_msc.png"
+		Var bpLidProblemReport = DirImageDoing + "/bp_send_report_lid_msc.png"
+
+
+		Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_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_en.png"
+		Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
+
+		;Var XStraw = 274
+		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"
@ -308,6 +338,11 @@
 		Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
 	EndIf

+	If LanguageShow = "MSC" Then 
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping_en"
+	EndIf
+
 	DEBUGVAR show_eng

 	Var next_pic_bn = DirImage + "/bn_add_order.png"
@ -531,6 +566,10 @@
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf

+				If LanguageShow = "MSC" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf
+
 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)

 				; reset
@ -559,6 +598,9 @@
 				If LanguageShow = "MYANMAR" Then 
 					Var LangString = "LANG: &#34TH&#34\r\n"
 				EndIf
+				If LanguageShow = "MSC" Then 
+					Var LangString = "LANG: &#34TH&#34\r\n"
+				EndIf

 				Var BoxIDString !assigned SprintFmt("BOX_ID: &#34%s&#34\r\n", BoxID)

@ -857,6 +899,9 @@
 			If LanguageShow = "MYANMAR" Then 
 				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
 			EndIf
+			If LanguageShow = "MSC" Then 
+				PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
+			EndIf
 		EndIf
 		If Timeout = 9 Then
 			If OpenFromCollectPoint3 = 0 Then
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@ -373,6 +373,9 @@
 		If LanguageShow = "MYANMAR" Then
 			Var showRemaining = RemainAmountStr + " Bath"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var showRemaining = RemainAmountStr + " Bath"
+		EndIf

 	EndIf

@ -508,6 +511,10 @@
 					Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
 					Var RemainAmountStr = RemainAmountStr + "###size=60"
 				EndIf
+				If LanguageShow = "MSC" Then
+					Var RemainAmountStr = "找钱 " + Canout
+					Var RemainAmountStr = RemainAmountStr + "###size=60"
+				EndIf
 			EndIf


@ -2608,6 +2615,10 @@
                            Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
                            Var RemainAmountStr = RemainAmountStr + "###size=60"
                        EndIf
+						If LanguageShow = "MSC" Then
+							Var RemainAmountStr = "找钱 " + Canout
+							Var RemainAmountStr = RemainAmountStr + "###size=60"
+						EndIf
                    EndIf


@ -2669,6 +2680,9 @@
 				If LanguageShow = "MYANMAR" Then
 					Var showRemaining = "ပြန်အမ်းငွေ"
 				EndIf
+				If LanguageShow = "MSC" Then
+					Var showRemaining = "退款"
+				EndIf
 				;Open "ROOT/taobin_project/xml/page_catalog.xml"

 				If FlagQROpened = 1 Then
@ -2701,7 +2715,10 @@

 	EndIf
 	If LanguageShow = "MYANMAR" Then
-	Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_mmr.png"
+		Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_mmr.png"
+	EndIf
+	If LanguageShow = "MSC" Then
+		Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_msc.png"
 	EndIf
 )
 </Filename>
@ -3208,6 +3225,9 @@ eval(
 	If LanguageShow = "MYANMAR" Then
 		Var return = "ပယ်ဖျက်ပါ။..."
 	EndIf
+	If LanguageShow = "MSC" Then
+		Var return = "正在取消..."
+	EndIf
 )
 </Value>
 <Align> center-vertical-horizontal </Align>
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@ -76,6 +76,13 @@
 		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
 	EndIf

+	If LanguageShow = "MSC" Then
+
+		Var BottomText = PicturePath + "text_bottom_eng.png"
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
+	EndIf
+


 	DEBUGVAR StarwState
--- a/xml/payment_cash.ev
+++ b/xml/payment_cash.ev
@ -38,6 +38,17 @@ If LanguageShow = "MYANMAR" Then
    Var RemainAmountStrY = 1061
 EndIf

+If LanguageShow = "MSC" Then
+    Var FilenameShowbuttonCashBN = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bn_cash.png"
+    Var FilenameShowbuttonCashBP = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bp_cash.png"
+    Var FilenameShowbuttonCashBD = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bd_cash.png"
+    Var DirImage = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment"
+    Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/page_payment_cash_extend_msc"
+    Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+    Var LOADING_STATE_X = 267
+    Var RemainAmountStrY = 1041
+EndIf
+
 If RoadShow = "true" Then
    Var X_CASH1 = 287
    If show_eng = "true" Then
@ -55,6 +66,12 @@ If RoadShow = "true" Then
        Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bp_cash.png"
        Var FilenameShowbuttonCashBD = "ROOT/taobin_project/image/page_payment_mmr/page_payment/bd_cash.png"
    EndIf
+
+    If LanguageShow = "MSC" Then
+        Var FilenameShowbuttonCashBN = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bn_cash.png"
+        Var FilenameShowbuttonCashBP = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bp_cash.png"
+        Var FilenameShowbuttonCashBD = "ROOT/taobin_project/inter/hkg/image/page_payment_msc/page_payment/bd_cash.png"
+    EndIf
 EndIf


--- a/xml/topview2.xml
+++ b/xml/topview2.xml
@ -50,6 +50,12 @@

 	If ENABLE_MYANMAR = "Enable" Then
 		Var ENABLE_BOTTOM = "Invisible"
+		Var SupportLangMyanmarHeight = 51
+		Var BottomImageMyanmar = "ROOT/taobin_project/image/lang/lang_bg_bottom.png"
+		If ENABLE_LANGUAGE_COUNT > 3 Then
+			Var SupportLangMyanmarHeight = 76
+			Var BottomImageMyanmar = "ROOT/taobin_project/image/lang/lang_bg_bottom2.png"
+		EndIf
 	EndIf
 	If ENABLE_MTC = "Enable" Then
 		Var ENABLE_BOTTOM = "Invisible"
@ -198,6 +204,9 @@
 					If CountryName = "Thailand" Then
 						DEBUGVAR ENABLE_UAE_DUBAI
 						Var ENABLE_UAE_DUBAI = "Invisible"
+						Var ENABLE_CHINA = "Invisible"
+						Var ENABLE_MALAY = "Invisible"
+						Var ENABLE_MTC = "Invisible"
 						TRY "ROOT/taobin_project/inter/tha/xml/multi/control_and_lang_swith.ev"
 					EndIf
 					If CountryName = "HongKong" Then
@ -503,10 +512,10 @@
 </Row1>
 <Row1>
 	<Width> 82 </Width>
-	<Height> 56 </Height>
+	<Height> SupportLangMyanmarHeight </Height>
 	<State> ENABLE_MYANMAR </State>
 	<Image>
-		<Filename> "ROOT/taobin_project/image/lang/lang_bg_bottom.png" </Filename>
+		<Filename> BottomImageMyanmar </Filename>
 	</Image>
 </Row1>
 <Row1>
@ -674,31 +683,6 @@
 	</EventClick>
 	</Button>
 </Row1>
-<Row1>
-	<Width> 82 </Width>
-	<Height> 68 </Height>
-	<State> ENABLE_MYANMAR </State>
-	<Button>
-	<X> 0 </X>
-	<Y> 0 </Y>
-	<Width> 82 </Width>
-	<Height> 56 </Height>
-	<State> ENABLE_MYANMAR </State>
-	<Filename> "ROOT/taobin_project/image/lang/bn_myanmar_lang.png" </Filename>
-	<EventClick>
-		SetLanguage "MYANMAR"
-		Var show_eng = "true"
-		Var LanguageButtonListEnable = "Invisible"	
-		Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
-		Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
-		If EnableMultiInstance = "true" Then
-			Var CountDownRefreshAllGroup = 1
-		EndIf
-		SAVELOG "============================== Select Myr =============================="
-		Open "ROOT/taobin_project/xml/topview2.xml"
-	</EventClick>
-	</Button>
-</Row1>
 <Row1>
 	<Width> 82 </Width>
 	<Height> 68 </Height>
@ -709,21 +693,26 @@
 	<Width> 82 </Width>
 	<Height> 56 </Height>
 	<State> ENABLE_MSC </State>
-	<Filename> "ROOT/taobin_project/image/lang/bn_malay_lang.png" </Filename>
+	<Filename> "ROOT/taobin_project/image/lang/bn_china_lang.png" </Filename>
 	<EventClick>
 		SetLanguage "MSC"
 		Var LanguageButtonListEnable = "Invisible"	
 		Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
 		Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
 		If EnableMultiInstance = "true" Then
-			Var langnext1 = "true"
-			Var langnext2 = "true"
-			Var langnext3 = "true"
-			Var langnext4 = "true"
-			Var langnext5 = "true"
-			Var langnext6 = "true"
-			Var langnext7 = "true"
-			Var langnext8 = "true"
+			If CountryName = "Thailand" Then
+				Var CountDownRefreshAllGroup = 1
+			Else
+				Var langnext1 = "true"
+				Var langnext2 = "true"
+				Var langnext3 = "true"
+				Var langnext4 = "true"
+				Var langnext5 = "true"
+				Var langnext6 = "true"
+				Var langnext7 = "true"
+				Var langnext8 = "true"
+				Var langnext9 = "true"
+			EndIf
 		EndIf
 		Open "ROOT/taobin_project/xml/topview2.xml"
 	</EventClick>
@ -754,11 +743,37 @@
 			Var langnext6 = "true"
 			Var langnext7 = "true"
 			Var langnext8 = "true"
+			Var langnext9 = "true"
 		EndIf
 		Open "ROOT/taobin_project/xml/topview2.xml"
 	</EventClick>
 	</Button>
 </Row1>
+<Row1>
+	<Width> 82 </Width>
+	<Height> 68 </Height>
+	<State> ENABLE_MYANMAR </State>
+	<Button>
+	<X> 0 </X>
+	<Y> 0 </Y>
+	<Width> 82 </Width>
+	<Height> 56 </Height>
+	<State> ENABLE_MYANMAR </State>
+	<Filename> "ROOT/taobin_project/image/lang/bn_myanmar_lang.png" </Filename>
+	<EventClick>
+		SetLanguage "MYANMAR"
+		Var show_eng = "true"
+		Var LanguageButtonListEnable = "Invisible"	
+		Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
+		Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
+		If EnableMultiInstance = "true" Then
+			Var CountDownRefreshAllGroup = 1
+		EndIf
+		SAVELOG "============================== Select Myr =============================="
+		Open "ROOT/taobin_project/xml/topview2.xml"
+	</EventClick>
+	</Button>
+</Row1>
 <Row1>
 	<Width> 82 </Width>
 	<Height> 68 </Height>