From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 159 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 90 insertions(+), 69 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index 5cde688..f9561e4 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>
@@ -40,6 +44,10 @@
/// 缃戝叧ID
/// </summary>
private string gatewayId = string.Empty;
+ /// <summary>
+ /// 鐪熷疄缃戝叧
+ /// </summary>
+ private ZbGateway realGateway = null;
/// <summary>
/// 杩涘害鏉�
/// </summary>
@@ -60,24 +68,25 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_formId">鐢婚潰ID,鏍囪瀹冪敱鍝釜鐣岄潰璋冪敤骞舵墦寮�鐨�</param>
- public void ShowForm(string i_formId)
- {
- this.targetFormId = i_formId;
-
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
-
- this.gatewayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
+ /// <param name="i_formId">鐢婚潰ID,鏍囪瀹冪敱鍝釜鐣岄潰璋冪敤骞舵墦寮�鐨�</param>
+ public void ShowForm(string i_formId)
+ {
+ this.targetFormId = i_formId;
+
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
+
+ this.gatewayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
+ HdlGatewayLogic.Current.GetRealGateway(ref this.realGateway, this.gatewayId);
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
{
//娓呯┖bodyFrame
this.ClearBodyFrame();
@@ -98,17 +107,17 @@
bodyFrameLayout.AddChidren(btnSearch);
//杩涘害鏉�
- var btnProRow = new FrameLayout();
- btnProRow.Gravity = Gravity.CenterHorizontal;
- btnProRow.Y = Application.GetRealHeight(861);
- btnProRow.Width = Application.GetRealWidth(559);
- btnProRow.Height = Application.GetRealHeight(29);
+ var btnProRow = new FrameLayout();
+ btnProRow.Gravity = Gravity.CenterHorizontal;
+ btnProRow.Y = Application.GetRealHeight(861);
+ btnProRow.Width = Application.GetRealWidth(559);
+ btnProRow.Height = Application.GetRealHeight(29);
btnProRow.BackgroundColor = 0xffe6e6e6;
btnProRow.Radius = (uint)Application.GetRealHeight(29) / 2;
- bodyFrameLayout.AddChidren(btnProRow);
- this.btnProgressBar = new FrameLayout();
- btnProgressBar.Width = 0;
- btnProgressBar.Height = btnProRow.Height;
+ bodyFrameLayout.AddChidren(btnProRow);
+ 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;
@@ -130,7 +139,7 @@
btnProgressView.Text = "0%";
frameProgress.AddChidren(btnProgressView);
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//钃濇墠鍒氳鏈夋椂鍊欑綉鍏充細鏀朵笉鍒板叆缃戠殑鍛戒护,鎵�浠ュ彂涓夋
for (int i = 0; i < 3; i++)
@@ -140,16 +149,15 @@
return;
}
//璁╃綉鍏冲厑璁稿叆缃�
- GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(255);
+ this.realGateway.AddNewDeviceToGateway(180);
System.Threading.Thread.Sleep(1000);
}
- })
- { IsBackground = true }.Start();
+ });
//娣诲姞鐩戣璁惧鏂颁笂鎶ョ殑浜嬩欢
- GatewayResourse.NowSelectGateway.GwResDataAction += this.AdjustGatewayResultData;
- //寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
- this.StartConcetionAnimeteThread();
+ this.realGateway.GwResDataAction += this.AdjustGatewayResultData;
+ //寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
+ this.StartConcetionAnimeteThread();
}
#endregion
@@ -168,7 +176,7 @@
if (result == -1)
{
//鍋滄鎺ユ敹
- GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;
+ this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
Application.RunOnMainThread(() =>
{
@@ -205,7 +213,7 @@
//缁欐柊璁惧璁剧疆涓婚敭灞炴��
Common.LocalDevice.Current.SetNewDeviceMainKeys(device, jobject);
- device.CurrentGateWayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
+ device.CurrentGateWayId = HdlGatewayLogic.Current.GetGatewayId(this.realGateway);
//灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
Common.LocalDevice.Current.SetDeviceInfoToMain(device, device);
@@ -251,7 +259,7 @@
}
this.isDeviceThreadStart = true;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
while (this.waitDeviceTimeOut >= 0)
{
@@ -260,7 +268,7 @@
this.waitDeviceTimeOut--;
}
//鍋滄鎺ユ敹
- GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;
+ this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
System.Threading.Thread.Sleep(500);
//鐩墠灏卞紕涓�涓�
@@ -279,8 +287,7 @@
break;
}
});
- })
- { IsBackground = true }.Start();
+ });
}
/// <summary>
@@ -331,12 +338,20 @@
btnRound.Y = Application.GetMinRealAverage(475);
bodyFrameLayout.AddChidren(btnRound);
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
int index = 1;
+ int timeCount = 0;
while (this.Parent != null)
{
System.Threading.Thread.Sleep(500);
+ timeCount++;
+ if (timeCount >= 240)
+ {
+ //120绉掑悗,鍐嶆鍙戦�佺綉鍏宠澶囧叆缃戝懡浠�
+ this.realGateway.AddNewDeviceToGateway(180);
+ timeCount = 0;
+ }
Application.RunOnMainThread(() =>
{
if (btnRound != null)
@@ -350,8 +365,7 @@
}
});
}
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
@@ -368,7 +382,7 @@
{
if (topic == gatewayId + "/Device/DeviceAnnounce_Respon")
{
- this.topTimeOut = 60;
+ this.topTimeOut = topMaxTime;
//缃戝叧鍛婄煡瀹㈡埛绔湁璁惧澹版槑
this.SetDeviceProgressValue(1);
return 2;
@@ -381,10 +395,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 +412,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 +430,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 +446,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 +475,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 +499,7 @@
return;
}
this.isTopicTimeOutThreadStart = true;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
while (this.Parent != null && this.topTimeOut >= 0)
{
@@ -494,8 +517,7 @@
this.CloseForm();
});
}
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
@@ -504,20 +526,19 @@
/// <summary>
/// 鐢婚潰鍏抽棴
- /// </summary>
- public override void CloseForm()
- {
- base.CloseForm();
+ /// </summary>
+ public override void CloseFormBefore()
+ {
//鍋滄鎺ユ敹
- GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;
+ this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
System.Threading.Thread.Sleep(1200);
//鍏抽棴鍏ョ綉妯″紡
- GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(0);
- })
- { IsBackground = true }.Start();
+ this.realGateway.AddNewDeviceToGateway(0);
+ });
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0