From 78c5b5715518c0017d9f629ce16ee9c173a48690 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 28 八月 2020 09:59:18 +0800
Subject: [PATCH] 2020-08-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 67 ++++++++++++---------------------
1 files changed, 24 insertions(+), 43 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 241a3f1..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;
@@ -115,7 +115,7 @@
btnMsg1.Y = picGwImage.Bottom + Application.GetRealHeight(112);
btnMsg1.TextID = R.MyInternationalizationString.uSearchGatewayFailMsg1;
bodyFrameLayout.AddChidren(btnMsg1);
- //1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
+ //1.鐭寜HID/WCFG鎸夐敭锛岀郴缁熸寚绀虹伅蹇棯3绉掞紝缃戝叧杩涘叆鎹㈢粦妯″紡锛屽己鍒剁綉鍏崇粦瀹氬埌褰撳墠APP
var btnMsg2 = new NormalViewControl(930, 100, true);
btnMsg2.X = Application.GetRealWidth(75);
btnMsg2.Y = btnMsg1.Bottom + Application.GetRealHeight(35);
@@ -124,7 +124,7 @@
btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;
btnMsg2.IsMoreLines = true;
bodyFrameLayout.AddChidren(btnMsg2);
- //2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+ //2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓婏紝鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏紝鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
var btnMsg3 = new NormalViewControl(930, 100, true);
btnMsg3.X = Application.GetRealWidth(75);
btnMsg3.Y = btnMsg2.Bottom + Application.GetRealHeight(12);
@@ -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;
@@ -160,13 +160,14 @@
frameback.BackgroundImagePath = "Item/BottomButtonGround.png";
bodyFrameLayout.AddChidren(frameback);
var btnReDo = new NormalViewControl(300, 65, true);
+ btnReDo.IsBold = true;
btnReDo.TextColor = UserCenterColor.Current.White;
btnReDo.TextSize = 16;
btnReDo.Y = Application.GetRealHeight(49);
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) =>
{
//鍒濆鍖栧垵濮嬩腑閮ㄦ帶浠�
@@ -201,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>();
@@ -218,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);
@@ -314,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)
{
@@ -341,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;
@@ -351,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;
@@ -394,6 +395,8 @@
{
//闇�瑕侀噸鏂扮粦瀹�
this.dicZbGatewayDiv[listId[i]] = 2;
+ //鑾峰彇鍒颁簡鏂扮綉鍏�
+ this.newGatewayGetting = true;
}
if (mode == GatewayBindMode.First)
@@ -415,29 +418,7 @@
public override void CloseFormBefore()
{
ZigBee.Common.Application.IsSearchingGateway = false;
- //鏂紑娌℃湁鎵ц缁戝畾鐨勭綉鍏崇殑mqtt
- var list = new List<ZbGateway>();
- for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
- {
- if (HdlGatewayLogic.Current.IsGatewayExist(ZbGateway.GateWayList[i]) == false)
- {
- list.Add(ZbGateway.GateWayList[i]);
- }
- }
- if (list.Count > 0)
- {
- foreach (var way in list)
- {
- ZbGateway.GateWayList.RemoveAll((obj) => HdlGatewayLogic.Current.GetGatewayId(obj) == HdlGatewayLogic.Current.GetGatewayId(way));
- way.DisConnect("Search");
- }
- }
- if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)
- {
- //鍒锋柊涓婚〉
- UserView.UserPage.Instance.Fresh();
- }
-
+
base.CloseFormBefore();
}
--
Gitblit v1.8.0