From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs |   51 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index 5cde688..aca18a0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -130,7 +130,7 @@
             btnProgressView.Text = "0%";
             frameProgress.AddChidren(btnProgressView);
 
-            new System.Threading.Thread(() =>
+            HdlThreadLogic.Current.RunThread(() =>
             {
                 //钃濇墠鍒氳鏈夋椂鍊欑綉鍏充細鏀朵笉鍒板叆缃戠殑鍛戒护,鎵�浠ュ彂涓夋
                 for (int i = 0; i < 3; i++)
@@ -143,11 +143,11 @@
                     GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(255);
                     System.Threading.Thread.Sleep(1000);
                 }
-            })
-            { IsBackground = true }.Start();
+            });
 
             //娣诲姞鐩戣璁惧鏂颁笂鎶ョ殑浜嬩欢
             GatewayResourse.NowSelectGateway.GwResDataAction += this.AdjustGatewayResultData;
+
             //寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
             this.StartConcetionAnimeteThread();
         }
@@ -251,7 +251,7 @@
             }
             this.isDeviceThreadStart = true;
 
-            new System.Threading.Thread(() =>
+            HdlThreadLogic.Current.RunThread(() =>
             {
                 while (this.waitDeviceTimeOut >= 0)
                 {
@@ -279,8 +279,7 @@
                         break;
                     }
                 });
-            })
-            { IsBackground = true }.Start();
+            });
         }
 
         /// <summary>
@@ -331,7 +330,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 +349,7 @@
                         }
                     });
                 }
-            })
-            { IsBackground = true }.Start();
+            });
         }
 
         #endregion
@@ -381,8 +379,9 @@
                 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;
                 //璁剧疆杩涘害鍊�
@@ -397,8 +396,9 @@
                 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;
                 //璁剧疆杩涘害鍊�
@@ -414,7 +414,8 @@
                 {
                     //鍑虹幇鏈煡閿欒,璇烽噸鏂板叆缃�
                     this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));
-                    return -1;
+                    //HdlLogLogic.Current.WriteLog(-1, resultData);
+                    return 2;
                 }
                 this.topTimeOut = 60;
                 //璁剧疆杩涘害鍊�
@@ -429,8 +430,9 @@
                 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;
                 //璁剧疆杩涘害鍊�
@@ -457,12 +459,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 +483,7 @@
                 return;
             }
             this.isTopicTimeOutThreadStart = true;
-            new System.Threading.Thread(() =>
+            HdlThreadLogic.Current.RunThread(() =>
             {
                 while (this.Parent != null && this.topTimeOut >= 0)
                 {
@@ -494,8 +501,7 @@
                         this.CloseForm();
                     });
                 }
-            })
-            { IsBackground = true }.Start();
+            });
         }
 
         #endregion
@@ -511,13 +517,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