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/HdlBackup/HdlGatewayListBackUpForm.cs | 132 +++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 67 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlGatewayListBackUpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlGatewayListBackUpForm.cs
index db749b4..8c39464 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlGatewayListBackUpForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlGatewayListBackUpForm.cs
@@ -11,38 +11,38 @@
/// </summary>
public class HdlGatewayListBackUpForm : EditorCommonForm
{
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 鍒楄〃鎺т欢
- /// </summary>
- private VerticalScrolViewLayout listview = null;
- /// <summary>
- /// 鐢熸垚鐨勭綉鍏崇姸鎬佹帶浠舵殏鏃跺瓨鍏ュ唴瀛樹腑
- /// </summary>
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalScrolViewLayout listview = null;
+ /// <summary>
+ /// 鐢熸垚鐨勭綉鍏崇姸鎬佹帶浠舵殏鏃跺瓨鍏ュ唴瀛樹腑
+ /// </summary>
private Dictionary<string, GatewayRowControl> dicRowContr = new Dictionary<string, GatewayRowControl>();
- #endregion
+ #endregion
#region 鈻� 鍒濆鍖朹____________________________
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
{
//璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uGatewayBackup));
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
- {
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uGatewayBackup));
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
//娓呯┖bodyFrame
this.ClearBodyFrame();
@@ -51,18 +51,18 @@
bodyFrameLayout.AddChidren(listview);
//璁惧畾涓儴淇℃伅
- this.SetMiddleFrameInfo();
- }
-
- /// <summary>
- /// 璁惧畾涓儴淇℃伅
- /// </summary>
- private void SetMiddleFrameInfo()
+ this.SetMiddleFrameInfo();
+ }
+
+ /// <summary>
+ /// 璁惧畾涓儴淇℃伅
+ /// </summary>
+ private void SetMiddleFrameInfo()
{
//璁剧疆鎺ュ彈鍦ㄧ嚎鐘舵�佹帹閫�
- this.AddGatewayOnlinePush();
-
- new System.Threading.Thread(() =>
+ this.AddGatewayOnlinePush();
+
+ HdlThreadLogic.Current.RunThread(() =>
{
List<ZbGateway> listway = HdlGatewayLogic.Current.GetAllLocalGateway();
if (listway.Count == 0)
@@ -82,27 +82,26 @@
this.CloseProgressBar();
//寮�鍚綉鍏冲湪绾跨洃娴嬬殑绾跨▼
this.StartGatewayOnlieCheckThread(listway);
- });
- })
- { IsBackground = true }.Start();
+ });
+ });
}
- #endregion
+ #endregion
#region 鈻� 娣诲姞缃戝叧琛宊________________________
- /// <summary>
- /// 娣诲姞琛�
- /// </summary>
- /// <param name="strWayId">String way.</param>
- public void AddRowLayout(string strWayId)
+ /// <summary>
+ /// 娣诲姞琛�
+ /// </summary>
+ /// <param name="strWayId">String way.</param>
+ public void AddRowLayout(string strWayId)
{
//缃戝叧鎺т欢
var Gateway = HdlGatewayLogic.Current.GetLocalGateway(strWayId);
var gatewayRow = new GatewayRowControl(Gateway);
listview.AddChidren(gatewayRow);
//鍚戝彸鍥炬爣
- gatewayRow.frameTable.AddRightIconControl();
+ gatewayRow.frameTable.AddRightArrow();
//鎻愮ず鏈夋柊鐗堟湰
var btnNew = new InformationTipView(gatewayRow.btnIcon);
@@ -110,19 +109,19 @@
gatewayRow.frameTable.AddChidren(btnNew, ChidrenBindMode.BindEventOnly);
gatewayRow.AddTag("btnNew", btnNew);
- this.dicRowContr[strWayId] = gatewayRow;
-
- //鍗曞嚮浜嬩欢
- gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>
+ this.dicRowContr[strWayId] = gatewayRow;
+
+ //鍗曞嚮浜嬩欢
+ 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)
@@ -133,18 +132,18 @@
form.AddForm(Gateway);
return;
}
- }
- ZbGateway realWay = null;
+ }
+ ZbGateway realWay = null;
if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, strWayId) == false)
{
//閿欒:缃戝叧瀵硅薄涓㈠け
string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
this.ShowMassage(ShowMsgType.Tip, msg);
return;
- }
- var form2 = new HdlGatewayBackUpForm();
- form2.AddForm(realWay);
- };
+ }
+ var form2 = new HdlGatewayBackUpForm();
+ form2.AddForm(realWay);
+ };
}
#endregion
@@ -157,7 +156,7 @@
/// <param name="listway"></param>
private void StartGatewayOnlieCheckThread(List<ZbGateway> listway)
{
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
System.Threading.Thread.Sleep(300);
//鍒锋柊缃戝叧鍦ㄧ嚎鐘舵��
@@ -173,14 +172,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)
{
@@ -198,7 +196,7 @@
});
}
- #endregion
+ #endregion
#region 鈻� 缃戝叧鏂扮増鏈娴媉____________________
--
Gitblit v1.8.0