From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
index 1e6a2f3..bf7c54f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
@@ -149,51 +149,65 @@
btnIcon.UnSelectedImagePath = "Item/Tips.png";
bodyFrameLayout.AddChidren(btnIcon);
+ int XX = 0;
+ int contrWidth = 0;
+
string msg = string.Empty;
//24灏忔椂闃插尯
if (zoonID == 1)
{
//24灏忔椂闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝峽0}闃插尯琚Е鍙戠珛鍗虫姤璀0}涓�鑸缃儫闆俱�佺噧姘斻�佹按娴哥瓑浼犳劅鍣�
msg = Language.StringByID(R.MyInternationalizationString.u24HourSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(223);
+ btnIcon.X = Application.GetRealWidth(233);
+ XX = Application.GetRealWidth(282);
+ contrWidth = Application.GetRealWidth(580);
}
//闈欓煶闃插尯
else if (zoonID == 2)
{
//闈欓煶闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝嶏紝闃插尯琚珄0}瑙﹀彂绔嬪嵆鎶ヨ锛岄�氬父涓嶄骇鐢熷０闊虫垨{0}鍏朵粬鎻愮ず锛屽彧鍙戦�佷俊鎭埌鐗瑰畾鐨勬帴鏀惰��
msg = Language.StringByID(R.MyInternationalizationString.uMuteSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(175);
+ btnIcon.X = Application.GetRealWidth(202);
+ XX = Application.GetRealWidth(279);
+ contrWidth = Application.GetRealWidth(614);
}
//鍐呴儴闃插尯
else if (zoonID == 4)
{
//鍦ㄧ瀹跺竷闃叉ā寮忎笅锛屽唴閮ㄩ槻鍖轰紶鎰熷櫒瑙﹀彂{0}绔嬪嵆鎶ヨ銆傚湪鍦ㄥ甯冮槻妯″紡涓媨0}鍐呴儴闃插尯鎵�鏈変紶鎰熷櫒涓嶅弬涓庢姤璀�
msg = Language.StringByID(R.MyInternationalizationString.uInteriorSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(159);
+ btnIcon.X = Application.GetRealWidth(179);
+ XX = Application.GetRealWidth(256);
+ contrWidth = Application.GetRealWidth(651);
}
//鍛ㄧ晫闃插尯
else if (zoonID == 5)
{
//绂诲甯冮槻妯″紡鎴栧湪瀹跺竷闃叉ā寮忎笅{0}鍛ㄧ晫闃插尯浼犳劅鍣ㄨЕ鍙戠珛鍗虫姤璀�
msg = Language.StringByID(R.MyInternationalizationString.uPerimeterSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(229);
+ btnIcon.X = Application.GetRealWidth(239);
+ XX = Application.GetRealWidth(317);
+ contrWidth = Application.GetRealWidth(510);
}
//鍑哄叆闃插尯
else
{
//鍦ㄥ竷闃插悗绯荤粺鎻愪緵涓�瀹氱殑寤惰繜鏃堕棿銆傚嚭闂ㄦ椂{0}澶栧嚭寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ{0}鍥炲鏃讹紝杩涘叆寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ
msg = Language.StringByID(R.MyInternationalizationString.uInAndOutSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(141);
+ btnIcon.X = Application.GetRealWidth(156);
+ XX = Application.GetRealWidth(216);
+ contrWidth = Application.GetRealWidth(721);
}
var ArryMsg = msg.Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = Application.GetRealHeight(1428);
for (int i = 0; i < ArryMsg.Length; i++)
{
- var btnTip = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
+ var btnTip = new NormalViewControl(contrWidth, Application.GetRealHeight(50), false);
btnTip.TextAlignment = TextAlignment.Center;
btnTip.TextColor = UserCenterColor.Current.TextGrayColor1;
btnTip.TextSize = 12;
+ btnTip.X = XX;
btnTip.Y = yy;
btnTip.Text = ArryMsg[i];
bodyFrameLayout.AddChidren(btnTip);
--
Gitblit v1.8.0