From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index fdd4faf..f6fc26f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.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("Ap");
+ };
}
/// <summary>
@@ -84,9 +104,9 @@
//鍥炬爣
var picGwImage = new FrameLayout();
- picGwImage.Width = this.GetPictrueRealSize(861);
- picGwImage.Height = this.GetPictrueRealSize(245);
- picGwImage.Y = Application.GetRealWidth(223);
+ picGwImage.Width = this.GetPictrueRealSize(860);
+ picGwImage.Height = this.GetPictrueRealSize(239);
+ picGwImage.Y = Application.GetRealWidth(308);
picGwImage.Gravity = Gravity.CenterHorizontal;
picGwImage.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";
bodyFrameLayout.AddChidren(picGwImage);
@@ -198,9 +218,9 @@
{
//鍥炬爣
var btnGwImage = new FrameLayout();
- btnGwImage.Width = this.GetPictrueRealSize(861);
- btnGwImage.Height = this.GetPictrueRealSize(245);
- btnGwImage.Y = Application.GetRealHeight(360);
+ btnGwImage.Width = this.GetPictrueRealSize(860);
+ btnGwImage.Height = this.GetPictrueRealSize(239);
+ btnGwImage.Y = Application.GetRealHeight(308);
btnGwImage.Gravity = Gravity.CenterHorizontal;
btnGwImage.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";
bodyFrameLayout.AddChidren(btnGwImage);
@@ -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(135);
+ btnRound.Y = this.GetPictrueRealSize(132);
btnRound.X = listPoint[0];
btnGwImage.AddChidren(btnRound);
@@ -312,6 +332,8 @@
private void StartCheckGatewayThread()
{
this.isGatewaySearching = true;
+ this.dicZbGatewayDiv = new Dictionary<string, int>();
+
HdlThreadLogic.Current.RunThread(() =>
{
int count = 0;
@@ -347,10 +369,16 @@
{
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;
}
@@ -380,7 +408,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;
@@ -413,7 +441,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
- Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way, true);
+ Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way.GwId, true);
if (way.IsMainGateWay == true)
{
//濡傛灉瀹冩槸涓荤綉鍏�,鍒欏埛鏂板満鏅垪琛�
--
Gitblit v1.8.0