From 2bc230cf2e7a7329c2329b07307a47b059835bbc Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 10:20:52 +0800
Subject: [PATCH] 2019-10-18-1
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs | 200 +++++++++++++++++++++++++-------------------------
1 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
index e98328b..d32bd4c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
@@ -10,30 +10,30 @@
/// 缃戝叧绠＄悊鐨勭晫闈�
/// </summary>
public class GatewayListForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 鍒楄〃鎺т欢
- /// </summary>
- private VerticalListControl listview = null;
- /// <summary>
- /// 鐢熸垚鐨勭綉鍏崇姸鎬佹帶浠舵殏鏃跺瓨鍏ュ唴瀛樹腑
- /// </summary>
- private Dictionary<string, GatewayRowControl> dicRowContr = new Dictionary<string, GatewayRowControl>();
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalListControl listview = null;
+ /// <summary>
+ /// 鐢熸垚鐨勭綉鍏崇姸鎬佹帶浠舵殏鏃跺瓨鍏ュ唴瀛樹腑
+ /// </summary>
+ private Dictionary<string, GatewayRowControl> dicRowContr = new Dictionary<string, GatewayRowControl>();
/// <summary>
/// 鍏抽棴璁惧绠＄悊鐣岄潰(濡傛灉瑙ｉ櫎缁戝畾鐨勭綉鍏虫槸褰撳墠鎵�閫夋嫨鐨勭綉鍏崇殑璇濓紝鍒欏叧闂澶囩鐞嗙晫闈�)
- /// </summary>
+ /// </summary>
private bool closeDeviceManagForm = false;
- #endregion
+ #endregion
#region 鈻� 鍒濆鍖朹____________________________
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
{
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uGatewayManagement));
@@ -41,23 +41,23 @@
//娣诲姞鍥炬爣
var btnAdd = new MostRightIconControl(69, 69);
btnAdd.UnSelectedImagePath = "Item/Add.png";
- topFrameLayout.AddChidren(btnAdd);
- btnAdd.InitControl();
- btnAdd.ButtonClickEvent += (sender, e) =>
- {
- var form = new GatewayAdd.NewGateWaySelectForm();
- form.AddForm();
- };
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
- {
+ topFrameLayout.AddChidren(btnAdd);
+ btnAdd.InitControl();
+ btnAdd.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new GatewayAdd.NewGateWaySelectForm();
+ form.AddForm();
+ };
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
//娓呯┖bodyFrame
this.ClearBodyFrame();
@@ -68,18 +68,18 @@
bodyFrameLayout.AddChidren(listview);
//璁惧畾涓儴淇℃伅
- this.SetMiddleFrameInfo();
- }
-
- /// <summary>
- /// 璁惧畾涓儴淇℃伅
- /// </summary>
- private void SetMiddleFrameInfo()
+ this.SetMiddleFrameInfo();
+ }
+
+ /// <summary>
+ /// 璁惧畾涓儴淇℃伅
+ /// </summary>
+ private void SetMiddleFrameInfo()
{
this.dicRowContr.Clear();
this.listview.RemoveAll();
-
- //鑾峰彇鏈湴鍏ㄩ儴缃戝叧瀵硅薄
+
+ //鑾峰彇鏈湴鍏ㄩ儴缃戝叧瀵硅薄
List<ZbGateway> listway = HdlGatewayLogic.Current.GetAllLocalGateway();
if (listway.Count == 0)
{
@@ -105,19 +105,19 @@
//璁剧疆鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
this.AddGatewayOnlinePush();
//寮�鍚綉鍏冲湪绾跨洃娴嬬殑绾跨▼
- this.StartGatewayOnlieCheckThread(listway);
+ this.StartGatewayOnlieCheckThread(listway);
}
- #endregion
+ #endregion
#region 鈻� 娣诲姞缃戝叧琛宊________________________
- /// <summary>
- /// 娣诲姞琛�
- /// </summary>
- /// <param name="strWayId">String way.</param>
- /// <param name="addLine">鏄惁娣诲姞搴曠嚎</param>
- private void AddRowLayout(string strWayId, bool addLine)
+ /// <summary>
+ /// 娣诲姞琛�
+ /// </summary>
+ /// <param name="strWayId">String way.</param>
+ /// <param name="addLine">鏄惁娣诲姞搴曠嚎</param>
+ private void AddRowLayout(string strWayId, bool addLine)
{
//缃戝叧鎺т欢
var Gateway = HdlGatewayLogic.Current.GetLocalGateway(strWayId);
@@ -125,7 +125,7 @@
listview.AddChidren(gatewayRow);
gatewayRow.InitControl(81);
//鍚戝彸鍥炬爣
- gatewayRow.frameTable.AddRightIconControl();
+ gatewayRow.frameTable.AddRightArrow();
//娣诲姞鍦ㄧ嚎鐘舵��
gatewayRow.AddOnLineControl();
if (addLine == true)
@@ -148,35 +148,35 @@
}
//缂栬緫鎸夐挳
- var btnEditor = new NormalViewControl(Application.GetRealWidth(177), gatewayRow.Height, false);
- btnEditor.BackgroundColor = UserCenterColor.Current.RowEditorButtonColor;
- btnEditor.TextAlignment = TextAlignment.Center;
- btnEditor.TextColor = UserCenterColor.Current.White;
+ var btnEditor = new NormalViewControl(Application.GetRealWidth(177), gatewayRow.Height, false);
+ btnEditor.BackgroundColor = UserCenterColor.Current.RowEditorButtonColor;
+ btnEditor.TextAlignment = TextAlignment.Center;
+ btnEditor.TextColor = UserCenterColor.Current.White;
btnEditor.TextID = R.MyInternationalizationString.uEditor;
gatewayRow.AddRightView(btnEditor);
btnEditor.ButtonClickEvent += (sender, e) =>
{
//濡傛灉鐐瑰嚮鐨勬槸涓嶅湪绾跨殑缃戝叧锛屽垯褰撲粈涔堜簨閮芥病鏈夊彂鐢�
- if (gatewayRow.IsOnline == false)
- {
- //鎸囧畾鐨勭綉鍏充笉鍦ㄧ嚎
- this.ShowMassage(ShowMsgType.Normal, Language.StringByID(R.MyInternationalizationString.uTheGatewayIsNotOnline));
- return;
+ if (gatewayRow.IsOnline == false)
+ {
+ //鎸囧畾鐨勭綉鍏充笉鍦ㄧ嚎
+ this.ShowMassage(ShowMsgType.Normal, Language.StringByID(R.MyInternationalizationString.uTheGatewayIsNotOnline));
+ return;
}
//鐐瑰嚮缂栬緫鐨勮瘽锛岀洿鎺ラ殣钘�
btnNew.Visible = false;
var form = new GatewayInfoEditorForm();
form.AddForm(Gateway);
- };
-
- //瑙ｉ櫎缁戝畾
- var btnUnBind = new NormalViewControl(Application.GetRealWidth(177), gatewayRow.Height, false);
- btnUnBind.BackgroundColor = UserCenterColor.Current.RowDeleteButtonColor;
- btnUnBind.TextAlignment = TextAlignment.Center;
- btnUnBind.TextColor = UserCenterColor.Current.White;
- btnUnBind.TextID = R.MyInternationalizationString.uUnBinded;
- gatewayRow.AddRightView(btnUnBind);
+ };
+
+ //瑙ｉ櫎缁戝畾
+ var btnUnBind = new NormalViewControl(Application.GetRealWidth(177), gatewayRow.Height, false);
+ btnUnBind.BackgroundColor = UserCenterColor.Current.RowDeleteButtonColor;
+ btnUnBind.TextAlignment = TextAlignment.Center;
+ btnUnBind.TextColor = UserCenterColor.Current.White;
+ btnUnBind.TextID = R.MyInternationalizationString.uUnBinded;
+ gatewayRow.AddRightView(btnUnBind);
btnUnBind.ButtonClickEvent += (sender, e) =>
{
//濡傜Щ闄ょ綉鍏筹紝璇ョ綉鍏崇粦瀹氱殑璁惧鍒楄〃{0}灏嗘竻绌猴紝纭缁х画鎵ц璇ユ搷浣滐紵
@@ -189,19 +189,19 @@
{
this.DeleteGateway(strWayId, gatewayRow);
});
- };
-
- //鍗曞嚮浜嬩欢
- gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>
+ };
+
+ //鍗曞嚮浜嬩欢
+ gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>
{
//濡傛灉鐐瑰嚮鐨勬槸涓嶅湪绾跨殑缃戝叧锛屽垯褰撲粈涔堜簨閮芥病鏈夊彂鐢�
- if (gatewayRow.IsOnline == false)
- {
- //鎸囧畾鐨勭綉鍏充笉鍦ㄧ嚎
- this.ShowMassage(ShowMsgType.Normal, Language.StringByID(R.MyInternationalizationString.uTheGatewayIsNotOnline));
- return;
- }
- //濡傛灉瀛樺湪鏂扮増鏈�,骞朵笖鍗曞嚮浠栫殑璇�
+ if (gatewayRow.IsOnline == false)
+ {
+ //鎸囧畾鐨勭綉鍏充笉鍦ㄧ嚎
+ this.ShowMassage(ShowMsgType.Normal, Language.StringByID(R.MyInternationalizationString.uTheGatewayIsNotOnline));
+ return;
+ }
+ //濡傛灉瀛樺湪鏂扮増鏈�,骞朵笖鍗曞嚮浠栫殑璇�
if (btnNew.Visible == true)
{
if (sender is InformationTipView || sender is IconViewControl)
@@ -215,21 +215,21 @@
}
//鏄惁鍒囨崲鍒皗0}缃戝叧?
- string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + gatewayRow.btnName.Text + "]");
+ string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + gatewayRow.btnName.Text + "]");
if (strWayId == GatewayResourse.AppOldSelectGatewayId)
{
//鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + gatewayRow.btnName.Text + "]");
- }
+ }
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
//鎵ц鍒囨崲缃戝叧鎿嶄綔
this.DoSwitchGateway(strWayId);
- });
- };
+ });
+ };
}
- #endregion
+ #endregion
#region 鈻� 瑙ｇ粦缃戝叧___________________________
@@ -237,7 +237,7 @@
/// 瑙ｇ粦缃戝叧
/// </summary>
/// <param name="strWayId"></param>
- /// <param name="row"></param>
+ /// <param name="row"></param>
private async void DeleteGateway(string strWayId, GatewayRowControl row)
{
//鍒犻櫎浜戠缃戝叧
@@ -379,7 +379,7 @@
}
oldGetOnlineTime = DateTime.Now;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
System.Threading.Thread.Sleep(300);
//鍒锋柊缃戝叧鍦ㄧ嚎鐘舵��
@@ -395,14 +395,13 @@
}
//缃戝叧鏂扮増鏈娴�
this.CheckGatewayNewVersion(listway);
- })
- { IsBackground = true }.Start();
+ });
}
/// <summary>
/// 缃戝叧鍦ㄧ嚎鐘舵�佸彉鏇�
/// </summary>
- /// <param name="gateWay">缃戝叧瀵硅薄</param>
+ /// <param name="gateWay">缃戝叧瀵硅薄</param>
/// <param name="online">鍦ㄧ嚎鐘舵�佸彉鏇村悗鐨勭姸鎬�</param>
public override void GatewayOnlinePush(ZbGateway gateWay, bool online)
{
@@ -420,7 +419,7 @@
});
}
- #endregion
+ #endregion
#region 鈻� 缃戝叧鏂扮増鏈娴媉____________________
@@ -472,17 +471,17 @@
/// <summary>
/// 鐢婚潰鍏抽棴
- /// </summary>
- public override void CloseForm()
- {
- base.CloseForm();
-
+ /// </summary>
+ public override void CloseForm()
+ {
+ base.CloseForm();
+
if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == true && this.closeDeviceManagForm == true)
{
//鍏抽棴鐣岄潰
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
this.LoadFormMethodByName("DeviceListMainForm", "CloseForm");
- }
+ }
}
#endregion
@@ -492,10 +491,11 @@
/// <summary>
/// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
/// </summary>
- public override void FormActionAgainEvent()
+ public override int FormActionAgainEvent()
{
- //鍒濆鍖栦腑閮ㄦ帶浠�
+ //鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
+ return 1;
}
#endregion
--
Gitblit v1.8.0