From 427d1c7ecd04b03419eae157e32fe3367d8dffea Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 28 十一月 2019 09:53:25 +0800
Subject: [PATCH] 2019.11.28
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index 5cde688..e714665 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -31,7 +31,11 @@
/// <summary>
/// 涓婚闂寸殑瓒呮椂鏃堕棿 -100:涓柇绾跨▼(鍗曚綅锛氱)
/// </summary>
- private int topTimeOut = 60;
+ private int topTimeOut = 120;
+ /// <summary>
+ /// 瓒呮椂鏈�澶ф椂闂�
+ /// </summary>
+ private int topMaxTime = 120;
/// <summary>
/// 鐢婚潰ID,鏍囪瀹冪敱鍝釜鐣岄潰璋冪敤骞舵墦寮�鐨�
/// </summary>
@@ -130,7 +134,7 @@
btnProgressView.Text = "0%";
frameProgress.AddChidren(btnProgressView);
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//钃濇墠鍒氳鏈夋椂鍊欑綉鍏充細鏀朵笉鍒板叆缃戠殑鍛戒护,鎵�浠ュ彂涓夋
for (int i = 0; i < 3; i++)
@@ -143,13 +147,10 @@
GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(255);
System.Threading.Thread.Sleep(1000);
}
- })
- { IsBackground = true }.Start();
+ });
//娣诲姞鐩戣璁惧鏂颁笂鎶ョ殑浜嬩欢
GatewayResourse.NowSelectGateway.GwResDataAction += this.AdjustGatewayResultData;
- //寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
- this.StartConcetionAnimeteThread();
}
#endregion
@@ -251,7 +252,7 @@
}
this.isDeviceThreadStart = true;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
while (this.waitDeviceTimeOut >= 0)
{
@@ -279,8 +280,7 @@
break;
}
});
- })
- { IsBackground = true }.Start();
+ });
}
/// <summary>
@@ -331,7 +331,7 @@
btnRound.Y = Application.GetMinRealAverage(475);
bodyFrameLayout.AddChidren(btnRound);
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
int index = 1;
while (this.Parent != null)
@@ -350,8 +350,7 @@
}
});
}
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
@@ -368,7 +367,7 @@
{
if (topic == gatewayId + "/Device/DeviceAnnounce_Respon")
{
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//缃戝叧鍛婄煡瀹㈡埛绔湁璁惧澹版槑
this.SetDeviceProgressValue(1);
return 2;
@@ -381,10 +380,11 @@
if (info.Result != 0)
{
//鍑虹幇鏈煡閿欒,璇烽噸鏂板叆缃�
- this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
- return -1;
+ //this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
+ HdlLogLogic.Current.WriteLog(-1, resultData);
+ return 2;
}
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//璁剧疆杩涘害鍊�
this.SetDeviceProgressValue(2);
return 2;
@@ -397,10 +397,11 @@
if (info.Result != 0)
{
//鍑虹幇鏈煡閿欒,璇烽噸鏂板叆缃�
- this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
- return -1;
+ //this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
+ HdlLogLogic.Current.WriteLog(-1, resultData);
+ return 2;
}
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//璁剧疆杩涘害鍊�
this.SetDeviceProgressValue(3);
return 2;
@@ -414,9 +415,10 @@
{
//鍑虹幇鏈煡閿欒,璇烽噸鏂板叆缃�
this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
- return -1;
+ //HdlLogLogic.Current.WriteLog(-1, resultData);
+ return 2;
}
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//璁剧疆杩涘害鍊�
this.SetDeviceProgressValue(4);
return 2;
@@ -429,10 +431,11 @@
if (info.Result != 0)
{
//鍑虹幇鏈煡閿欒,璇烽噸鏂板叆缃�
- this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
- return -1;
+ //this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
+ HdlLogLogic.Current.WriteLog(-1, resultData);
+ return 2;
}
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//璁剧疆杩涘害鍊�
this.SetDeviceProgressValue(5);
return 2;
@@ -457,12 +460,17 @@
//杩涘害鏉�
decimal result = value / 6;
int width = (int)(result * Application.GetRealWidth(559));
+ if (btnProgressBar.Width >= width)
+ {
+ //鏈変簺璁惧浼氫笂鎶ヤ袱娆�,杩欓噷涓嶈兘璁╁畠鐨勮繘搴︽潯寰�鍥炶蛋
+ return;
+ }
btnProgressBar.Width = width;
//鏂囨湰鏄剧ず
btnProgressView.Text = ((int)(result * 100)) + "%";
//鏂囨湰鏄剧ず鐨勯偅涓浘鐗囨绉诲姩
- frameProgress.X = ControlCommonResourse.XXLeft + btnProgressBar.Right - frameProgress.Width / 2;
+ frameProgress.X = Application.GetRealWidth(262) + btnProgressBar.Right - frameProgress.Width / 2;
});
}
@@ -476,7 +484,7 @@
return;
}
this.isTopicTimeOutThreadStart = true;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
while (this.Parent != null && this.topTimeOut >= 0)
{
@@ -494,8 +502,7 @@
this.CloseForm();
});
}
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
@@ -511,13 +518,12 @@
//鍋滄鎺ユ敹
GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
System.Threading.Thread.Sleep(1200);
//鍏抽棴鍏ョ綉妯″紡
GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(0);
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
--
Gitblit v1.8.0