From 4cb0cb32a69b8b4586e35d2e5383cb9051679538 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期二, 17 五月 2022 13:56:26 +0800
Subject: [PATCH] Merge branch 'dev-CQY' into dev

---
 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs            |   18 ++++++++++--------
 HDL_ON/Common/ApiUtlis.cs                          |    6 ++++--
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs |   20 +++++++++++---------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index ae6c314..35d8c7d 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -337,8 +337,10 @@
                     //======================鐧诲綍鍏ㄨ閫�====================
                     if (isInterphoneType_FREEVIEW)
                     {
+#if __IOS__
                         //鐧诲綍鍏ㄨ閫�
                         Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
+#endif
                     }
 
 
@@ -408,12 +410,12 @@
                 {
                     if (DB_ResidenceData.Instance.CurrentRegion != null)
                     {
-                        #region 璇诲彇鏈湴鏁版嵁
+#region 璇诲彇鏈湴鏁版嵁
                         //鎼滅储缃戝叧
                         DriverLayer.Control.Ins.SearchLoaclGateway();
                         //閲嶆柊杩炴帴mqtt
                         DAL.Mqtt.MqttClient.DisConnectRemote("鍒锋柊鏁版嵁锛岄噸杩瀖qtt",false);
-                        #endregion
+#endregion
 
                     }
                 }
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 15aaa60..04910cd 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -468,9 +468,11 @@
         {
             if (mHDLCallVideoInfo.spk == "door.gate")
             {
+#if __IOS__
                 //鑷爺鍙瀵硅
                 HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount);
-           }
+#endif
+            }
             else {
                 //鐙勮�愬厠鍙瀵硅
                 //濡傛灉寮�鍚簡鑷姩璺宠浆鏂规锛屽垯鏃犻渶缁х画涓嬮潰澶勭悊銆佹棤闇�鎵嬪姩璺宠浆
@@ -612,10 +614,10 @@
             return checkIncomingCallThread == null || checkIncomingCallThread.ThreadState != ThreadState.Running;
         }
 
-        #endregion
+#endregion
 
 
-        #region 鈻�  --  Android鐩稿叧鎿嶄綔_______________________________
+#region 鈻�  --  Android鐩稿叧鎿嶄綔_______________________________
 
 #if __Android__
 
@@ -710,13 +712,13 @@
         }
 
 #endif
-        #endregion
+#endregion
 
-        #region 鈻�  --  iOS鐩稿叧鎿嶄綔_______________________________
+#region 鈻�  --  iOS鐩稿叧鎿嶄綔_______________________________
 
 #if __IOS__
 
-        #region OnHDLLinphoneCallDelegate
+#region OnHDLLinphoneCallDelegate
         /// <summary>
         /// 
         /// </summary>
@@ -793,10 +795,10 @@
 
         }
 
-        #endregion
+#endregion
 #endif
 
-        #endregion
+#endregion
 
     }
 
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index b1e3fa5..3e639fb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -703,7 +703,7 @@
 
             //璁垮绠＄悊
             #region 涓汉閫夐」-璁垮绠＄悊
-            if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)//鍒ゆ柇鏄惁鏀寔璁垮绠＄悊
+            if (!Entity.DB_ResidenceData.Instance.SupportVisitorManage)//鍒ゆ柇鏄惁鏀寔璁垮绠＄悊
             {
                 optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
 
@@ -736,24 +736,26 @@
 
                 btnisitorVManagementText.MouseUpEventHandler = (sender, e) =>
                 {
+#if __IOS__
                     //鍒锋柊鎺ュ彛璇锋眰鎵�闇�瑕佺殑鍙傛暟
                     NSDictionary info = new NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
                     Shared.IOS.HDLFVSDK.Video.RefreshInfo(info);
                     //璺宠浆璁垮绠＄悊鐣岄潰
                     Shared.IOS.HDLFVSDK.Video.ShowVisitorManager();
+#endif
                 };
             }
 
 
-            #endregion
-            #endregion
+#endregion
+#endregion
             var topPaddingView2 = new FrameLayout()
             {
                 Height = Application.GetRealHeight(8)
             };
             bodyScrolView.AddChidren(topPaddingView2);
 
-            #region 瑙ｉ攣璁剧疆鍖哄煙
+#region 瑙ｉ攣璁剧疆鍖哄煙
             ///// <summary>
             ///// 瑙ｉ攣璁剧疆鍖哄煙
             ///// </summary>
@@ -803,9 +805,9 @@
             //};
             //interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
             //interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
-            #endregion
+#endregion
 
-            #region 鏈嶅姟鍣ㄤ俊鎭�
+#region 鏈嶅姟鍣ㄤ俊鎭�
             ListCellView myServerInfoCellView = new ListCellView()
             {
             };
@@ -822,10 +824,10 @@
             myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
             //myServerInfoCellView.LineView.RemoveFromParent();
 
-            #endregion
+#endregion
 
 
-            #region 娉ㄩ攢璐﹀彿
+#region 娉ㄩ攢璐﹀彿
             ListCellView logOffView = new ListCellView()
             {
             };
@@ -842,7 +844,7 @@
             logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
             logOffView.LineView.RemoveFromParent();
 
-            #endregion
+#endregion
 
             btnLogout = new Button()
             {

--
Gitblit v1.8.0