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 | 78 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index aa69336..f9561e4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -68,25 +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);
- HdlGatewayLogic.Current.GetRealGateway(ref this.realGateway, this.gatewayId);
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- 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();
@@ -107,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;
@@ -149,13 +149,15 @@
return;
}
//璁╃綉鍏冲厑璁稿叆缃�
- this.realGateway.AddNewDeviceToGateway(255);
+ this.realGateway.AddNewDeviceToGateway(180);
System.Threading.Thread.Sleep(1000);
}
});
//娣诲姞鐩戣璁惧鏂颁笂鎶ョ殑浜嬩欢
- this.realGateway.GwResDataAction += this.AdjustGatewayResultData;
+ this.realGateway.GwResDataAction += this.AdjustGatewayResultData;
+ //寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
+ this.StartConcetionAnimeteThread();
}
#endregion
@@ -339,9 +341,17 @@
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)
@@ -516,10 +526,9 @@
/// <summary>
/// 鐢婚潰鍏抽棴
- /// </summary>
- public override void CloseForm()
- {
- base.CloseForm();
+ /// </summary>
+ public override void CloseFormBefore()
+ {
//鍋滄鎺ユ敹
this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
@@ -529,6 +538,7 @@
//鍏抽棴鍏ョ綉妯″紡
this.realGateway.AddNewDeviceToGateway(0);
});
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0