From bdc8f378f6d736fda030b3ceceab3acd91505679 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 16:10:50 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-cqy（1.5.9）
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 209 +++++++++++++++++++++++++++++++---------------------
1 files changed, 125 insertions(+), 84 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 1964df9..1f24af2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -2,6 +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
{
@@ -40,24 +44,23 @@
/// 璇诲彇浜戠鐨勪笂璁惧鍒楄〃(android婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗)
/// <paramref name="devSerial"/>璁惧搴忓垪鍙�</param>
/// </summary>
- public void SkipAddDeviceActivity(string devSerial)
+ public void SkipAddDeviceActivity(string spk)
{
-#if __IOS__
- this.InitializationAndroidData((isBools) =>
- {
- EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(devSerial);
- });
-#else
this.InitializationAndroidData((isBools) =>
{
- if (!isBools) {
- this.MainThread(()=> {
+ if (!isBools)
+ {
+ this.MainThread(() =>
+ {
this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�");
});
}
- HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity);
+#if __IOS__
+
+#else
+ HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity,spk);
HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, adnroidActionDevSerial) =>
{
if (isBool)
@@ -77,76 +80,24 @@
}
}));
+#endif
});
-#endif
- }
+
+ }
/// <summary>
/// 鎵撳紑瀹炴椂瑙嗛鐢婚潰
/// </summary>
/// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
/// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
/// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
- public void SkipRTVActivity(string deviceSerial, string deviceId, string spk)
+ /// <param name="isDialog">鏄惁闇�瑕佸脊妗�</param>
+ public void SkipRTVActivity(string deviceSerial, string deviceId, string spk, bool isDialog)
{
-#if __IOS__
- this.InitializationAndroidData((isBools) =>
- {
- EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
- });
-
-#else
- this.InitializationAndroidData((isBools) =>
- {
- if (!isBools)
- {
- this.MainThread(() => {
- this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�");
-
- });
- }
- Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) =>
- {
- dialog.Close();
- HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
- }, (dialog) =>
- {
- dialog.Close();
- });
-
- });
-
-
-#endif
- }
- /// <summary>
- /// 娴忚鍘嗗彶璁板綍
- /// </summary>
- public void SkipRecordActivity(string deviceId)
- {
- this.InitializationAndroidData((s)=> {
-
-
- //HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
-
- });
- //鏈疄鐜�
- //this.InitializationAndroidData();
- //
- }
- /// <summary>
- /// 涓存椂瀵嗙爜寮�闂�
- /// <paramref name="deviceId"/>
- /// </summary>
- public void SkipPSWActivity(string deviceId)
- {
-#if __IOS__
-
-#else
this.InitializationAndroidData((isBools) =>
{
if (!isBools)
@@ -157,10 +108,74 @@
});
}
- HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
+
+ if (isDialog)
+ {
+ Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) =>
+ {
+ dialog.Close();
+#if __IOS__
+
+#else
+ HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
+#endif
+ }, (dialog) =>
+ {
+ dialog.Close();
+ });
+ }
+ else
+ {
+#if __IOS__
+#else
+ HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
+#endif
+ }
+
});
+
+
+
+ }
+ /// <summary>
+ /// 娴忚鍘嗗彶璁板綍
+ /// </summary>
+ public void SkipRecordActivity(string deviceId)
+ {
+ this.InitializationAndroidData((s) =>
+ {
+
+#if __IOS__
+#else
+ HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
#endif
+
+ });
+
+ }
+ /// <summary>
+ /// 涓存椂瀵嗙爜寮�闂�
+ /// <paramref name="deviceId"/>
+ /// </summary>
+ public void SkipPSWActivity(string deviceId)
+ {
+ this.InitializationAndroidData((isBools) =>
+ {
+ if (!isBools)
+ {
+ this.MainThread(() =>
+ {
+ this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�");
+
+ });
+ }
+#if __IOS__
+#else
+ HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
+#endif
+
+ });
}
/// <summary>
@@ -168,8 +183,8 @@
/// </summary>
public void InitializationAndroidData(Action<bool> action)
{
-
-
+
+
bool isBool = true;
this.SunThread(() =>
{
@@ -196,7 +211,11 @@
EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
//2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
-
+ //////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
+ //EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
+ //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
+ //info.de
+ //EZSDK.IOS.EZSDK.Play(info);
#else
HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
@@ -228,7 +247,7 @@
if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return;
}
-#endregion
+ #endregion
/// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
@@ -246,7 +265,7 @@
}
}
-#region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
+ #region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
/// <summary>
/// 淇濆瓨鏈湴鏂囦欢
/// </summary>
@@ -270,7 +289,7 @@
FunctionList.List.DeleteFunction(function);
MainPage.Log($"鏂囦欢鍒犻櫎->{function.name}-->{function.spk}");
}
-#endregion
+ #endregion
/// <summary>
/// 鑾峰彇Loading瀵硅薄
/// </summary>
@@ -310,14 +329,14 @@
/// <returns></returns>
public List<Function> GetVideoDoorLockList()
{
- //var list = FunctionList.List.GetVideoDoorLockList();
+ var list = FunctionList.List.GetVideoDoorLockList();
#if DEBUG
//list.Add(new Function { name = "瑙嗛闂ㄩ攣涓�", sid = "23456789", spk = SPK.VideoDoorLock });
//list.Add(new Function { name = "瑙嗛闂ㄩ攣浜�", sid = "2345678922", spk = SPK.VideoDoorLock });
#endif
- return new List<Function>();
+ return list;
}
-#region ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
+ #region ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
/// <summary>
/// 瀛愮嚎绋�
/// </summary>
@@ -359,8 +378,8 @@
});
}
-#endregion
-#region --------- 鎻愮ず妗嗭紝纭妗� --------
+ #endregion
+ #region --------- 鎻愮ず妗嗭紝纭妗� --------
/// <summary>
/// 瀵硅瘽妗�(鍙绋嬪簭鎶ラ敊鐨勬椂鍊欐墠鐢ㄥ埌)
/// </summary>
@@ -400,7 +419,7 @@
new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
});
}
-#endregion
+ #endregion
/// <summary>
/// 寮规绫诲瀷
/// </summary>
@@ -420,12 +439,34 @@
room,//鎴块棿
push,//鎺ㄩ��
}
+
#if __IOS__
+ ///// <summary>
+ ///// 涓撻棬瀹氫箟缁橧os鍥炶皟鐢ㄧ潃,娌℃湁鐗规畩鍚箟
+ ///// </summary>
+ //public class IosIHdlInterface : Shared.IOS.HDLLinphoneSDK.HDLLinphoneCallDelegate
+ //{
+ // Action<bool, string> mAction;
+ // public IosIHdlInterface(Action<bool, string> action)
+ // {
+ // mAction = action;
+ // }
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // /// <param name="p0">true鏄叆缃戞垚鍔�(婧愮敓鍥炶皟杩斿洖)</param>
+ // /// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
+ // public void AddCallback(bool p0, string p1)
+ // {
+ // mAction?.Invoke(p0, p1);
+ // }
+
+
+ //}
#else
-
/// <summary>
- ///
+ /// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤鐫�,娌℃湁鐗规畩鍚箟
/// </summary>
public class AndroidIHdlInterface : Java.Lang.Object, IHdlInterface
{
@@ -447,10 +488,10 @@
}
-
#endif
- }
+ }
+
}
--
Gitblit v1.8.0