From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index b929a2f..c399fee 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -96,11 +96,13 @@
this.ClearBodyFrame();
//鍥剧墖
- var btnPic = new PicViewControl(878, 478);
- btnPic.Y = Application.GetMinRealAverage(251);
- btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.UnSelectedImagePath = "Instruct/DeviceSearch.png";
- bodyFrameLayout.AddChidren(btnPic);
+ var framePic = new FrameLayout();
+ framePic.Width = this.GetPictrueRealSize(878);
+ framePic.Height = this.GetPictrueRealSize(478);
+ framePic.Y = Application.GetRealHeight(251);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.BackgroundImagePath = "Instruct/DeviceSearch.png";
+ bodyFrameLayout.AddChidren(framePic);
//姝ｅ湪鎼滅储璁惧锛岃绋嶅�欌��
var btnSearch = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(58), false);
@@ -150,7 +152,7 @@
this.realGateway.GwResDataAction += this.AdjustGatewayResultData;
}
//寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
- this.StartConcetionAnimeteThread();
+ this.StartConcetionAnimeteThread(framePic);
}
#endregion
@@ -312,23 +314,23 @@
/// <summary>
/// 寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
/// </summary>
- private void StartConcetionAnimeteThread()
+ private void StartConcetionAnimeteThread(FrameLayout framePic)
{
- int iconSize = Application.GetMinRealAverage(23);
+ int iconSize = this.GetPictrueRealSize(23);
var listPoint = new List<int>();
for (int i = 0; i < 9; i++)
{
//X杞�+Index*(鍥炬爣澶у皬+闂磋窛)
- listPoint.Add(Application.GetMinRealAverage(394) + i * (iconSize + Application.GetMinRealAverage(10)));
+ listPoint.Add(this.GetPictrueRealSize(300) + i * (iconSize + this.GetPictrueRealSize(10)));
}
var btnRound = new PicViewControl(iconSize, iconSize, false);
btnRound.Radius = (uint)iconSize / 2;
btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;
btnRound.X = listPoint[0];
- btnRound.Y = Application.GetMinRealAverage(475);
- bodyFrameLayout.AddChidren(btnRound);
+ btnRound.Y = this.GetPictrueRealSize(225);
+ framePic.AddChidren(btnRound);
HdlThreadLogic.Current.RunThread(() =>
{
--
Gitblit v1.8.0