From f46be160caed45c67e8980173d29ed48d525a4d3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 14:49:52 +0800
Subject: [PATCH] 2023年03月28日14:49:50
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 3cb76da..ccca825 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -2,7 +2,10 @@
using HDL_ON.Entity;
using System.Collections.Generic;
using Shared;
+#if __IOS__
+#else
using Com.Videogo.Hdl;
+#endif
namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
{
@@ -36,13 +39,16 @@
}
- #region --------- 璺宠浆鍒癆ndroid閭ｈ竟鐨勬柟娉�(钀ょ煶瑙嗛闂ㄩ攣) --------
+#region --------- 璺宠浆鍒癆ndroid閭ｈ竟鐨勬柟娉�(钀ょ煶瑙嗛闂ㄩ攣) --------
/// <summary>
/// 璇诲彇浜戠鐨勪笂璁惧鍒楄〃(android婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗)
/// <paramref name="devSerial"/>璁惧搴忓垪鍙�</param>
/// </summary>
- public void SkipAddDeviceActivity(string devSerial)
+ public void SkipAddDeviceActivity(string spk)
{
+#if __IOS__
+
+#else
this.InitializationAndroidData((isBools) =>
{
if (!isBools) {
@@ -51,7 +57,7 @@
});
}
- HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity);
+ HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity,spk);
HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, adnroidActionDevSerial) =>
{
if (isBool)
@@ -73,9 +79,7 @@
}));
});
-#if __IOS__
-#else
#endif
@@ -88,7 +92,8 @@
/// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
public void SkipRTVActivity(string deviceSerial, string deviceId, string spk)
{
-
+#if __IOS__
+#else
this.InitializationAndroidData((isBools) =>
{
if (!isBools)
@@ -109,8 +114,7 @@
});
-#if __IOS__
-#else
+
#endif
}
/// <summary>
@@ -120,8 +124,10 @@
{
this.InitializationAndroidData((s)=> {
-
+#if __IOS__
+#else
HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
+#endif
});
//鏈疄鐜�
@@ -145,7 +151,10 @@
});
}
+#if __IOS__
+#else
HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
+#endif
});
}
@@ -170,7 +179,7 @@
{
//Token
isBool = false;
- return;
+ return;
}
Application.RunOnMainThread(() =>
{
@@ -179,7 +188,7 @@
//鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
//1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
- EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserVideoDoorLockInfo.Current.LoginTokenString, UserVideoDoorLockInfo.Current.RefreshToken);
+ EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
//2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
@@ -219,7 +228,7 @@
if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return;
}
- #endregion
+#endregion
/// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
@@ -237,7 +246,7 @@
}
}
- #region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
+#region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
/// <summary>
/// 淇濆瓨鏈湴鏂囦欢
/// </summary>
@@ -261,7 +270,7 @@
FunctionList.List.DeleteFunction(function);
MainPage.Log($"鏂囦欢鍒犻櫎->{function.name}-->{function.spk}");
}
- #endregion
+#endregion
/// <summary>
/// 鑾峰彇Loading瀵硅薄
/// </summary>
@@ -308,7 +317,7 @@
#endif
return list;
}
- #region ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
+#region ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
/// <summary>
/// 瀛愮嚎绋�
/// </summary>
@@ -350,8 +359,8 @@
});
}
- #endregion
- #region --------- 鎻愮ず妗嗭紝纭妗� --------
+#endregion
+#region --------- 鎻愮ず妗嗭紝纭妗� --------
/// <summary>
/// 瀵硅瘽妗�(鍙绋嬪簭鎶ラ敊鐨勬椂鍊欐墠鐢ㄥ埌)
/// </summary>
@@ -391,7 +400,7 @@
new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
});
}
- #endregion
+#endregion
/// <summary>
/// 寮规绫诲瀷
/// </summary>
@@ -411,8 +420,9 @@
room,//鎴块棿
push,//鎺ㄩ��
}
-
+#if __IOS__
+#else
/// <summary>
///
/// </summary>
@@ -436,6 +446,7 @@
}
+#endif
}
--
Gitblit v1.8.0