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/WiredGatewaySearchForm.cs | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index ba19e43..4ba8faf 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -58,27 +58,42 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- //鍥炬爣
- var picGwImage = new FrameLayout();
- 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);
+ //鎵嬫満杩炴帴缃戝叧
+ 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);
- //姝ｅ湪鎼滅储缃戝叧鈥�
- var btnMsg = new NormalViewControl(bodyFrameLayout.Width, false);
- btnMsg.TextID = R.MyInternationalizationString.uGatewaySearching;
- btnMsg.Y = Application.GetRealHeight(1008);
- btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnMsg.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(btnMsg);
+ //1.app鑻ユ樉绀鸿繛鎺ョ殑缃戝叧璁惧锛岃〃鏄庤繛鎺ユ垚鍔焮0}2.璇峰墠寰�娣诲姞鍏朵粬璁惧{0}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.X = btnTitle.X;
+ btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnMsg.TextSize = 12;
+ bodyFrameLayout.AddChidren(btnMsg);
+ yy = btnMsg.Bottom;
+ }
//鍒濆鍖栬繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉
- this.InitConcetionAnimete(picGwImage, btnMsg);
+ this.InitConcetionAnimete();
//寮�鍚綉鍏虫娴嬬殑绾跨▼
this.StartCheckGatewayThread();
+
+ //鏌ョ湅甯姪
+ var btnHelp = this.AddHelpControl();
+ btnHelp.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Wired");
+ };
}
/// <summary>
@@ -180,7 +195,7 @@
var btnGoBack = new BottomClickButton(688);
btnGoBack.Y = Application.GetRealHeight(1495);
btnGoBack.TextID = R.MyInternationalizationString.uGobackGatewayManage;
- if (HdlFormLogic.Current.IsFormOpen("GatewayListForm") == false)
+ if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)
{
//杩斿洖涓婚〉
btnGoBack.TextID = R.MyInternationalizationString.uGobackToHomePage;
@@ -190,7 +205,7 @@
{
this.CloseForm();
//鍏抽棴鎸囧畾鐣岄潰
- HdlFormLogic.Current.CloseFormByFormName("NewGateWayMenuSelectForm");
+ this.CloseFormByFormName("NewGateWayMenuSelectForm");
};
}
@@ -201,8 +216,25 @@
/// <summary>
/// 鍒濆鍖栬繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉
/// </summary>
- private void InitConcetionAnimete(FrameLayout picGwImage, NormalViewControl btnMsg)
+ private void InitConcetionAnimete()
{
+ //鍥炬爣
+ var picGwImage = new FrameLayout();
+ 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);
+
+ //姝ｅ湪鎼滅储缃戝叧鈥�
+ var btnMsg = new NormalViewControl(bodyFrameLayout.Width, false);
+ btnMsg.TextID = R.MyInternationalizationString.uGatewaySearching;
+ btnMsg.Y = picGwImage.Bottom + Application.GetRealHeight(150);
+ btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnMsg.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(btnMsg);
+
//棣栨牸鐨刋杞�
int firstPoint = this.GetPictrueRealSize(288);
//涓�鏍肩殑瀹藉害
@@ -275,7 +307,7 @@
if (this.Parent != null)
{
var form = new GatewayManage.GatewaySearchListForm();
- this.AddFormAndCloseNowForm(form, listZbGateway, dicZbGatewayDiv);
+ this.AddFromAndRemoveNowForm(form, listZbGateway, dicZbGatewayDiv);
}
});
}
@@ -292,6 +324,8 @@
private void StartCheckGatewayThread()
{
this.isGatewaySearching = true;
+ this.dicZbGatewayDiv = new Dictionary<string, int>();
+
HdlThreadLogic.Current.RunThread(() =>
{
//娓呯┖鍏ㄩ儴鍒楄〃
@@ -363,7 +397,7 @@
continue;
}
//2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
- if (way.LocalIsConnected == false)
+ if (way.localIsConnected == false)
{
string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂 ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
HdlLogLogic.Current.WriteLog(-1, strMsg);
@@ -431,7 +465,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
- HdlDeviceCommonLogic.Current.SetDeviceToMemmoryByGateway(way.GwId, true);
+ Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way.GwId, true);
if (way.IsMainGateWay == true)
{
//濡傛灉瀹冩槸涓荤綉鍏�,鍒欏埛鏂板満鏅垪琛�
--
Gitblit v1.8.0