From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 726b27a..a24c285 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -180,7 +180,7 @@
var btnGoBack = new BottomClickButton(688);
btnGoBack.Y = Application.GetRealHeight(1495);
btnGoBack.TextID = R.MyInternationalizationString.uGobackGatewayManage;
- if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)
+ if (HdlFormLogic.Current.IsFormOpen("GatewayListForm") == false)
{
//杩斿洖涓婚〉
btnGoBack.TextID = R.MyInternationalizationString.uGobackToHomePage;
@@ -190,7 +190,7 @@
{
this.CloseForm();
//鍏抽棴鎸囧畾鐣岄潰
- this.CloseFormByFormName("NewGateWayMenuSelectForm");
+ HdlFormLogic.Current.CloseFormByFormName("NewGateWayMenuSelectForm");
};
}
@@ -275,7 +275,7 @@
if (this.Parent != null)
{
var form = new GatewayManage.GatewaySearchListForm();
- this.AddFromAndRemoveNowForm(form, listZbGateway, dicZbGatewayDiv);
+ this.AddFormAndCloseNowForm(form, listZbGateway, dicZbGatewayDiv);
}
});
}
@@ -292,10 +292,12 @@
private void StartCheckGatewayThread()
{
this.isGatewaySearching = true;
- HdlThreadLogic.Current.RunThread(async () =>
+ this.dicZbGatewayDiv = new Dictionary<string, int>();
+
+ HdlThreadLogic.Current.RunThread(() =>
{
//娓呯┖鍏ㄩ儴鍒楄〃
- HdlGatewayLogic.Current.ClearAllRealGateway();
+ HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
ZigBee.Common.Application.IsSearchingGateway = true;
int count = 0;
@@ -311,7 +313,7 @@
}
count = 0;
- await this.CheckZbGatewayAndSetRow();
+ this.CheckZbGatewayAndSetRow();
if (this.newGatewayGetting == true)
{
@@ -325,7 +327,7 @@
/// <summary>
/// 妫�娴嬫悳绱㈠埌鐨勭綉鍏筹紝鐒跺悗娣诲姞鍒扮敾闈㈢殑琛岄噷闈�
/// </summary>
- private async Task<bool> CheckZbGatewayAndSetRow()
+ private bool CheckZbGatewayAndSetRow()
{
List<string> listId = new List<string>();
for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
@@ -362,6 +364,13 @@
{
continue;
}
+ //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
+ if (way.LocalIsConnected == false)
+ {
+ string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂 ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
+ HdlLogLogic.Current.WriteLog(-1, strMsg);
+ continue;
+ }
//缃戝叧缁戝畾妯″紡
var mode = GatewayBindMode.BindAgain;
@@ -389,7 +398,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
- var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+ var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);
if (result == false)
{
continue;
@@ -424,7 +433,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
- Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way, true);
+ HdlDeviceCommonLogic.Current.SetDeviceToMemmoryByGateway(way.GwId, true);
if (way.IsMainGateWay == true)
{
//濡傛灉瀹冩槸涓荤綉鍏�,鍒欏埛鏂板満鏅垪琛�
--
Gitblit v1.8.0