From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/Common/Logic/HdlWifiLogic.cs | 98 +++++++++----------------------------------------
1 files changed, 18 insertions(+), 80 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlWifiLogic.cs
similarity index 82%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
rename to ZigbeeApp/Shared/Phone/Common/Logic/HdlWifiLogic.cs
index 6aee9ce..a69667b 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlWifiLogic.cs
@@ -3,7 +3,7 @@
using System.Security.Cryptography;
using System.Text;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// WiFi鐨勯�昏緫
@@ -131,35 +131,6 @@
/// </summary>
private bool hadAddListenNetWork = false;
- /// <summary>
- /// 鑳藉惁璁块棶http
- /// </summary>
- private bool m_CanAccessHttp = true;
- /// <summary>
- /// 涓婁竴娆¤闂甴ttp鐨勬椂闂�
- /// </summary>
- private DateTime oldAccessHttpTime = DateTime.Now;
- /// <summary>
- /// 鑳藉惁璁块棶http
- /// </summary>
- public bool CanAccessHttp
- {
- set
- {
- m_CanAccessHttp = value;
- oldAccessHttpTime = DateTime.Now;
- }
- get
- {
- //8绉掑悗鍏佽鍐嶆璁块棶
- if (m_CanAccessHttp == true || (DateTime.Now - oldAccessHttpTime).TotalMilliseconds > 8 * 1000)
- {
- oldAccessHttpTime = DateTime.Now;
- return true;
- }
- return false;
- }
- }
/// <summary>
/// 鍙樻洿缃戠粶鏃剁殑浜嬩欢
/// </summary>
@@ -398,15 +369,12 @@
//娌℃湁缃戠粶
if (value == 0)
{
- this.CanAccessHttp = false;
//鍏抽棴Socket
ZigBee.Common.Application.FindGateWaySocket.Stop();
}
//WIFI鎴栬��4G鏃�
if (value == 1 || value == 2)
{
- //鍏佽鑱旂綉
- this.CanAccessHttp = true;
this.changedNetworkTime = DateTime.Now.ToString("yyyyMMdd HH.mm.ss");
//褰撳墠鎵ц姝ょ嚎绋嬬殑鏃堕棿
string thisThreadTime = this.changedNetworkTime;
@@ -416,19 +384,6 @@
//涓嶇濡備綍,閮借鏄剧ず杞湀
ProgressBar.Show();
- //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
- if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false
- && Common.Config.Instance.HomeId != string.Empty)
- {
- //閲嶆柊鍒濆鍖栬处鍙蜂俊鎭�
- UserCenterLogic.ReInitUserAccoutInfo();
- //鍥犱负涓婇潰杩欎釜涓滆タ鑰楁椂铔箙鐨�,鎵�浠ュ鐞嗗畬涔嬪悗杩涜鍒ゆ柇
- if (thisThreadTime != this.changedNetworkTime)
- {
- //鍦ㄥ鐞嗙殑杩囩▼涓�,鍒囨崲浜嗙綉缁�,鎶婁笅闈㈢殑澶勭悊浜ょ粰鍙﹀鐨勭嚎绋�
- return;
- }
- }
//閲嶆柊鍒濆鍖朣ocket
ZigBee.Common.Application.FindGateWaySocket.Stop();
System.Threading.Thread.Sleep(100);
@@ -438,47 +393,30 @@
//鏂帀杩滅▼
ZigBee.Device.ZbGateway.CloseRemoteConnectionOnForce();
- //濡傛灉鏄痺ifi
- if (value == 2)
+ //鍚姩socket
+ ZigBee.Common.Application.FindGateWaySocket.Start();
+
+ //閲嶆柊鍒濆鍖栬处鍙蜂俊鎭� (鍙兘鐨勭姸鎬佺爜:Sucess NotNetWork AuthorityChangd TokenTimeOunt)(-1:鏃犵綉 1:姝ｅ父 2:鐧婚檰涓嶈繘鍘� 3:鏉冮檺鍙樻洿浜�)
+ var result = HdlAccountLogic.Current.ReInitUserAccoutInfo();
+ if (result == AccountStatu.TokenTimeOunt || result == AccountStatu.AuthorityChangd)
{
- ZigBee.Common.Application.FindGateWaySocket.Start();
- //鍊熺敤涓�涓嬭繖涓彉閲�(妫�娴嬭兘鍚﹀箍鎾埌缃戝叧)
- UserCenterResourse.DicReceiveGatewayTest = new Dictionary<string, ZigBee.Device.ZbGateway>();
- UserCenterResourse.HideOption.CheckCanReceiveGateway = 1;
- //鍥哄畾绛変釜3绉掑惂
- System.Threading.Thread.Sleep(2500);
+ //杩欎袱涓凡缁忚韪㈠埌浜嗙櫥闄嗙晫闈�
+ ProgressBar.Close();
+ return;
+ }
+ //褰撴棤缃戞椂,閲岄潰宸茬粡绛夊緟浜�3绉�
+ int waitCount = result == AccountStatu.NotNetWork ? 3 : 9;
+ //鍥哄畾绛夊緟4.5绉�
+ for (int i = 0; i < waitCount; i++)
+ {
if (thisThreadTime != this.changedNetworkTime)
{
- //鍙樻洿浜嗙綉缁�,浜ょ敱鍏朵粬绾跨▼澶勭悊
+ //鍦ㄥ鐞嗙殑杩囩▼涓�,鍒囨崲浜嗙綉缁�,鎶婁笅闈㈢殑澶勭悊浜ょ粰鍙﹀鐨勭嚎绋�
return;
}
- UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
System.Threading.Thread.Sleep(500);
+ }
- bool canReceiveGw = false;
- foreach (var gateway in UserCenterResourse.DicReceiveGatewayTest.Values)
- {
- if (gateway.HomeId == Common.Config.Instance.Home.Id)
- {
- //鑳藉鎼滅储寰楀埌缃戝叧
- canReceiveGw = true;
- break;
- }
- }
- UserCenterResourse.DicReceiveGatewayTest = null;
- //璁剧疆杩滅▼杩炴帴鐨勫垵濮嬪��
- ZigBee.Device.ZbGateway.IsRemote = canReceiveGw == false;
- if (canReceiveGw == false)
- {
- //濡傛灉鏄繙绋嬬殑璇�,杩藉姞绛夊緟鏃堕棿(鎬诲叡5绉�)
- System.Threading.Thread.Sleep(2000);
- }
- }
- else if (value == 1)
- {
- //濡傛灉鏄�4G鐨勮瘽,鐩存帴绛夊緟
- System.Threading.Thread.Sleep(4500);
- }
ProgressBar.Close();
}, ShowErrorMode.NO);
--
Gitblit v1.8.0