From b1b3f47f3eeff8536b1a2851781da0b04f346fef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:04:14 +0800
Subject: [PATCH] Merge branch 'wxr1215' into dev
---
HDL_ON/Common/ApiUtlis.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index ae6c314..b53302a 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -330,6 +330,8 @@
Utlis.WriteLine("褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅,閫�鍑虹櫥褰曟墍鏈夎处鍙�");
//褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅
HDLLinphone.Current.LogoutAllAccount();
+ //鐧诲綍鍏ㄨ閫氾紙鍏ㄨ閫氫笉鏍规嵁浣忓畢id鍙樺寲锛岄��鍑虹櫥褰曚細閫�鍑烘墍鏈塻ip璐﹀彿锛屾墍浠ユ澶勯渶瑕侀噸鏂扮櫥褰曞叏瑙嗛�氾級
+ //Shared.IOS.HDLFVSDK.Video.Init("", UserInfo.Current.ID);
}
}
@@ -337,8 +339,26 @@
//======================鐧诲綍鍏ㄨ閫�====================
if (isInterphoneType_FREEVIEW)
{
- //鐧诲綍鍏ㄨ閫�
- Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
+#if __IOS__
+ //鑾峰彇鍏ㄨ閫氳处鎴蜂俊鎭�
+ string FVUserId = Ins.HttpRequest.GetVideoThirdPartUserInfo();
+ if (FVUserId!=null)
+ {
+
+ //鐧诲綍鍏ㄨ閫�
+ Shared.IOS.HDLFVSDK.Video.Init("", FVUserId);
+
+ }
+
+
+#endif
+ }
+ else {
+#if __IOS__
+ //涓嶆敮鎸佸叏瑙嗛�氾紙鐢ㄤ簬鍦╥os app鐢熷懡鍛ㄦ湡鍒ゆ柇鏄惁璋冪敤鍏ㄨ閫氭柟娉曪級
+ Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
+
+#endif
}
@@ -408,12 +428,12 @@
{
if (DB_ResidenceData.Instance.CurrentRegion != null)
{
- #region 璇诲彇鏈湴鏁版嵁
+#region 璇诲彇鏈湴鏁版嵁
//鎼滅储缃戝叧
DriverLayer.Control.Ins.SearchLoaclGateway();
//閲嶆柊杩炴帴mqtt
DAL.Mqtt.MqttClient.DisConnectRemote("鍒锋柊鏁版嵁锛岄噸杩瀖qtt",false);
- #endregion
+#endregion
}
}
@@ -487,7 +507,6 @@
{
var pack = Ins.HttpRequest.GetSecurityList();
}
-
}
}
\ No newline at end of file
--
Gitblit v1.8.0