From 5ce9a5b3706b7c609d832f73763a853ffd415c85 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 09 六月 2022 13:40:37 +0800
Subject: [PATCH] 2022-6-9 修复推送
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs | 71 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
index d4db8a5..1991ff5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
@@ -54,16 +54,28 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- //缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
- string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg4).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
- int yy = Application.GetRealHeight(1066);
+ //鎵嬫満杩炴帴缃戝叧
+ var btnTitle = new NormalViewControl(400, 60, true);
+ btnTitle.TextID = R.MyInternationalizationString.uMobileConnectionGateway;
+ btnTitle.X = Application.GetRealWidth(75);
+ btnTitle.Y = Application.GetRealHeight(939);
+ btnTitle.IsBold = true;
+ btnTitle.TextSize = 14;
+ bodyFrameLayout.AddChidren(btnTitle);
+
+ //1.app鑻ユ樉绀鸿繛鎺ョ殑缃戝叧璁惧锛岃〃鏄庤繛鎺ユ垚鍔�
+ //2.璇峰墠寰�娣诲姞鍏朵粬璁惧
+ //3.鑻ラ暱鏃堕棿鏃犳硶杩炴帴鎴愬姛锛岃鍓嶅線鈥滄煡鐪嬪府鍔┾��
+ string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddMiniGatewayMsg4).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ int yy = btnTitle.Bottom + Application.GetRealHeight(23);
foreach (var msg in ArryMsg)
{
var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
btnMsg.Text = msg;
btnMsg.Y = yy;
- btnMsg.TextAlignment = TextAlignment.Center;
+ btnMsg.X = btnTitle.X;
btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnMsg.TextSize = 12;
bodyFrameLayout.AddChidren(btnMsg);
yy = btnMsg.Bottom;
}
@@ -72,6 +84,14 @@
this.InitConcetionAnimete();
//寮�鍚綉鍏虫娴嬬殑绾跨▼
this.StartCheckGatewayThread();
+
+ //鏌ョ湅甯姪
+ var btnHelp = this.AddHelpControl();
+ btnHelp.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Mini");
+ };
}
/// <summary>
@@ -84,25 +104,25 @@
//鍥炬爣
var picGwImage = new FrameLayout();
- picGwImage.Width = this.GetPictrueRealSize(857);
- picGwImage.Height = this.GetPictrueRealSize(239);
- picGwImage.Y = Application.GetRealWidth(236);
+ picGwImage.Width = this.GetPictrueRealSize(848);
+ picGwImage.Height = this.GetPictrueRealSize(475);
+ picGwImage.Y = Application.GetRealHeight(199);
picGwImage.Gravity = Gravity.CenterHorizontal;
- picGwImage.BackgroundImagePath = "Gateway/MiniGatewaySearching.png";
+ picGwImage.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png";
bodyFrameLayout.AddChidren(picGwImage);
var btnFailIcon = new PicViewControl(66, 66);
btnFailIcon.UnSelectedImagePath = "Item/FailIcon.png";
btnFailIcon.Gravity = Gravity.CenterHorizontal;
- btnFailIcon.Y = this.GetPictrueRealSize(110);
+ btnFailIcon.Y = this.GetPictrueRealSize(200);
picGwImage.AddChidren(btnFailIcon);
//鎼滅储澶辫触
var btnFailView = new NormalViewControl(300, 60, true);
btnFailView.TextAlignment = TextAlignment.Center;
- btnFailView.Y = picGwImage.Bottom - Application.GetRealHeight(15);
+ btnFailView.Y = btnFailIcon.Bottom + Application.GetRealHeight(58);
btnFailView.Gravity = Gravity.CenterHorizontal;
btnFailView.TextColor = UserCenterColor.Current.TextGrayColor3;
btnFailView.TextID = R.MyInternationalizationString.uSearchFail;
- bodyFrameLayout.AddChidren(btnFailView);
+ picGwImage.AddChidren(btnFailView);
//瑙ｅ喅鏂规硶锛屽彲閫夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細
var btnMsg1 = new NormalViewControl(930, 60, true);
@@ -198,23 +218,23 @@
{
//鍥炬爣
var btnGwImage = new FrameLayout();
- btnGwImage.Width = this.GetPictrueRealSize(857);
- btnGwImage.Height = this.GetPictrueRealSize(239);
- btnGwImage.Y = Application.GetRealHeight(360);
+ btnGwImage.Width = this.GetPictrueRealSize(848);
+ btnGwImage.Height = this.GetPictrueRealSize(475);
+ btnGwImage.Y = Application.GetRealHeight(199);
btnGwImage.Gravity = Gravity.CenterHorizontal;
- btnGwImage.BackgroundImagePath = "Gateway/MiniGatewaySearching.png";
+ btnGwImage.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png";
bodyFrameLayout.AddChidren(btnGwImage);
//姝ｅ湪鎼滅储缃戝叧鈥�
var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
btnMsg.TextID = R.MyInternationalizationString.uGatewaySearching;
- btnMsg.Y = Application.GetRealHeight(821);
+ btnMsg.Y = btnGwImage.Bottom + Application.GetRealHeight(150);
btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
btnMsg.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(btnMsg);
//棣栨牸鐨刋杞�
- int firstPoint = this.GetPictrueRealSize(275);
+ int firstPoint = this.GetPictrueRealSize(280);
//涓�鏍肩殑瀹藉害
int width = this.GetPictrueRealSize(22);
//闂磋窛澶у皬
@@ -231,7 +251,7 @@
var btnRound = new PicViewControl(width, width, false);
btnRound.Radius = (uint)width / 2;
btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;
- btnRound.Y = this.GetPictrueRealSize(132);
+ btnRound.Y = this.GetPictrueRealSize(225);
btnRound.X = listPoint[0];
btnGwImage.AddChidren(btnRound);
@@ -316,6 +336,8 @@
private void StartCheckGatewayThread()
{
this.isGatewaySearching = true;
+ this.dicZbGatewayDiv = new Dictionary<string, int>();
+
HdlThreadLogic.Current.RunThread(() =>
{
int count = 0;
@@ -351,10 +373,17 @@
{
var way = ZbGateway.GateWayList[i];
var wayId = way.GwId;
- //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
- if (dicZbGatewayDiv.ContainsKey(wayId) == true || way.localIsConnected == false)
+
+ if (dicZbGatewayDiv.ContainsKey(wayId) == true)
{
//宸茬粡澶勭悊浜�
+ continue;
+ }
+ //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
+ if (way.localIsConnected == false)
+ {
+ string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂 ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
+ HdlLogLogic.Current.WriteLog(-1, strMsg);
continue;
}
@@ -384,7 +413,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
- var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+ var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);
if (result == false)
{
continue;
--
Gitblit v1.8.0