From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index f9561e4..e7277e7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -21,9 +21,9 @@
/// </summary>
private bool isDeviceThreadStart = false;
/// <summary>
- /// 绛夊緟璁惧鐨勫洖棣堢殑瓒呮椂鏃堕棿(鍗曚綅锛氱)
+ /// 绛夊緟璁惧鐨勫洖棣堢殑瓒呮椂鏃堕棿(鍗曚綅锛氱櫨姣)
/// </summary>
- private int waitDeviceTimeOut = 3;
+ private int waitDeviceTimeOut = 20;
/// <summary>
/// 涓婚瓒呮椂鐨勭嚎绋嬫槸鍚﹀紑鍚�
/// </summary>
@@ -118,7 +118,6 @@
this.btnProgressBar = new FrameLayout();
btnProgressBar.Width = 0;
btnProgressBar.Height = btnProRow.Height;
- btnProgressBar.Radius = btnProRow.Radius;
btnProgressBar.BackgroundColor = 0xfffb744a;
btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;
btnProRow.AddChidren(btnProgressBar);
@@ -227,19 +226,16 @@
}
//鍒锋柊瓒呮椂鏃堕棿
- this.waitDeviceTimeOut = 3;
+ this.waitDeviceTimeOut = 20;
//鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
- if ((device is OTADevice) == false)
- {
- //涓嶉渶瑕�200绔偣鐨勯偅涓澶�
- this.dicNewDevice[device.DeviceAddr].Add(device);
+ //涓嶉渶瑕�200绔偣鐨勯偅涓澶� 2020.01.13 鍙樻洿:ota涔熷姞杩涙潵
+ this.dicNewDevice[device.DeviceAddr].Add(device);
- //鏈夋柊璁惧锛屽紑鍚樉绀鸿澶囦俊鎭晫闈㈢殑绾跨▼(閲岄潰浼氱瓑寰呬笁绉掕繖鏍�)
- this.StartShowDeviceAddSuccessFormThread();
- }
+ //鏈夋柊璁惧锛屽紑鍚樉绀鸿澶囦俊鎭晫闈㈢殑绾跨▼(閲岄潰浼氱瓑寰呬笁绉掕繖鏍�)
+ this.StartShowDeviceAddSuccessFormThread();
}
}
@@ -264,12 +260,12 @@
while (this.waitDeviceTimeOut >= 0)
{
//绛夊緟涓嬩竴涓洖璺�
- System.Threading.Thread.Sleep(1000);
+ System.Threading.Thread.Sleep(100);
this.waitDeviceTimeOut--;
}
//鍋滄鎺ユ敹
this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
- System.Threading.Thread.Sleep(500);
+ System.Threading.Thread.Sleep(200);
//鐩墠灏卞紕涓�涓�
Application.RunOnMainThread(() =>
@@ -279,6 +275,10 @@
//閲嶆柊鍙樻洿UI
foreach (var device in listDevice)
{
+ if (device is OTADevice)
+ {
+ continue;
+ }
device.IconPath = string.Empty;
device.ReSave();
}
@@ -429,8 +429,8 @@
if (info.Result != 0)
{
//鍑虹幇鏈煡閿欒,璇烽噸鏂板叆缃�
- this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
- //HdlLogLogic.Current.WriteLog(-1, resultData);
+ //this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
+ HdlLogLogic.Current.WriteLog(-1, resultData);
return 2;
}
this.topTimeOut = topMaxTime;
--
Gitblit v1.8.0