From 627093aca723d4bfb971b97c828e8b3a22dbda78 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 17 七月 2020 17:26:19 +0800
Subject: [PATCH] 2020-07-17-1
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index ce52da1..74d9ccb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -60,9 +60,9 @@
//鍥炬爣
var picGwImage = new FrameLayout();
- picGwImage.Width = Application.GetMinRealAverage(861);
- picGwImage.Height = Application.GetMinRealAverage(478);
- picGwImage.Y = Application.GetRealWidth(251);
+ picGwImage.Width = this.GetPictrueRealSize(861);
+ picGwImage.Height = this.GetPictrueRealSize(478);
+ picGwImage.Y = Application.GetRealHeight(251);
picGwImage.Gravity = Gravity.CenterHorizontal;
picGwImage.BackgroundImagePath = "Gateway/WiredGatewaySearching.png";
bodyFrameLayout.AddChidren(picGwImage);
@@ -89,8 +89,8 @@
//鍥炬爣
var picGwImage = new FrameLayout();
- picGwImage.Width = Application.GetMinRealAverage(861);
- picGwImage.Height = Application.GetMinRealAverage(478);
+ picGwImage.Width = this.GetPictrueRealSize(861);
+ picGwImage.Height = this.GetPictrueRealSize(478);
picGwImage.Y = Application.GetRealWidth(158);
picGwImage.Gravity = Gravity.CenterHorizontal;
picGwImage.BackgroundImagePath = "Gateway/WiredGatewaySearching.png";
@@ -98,12 +98,12 @@
var btnFailIcon = new PicViewControl(66, 66);
btnFailIcon.UnSelectedImagePath = "Item/FailIcon.png";
btnFailIcon.Gravity = Gravity.CenterHorizontal;
- btnFailIcon.Y = Application.GetMinRealAverage(181);
+ btnFailIcon.Y = this.GetPictrueRealSize(181);
picGwImage.AddChidren(btnFailIcon);
//鎼滅储澶辫触
var btnFailView = new NormalViewControl(300, 60, true);
btnFailView.TextAlignment = TextAlignment.Center;
- btnFailView.Y = Application.GetMinRealAverage(305);
+ btnFailView.Y = this.GetPictrueRealSize(305);
btnFailView.Gravity = Gravity.CenterHorizontal;
btnFailView.TextColor = UserCenterColor.Current.TextGrayColor3;
btnFailView.TextID = R.MyInternationalizationString.uSearchFail;
@@ -151,7 +151,7 @@
bodyFrameLayout.AddChidren(btnMsg5);
//閲嶈瘯
- var frameback = new FrameLayoutControl();
+ var frameback = new FrameLayoutStatuControl();
frameback.UseClickStatu = false;
frameback.Y = Application.GetRealHeight(1259);
frameback.Gravity = Gravity.CenterHorizontal;
@@ -167,7 +167,7 @@
btnReDo.Gravity = Gravity.CenterHorizontal;
btnReDo.TextAlignment = TextAlignment.Center;
btnReDo.TextID = R.MyInternationalizationString.uReDoAgain;
- frameback.AddChidren(btnReDo, ChidrenBindMode.BindEventOnly);
+ frameback.AddChidren(btnReDo, ChidrenBindMode.BindEvent);
frameback.ButtonClickEvent += (sender, e) =>
{
//鍒濆鍖栧垵濮嬩腑閮ㄦ帶浠�
@@ -202,11 +202,11 @@
private void InitConcetionAnimete(FrameLayout picGwImage, NormalViewControl btnMsg)
{
//棣栨牸鐨刋杞�
- int firstPoint = Application.GetMinRealAverage(288);
+ int firstPoint = this.GetPictrueRealSize(288);
//涓�鏍肩殑瀹藉害
- int width = Application.GetMinRealAverage(22);
+ int width = this.GetPictrueRealSize(22);
//闂磋窛澶у皬
- int space = Application.GetMinRealAverage(12);
+ int space = this.GetPictrueRealSize(12);
//鐢熸垚鏍煎瓙鍧愭爣
var listPoint = new List<int>();
@@ -219,7 +219,7 @@
var btnRound = new PicViewControl(width, width, false);
btnRound.Radius = (uint)width / 2;
btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;
- btnRound.Y = Application.GetMinRealAverage(202);
+ btnRound.Y = this.GetPictrueRealSize(202);
btnRound.X = listPoint[0];
picGwImage.AddChidren(btnRound);
@@ -315,12 +315,12 @@
List<string> listId = new List<string>();
for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
{
- if (ZbGateway.GateWayList[i].getGatewayBaseInfo.IpAddress == string.Empty)
+ if (ZbGateway.GateWayList[i].GwIP == string.Empty)
{
//IP娌℃湁鐨勭綉鍏筹紝鎴戜篃涓嶇煡閬撳畠鏄共鍢涚殑
continue;
}
- string gwId = HdlGatewayLogic.Current.GetGatewayId(ZbGateway.GateWayList[i]);
+ string gwId = ZbGateway.GateWayList[i].GwId;
//閲嶅娣诲姞妫�娴�
if (this.dicIdCheckCount.ContainsKey(gwId) == false)
{
@@ -342,7 +342,7 @@
}
for (int i = 0; i < listId.Count; i++)
{
- ZbGateway way = ZbGateway.GateWayList.Find((obj) => HdlGatewayLogic.Current.GetGatewayId(obj) == listId[i]);
+ ZbGateway way = ZbGateway.GateWayList.Find((obj) => obj.GwId == listId[i]);
if (way == null)
{
continue;
@@ -352,9 +352,9 @@
GatewayBindMode mode = GatewayBindMode.BindAgain;
//濡傛灉鏄涓�娆＄粦瀹�,鎴栬�呮槸浠ュ墠宸茬粡缁戝畾杩囦簡鐨�
if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true
- || way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)
+ || way.HomeId == Common.Config.Instance.HomeId)
{
- if (way.getGatewayBaseInfo.HomeId != Common.Config.Instance.HomeId)
+ if (way.HomeId != Common.Config.Instance.HomeId)
{
//绗竴娆＄粦瀹�,涔熷氨鏄綉鍏充綇瀹匢D涓虹┖
mode = GatewayBindMode.First;
--
Gitblit v1.8.0