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/CommonBase/Logic/UserCenterLogic.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index a034c13..c00d980 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -4,7 +4,6 @@
using Shared.Common.ResponseEntity;
using System.Collections.Generic;
using System.Text;
-
namespace Shared.Phone.UserCenter
{
/// <summary>
@@ -565,6 +564,10 @@
/// <param name="noticeDb">鏄惁閫氱煡浜戠</param>
public static void ReLoginAgain(string account = "", bool noticeDb = true)
{
+#if iOS
+ //閫�鍑哄叏瑙嗛�氱櫥褰�
+ Shared.IOS.HDLFVSDK.Video.Logout();
+#endif
if (Config.Instance.Home.IsVirtually == true)
{
//濡傛灉鏄櫄鎷熶綇瀹�
@@ -814,10 +817,8 @@
//濡傛灉鏈夌綉缁滅殑璇�
if (hadNet == 1)
{
- //閲嶆柊鍙戦�佸懡浠ゅ幓缁戝畾鏂綉鎯呭喌涓嬪浠界殑缃戝叧
- HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
//璇诲彇闅愬尶閰嶇疆
- HdlBackupLogic.Current.LoadHideOption();
+ //HdlBackupLogic.Current.LoadHideOption();
//璋冭瘯锛氬己鍒跺紑鍚悗鍙拌皟璇旳pp鍔熻兘
if (UserCenterResourse.HideOption.StartDebugApp == 1)
{
@@ -859,8 +860,16 @@
if (hadNet == 1)
{
+ //閲嶆柊鍙戦�佸懡浠ゅ幓缁戝畾鏂綉鎯呭喌涓嬪浠界殑缃戝叧
+ HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+
//鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
HdlGatewayLogic.Current.SynchronizeDbGateway();
+
+ //璇诲彇App鏈�浣庣増鏈�
+ HdlFirmwareUpdateLogic.ReadAppLestVersion();
+ //璇诲彇缃戝叧鏈�浣庣増鏈�
+ HdlFirmwareUpdateLogic.ReadGatewayLestVersion();
}
//鏂紑杩滅▼Mqtt杩炴帴,閲嶆柊杩炴帴
@@ -892,7 +901,6 @@
{
//浣忓畢鍒囨崲鏃�,妫�娴嬬綉鍏宠繛鎺ユ儏鍐�
CheckGatewayConnection();
-
}
UserCenterResourse.DicReceiveGatewayTest = null;
}
--
Gitblit v1.8.0