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 | 177 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 117 insertions(+), 60 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index a4ba623..f6fc26f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -26,9 +26,9 @@
/// </summary>
private bool newGatewayGetting = false;
/// <summary>
- /// 缃戝叧妫�娴嬩腑
+ /// 缃戝叧鎼滅储涓�
/// </summary>
- private string isGatewayChecking = "0";
+ private bool isGatewaySearching = true;
#endregion
@@ -54,22 +54,44 @@
//娓呯┖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;
}
//鍒濆鍖栬繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉
this.InitConcetionAnimete();
+ //寮�鍚綉鍏虫娴嬬殑绾跨▼
+ this.StartCheckGatewayThread();
+
+ //鏌ョ湅甯姪
+ var btnHelp = this.AddHelpControl();
+ btnHelp.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Ap");
+ };
}
/// <summary>
@@ -82,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);
@@ -196,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);
@@ -229,17 +251,13 @@
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);
string strMsg = btnMsg.Text;
HdlThreadLogic.Current.RunThread(() =>
{
- //娓呯┖鍏ㄩ儴鍒楄〃
- HdlGatewayLogic.Current.ClearAllRealGateway();
- ZigBee.Common.Application.IsSearchingGateway = true;
-
int index = 1;
//璁℃椂鏃堕棿
int timeCount = 0;
@@ -251,27 +269,8 @@
if (timeCount == 10)
{
//5绉掑悗娓呯┖缃戝叧鍒楄〃
- HdlGatewayLogic.Current.ClearAllRealGateway();
+ HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
ZigBee.Common.Application.IsSearchingGateway = true;
- }
- if (timeCount % 4 == 0 && timeCount >= 10)
- {
- lock (isGatewayChecking)
- {
- if (isGatewayChecking != "1")
- {
- isGatewayChecking = "1";
- HdlThreadLogic.Current.RunThread(async () =>
- {
- //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
- await this.CheckZbGatewayAndSetRow();
- lock (isGatewayChecking)
- {
- isGatewayChecking = "0";
- }
- });
- }
- }
}
if (timeCount % 2 == 0)
{
@@ -283,7 +282,7 @@
break;
}
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
btnRound.X = listPoint[index];
index++;
@@ -293,11 +292,15 @@
}
//姝ｅ湪鎼滅储缃戝叧鈥Xs
btnMsg.Text = strMsg + timeOut + "s";
- });
+ }, ShowErrorMode.NO);
System.Threading.Thread.Sleep(500);
}
- if (timeOut <= 0)
+ //鎼滅储缁撴潫
+ this.isGatewaySearching = false;
+
+ //2020.07.14杩藉姞:鍊掕鏃剁粨鏉熸椂,鍝�曟槸宸茬粡缁戝畾浜嗙殑缃戝叧,涔熸樉绀哄嚭鏉�
+ if (timeOut <= 0 && listZbGateway.Count == 0)
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -305,7 +308,7 @@
this.InitFailMiddleFrame();
});
}
- else if (newGatewayGetting == true)
+ else if (newGatewayGetting == true || listZbGateway.Count > 0)
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -324,11 +327,44 @@
#region 鈻� 缃戝叧妫�娴媉__________________________
/// <summary>
+ /// 寮�鍚綉鍏虫娴嬬殑绾跨▼
+ /// </summary>
+ private void StartCheckGatewayThread()
+ {
+ this.isGatewaySearching = true;
+ this.dicZbGatewayDiv = new Dictionary<string, int>();
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ int count = 0;
+ while (this.Parent != null && this.isGatewaySearching == true)
+ {
+ //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
+ System.Threading.Thread.Sleep(500);
+ count++;
+ if (count < 4)
+ {
+ //涓昏涓轰簡蹇竴鐐硅兘澶熶腑鏂繖涓嚎绋�
+ continue;
+ }
+ count = 0;
+
+ this.CheckZbGatewayAndSetRow();
+
+ if (this.newGatewayGetting == true)
+ {
+ //鑾峰彇寰楀埌鏂扮綉鍏�,鍒欎腑鏂嚎绋�
+ break;
+ }
+ }
+ });
+ }
+
+ /// <summary>
/// 妫�娴嬫悳绱㈠埌鐨勭綉鍏�
/// </summary>
- private async Task<bool> CheckZbGatewayAndSetRow()
+ private bool CheckZbGatewayAndSetRow()
{
- var listCheck = new HashSet<string>();
for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
{
var way = ZbGateway.GateWayList[i];
@@ -338,25 +374,41 @@
//宸茬粡澶勭悊浜�
continue;
}
+ //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
+ if (way.localIsConnected == false)
+ {
+ string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂 ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
+ HdlLogLogic.Current.WriteLog(-1, strMsg);
+ continue;
+ }
//缃戝叧缁戝畾妯″紡
- GatewayBindMode mode = GatewayBindMode.BindAgain;
- //濡傛灉鏄涓�娆＄粦瀹�,鎴栬�呮槸浠ュ墠宸茬粡缁戝畾杩囦簡鐨�
- if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true
- || way.HomeId == Common.Config.Instance.HomeId)
+ var mode = GatewayBindMode.BindAgain;
+ //浣忓畢ID涓虹┖ 绗竴娆＄粦瀹�
+ if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true)
{
- if (way.HomeId != Common.Config.Instance.HomeId)
- {
- //绗竴娆＄粦瀹�,涔熷氨鏄綉鍏充綇瀹匢D涓虹┖
- mode = GatewayBindMode.First;
- }
- else
- {
- //宸茬粡缁戝畾杩囦簡
- mode = GatewayBindMode.Binded;
- }
+ mode = GatewayBindMode.First;
+ }
+ //浣忓畢ID涓嶇浉绛� 闇�瑕侀噸鏂扮粦瀹�
+ else if (way.HomeId != Common.Config.Instance.HomeId)
+ {
+ mode = GatewayBindMode.BindAgain;
+ }
+ //濡傛灉鏈湴涓嶅瓨鍦ㄧ殑璇�,褰撳仛绗竴娆＄粦瀹氬鐞�
+ else if (HdlGatewayLogic.Current.IsGatewayExist(way) == false)
+ {
+ mode = GatewayBindMode.First;
+ }
+ //浣忓畢ID涓�鏍�,鍒欐槸宸茬粡缁戝畾杩囦簡
+ else
+ {
+ mode = GatewayBindMode.Binded;
+ }
+ //杩欎袱绉嶆儏鍐甸兘鏄渶瑕侀噸鏂版坊鍔�(宸茬粡缁戝畾杩囦簡鐨�,鏈夊彲鑳戒綇瀹匢D娌″啓杩涘幓,瀹冩湁鍙兘鏄汉涓虹殑娓呯┖浣忓畢ID)
+ if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
+ {
//娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
- var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+ var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);
if (result == false)
{
continue;
@@ -386,10 +438,15 @@
this.newGatewayGetting = true;
}
- if (mode == GatewayBindMode.First)
+ if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
- Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way);
+ Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way.GwId, true);
+ if (way.IsMainGateWay == true)
+ {
+ //濡傛灉瀹冩槸涓荤綉鍏�,鍒欏埛鏂板満鏅垪琛�
+ HdlSceneLogic.Current.RefreshSceneUIList(true);
+ }
}
}
return true;
--
Gitblit v1.8.0