From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 429fcee..9c9cc3c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -50,19 +50,19 @@
{
listView.RemoveAll();
- this.AddRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
+ this.AddNormalRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
- this.AddRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 700);
+ this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
- this.AddRowControl("璐﹀彿GUID", 400, Common.Config.Instance.Home.MainUserDistributedMark, 700);
+ this.AddTopButtomRowControl("璐﹀彿GUID", 400, Common.Config.Instance.Home.MainUserDistributedMark, 900);
- this.AddRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
+ this.AddNormalRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
- this.AddRowControl("璐﹀彿绫诲瀷", 400, Common.Config.Instance.Home.AccountType.ToString(), 400);
+ this.AddNormalRowControl("璐﹀彿绫诲瀷", 400, Common.Config.Instance.Home.AccountType.ToString(), 400);
- this.AddRowControl("杩滅▼杩炴帴", 400, ZigBee.Device.ZbGateway.IsRemote == true ? "鏄�" : "鍚�", 400);
+ this.AddNormalRowControl("杩滅▼杩炴帴", 400, ZigBee.Device.ZbGateway.IsRemote == true ? "鏄�" : "鍚�", 400);
- this.AddRowControl("鎷ユ湁杩滅▼鏉冮檺", 400, ZigBee.Device.ZbGateway.AllowRemoteCtrl == true ? "鏄�" : "鍚�", 400);
+ this.AddNormalRowControl("鎷ユ湁杩滅▼鏉冮檺", 400, ZigBee.Device.ZbGateway.AllowRemoteCtrl == true ? "鏄�" : "鍚�", 400);
int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;
var row1 = new FrameRowControl(listView.rowSpace / 2);
@@ -125,7 +125,7 @@
/// <param name="width1"></param>
/// <param name="viewText"></param>
/// <param name="width2"></param>
- private FrameRowControl AddRowControl(string caption, int width1, string viewText, int width2)
+ private FrameRowControl AddNormalRowControl(string caption, int width1, string viewText, int width2)
{
var row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
@@ -137,6 +137,25 @@
return row1;
}
+ /// <summary>
+ /// 娣诲姞琛�
+ /// </summary>
+ /// <param name="caption"></param>
+ /// <param name="width1"></param>
+ /// <param name="viewText"></param>
+ /// <param name="width2"></param>
+ private FrameRowControl AddTopButtomRowControl(string caption, int width1, string viewText, int width2)
+ {
+ var row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddTopView(caption, width1);
+ row1.AddBottomView(viewText, width2);
+ row1.AddBottomLine();
+ row1.UseClickStatu = false;
+
+ return row1;
+ }
+
#endregion
}
}
--
Gitblit v1.8.0