From adf7df175e590b7d9e0f33c0c2ea1d2897da6301 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 29 三月 2023 14:33:12 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 280 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 181 insertions(+), 99 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index ccca825..fc60e23 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -39,24 +39,41 @@
}
-#region --------- 璺宠浆鍒癆ndroid閭ｈ竟鐨勬柟娉�(钀ょ煶瑙嗛闂ㄩ攣) --------
+ #region --------- 璺宠浆鍒癆ndroid锛宨os閭ｈ竟鐨勬柟娉�(钀ょ煶瑙嗛闂ㄩ攣) --------
/// <summary>
- /// 璇诲彇浜戠鐨勪笂璁惧鍒楄〃(android婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗)
- /// <paramref name="devSerial"/>璁惧搴忓垪鍙�</param>
- /// </summary>
+ /// android,ios婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗鍥炶皟鏂规硶
+ /// 鍐嶈鍙栦簯绔殑涓婅悿鐭宠澶囧垪琛�
+ /// <paramref name="spk"/>spk</param>
public void SkipAddDeviceActivity(string spk)
{
-#if __IOS__
-#else
this.InitializationAndroidData((isBools) =>
{
- if (!isBools) {
- this.MainThread(()=> {
- this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�");
- });
- }
+ this.MainThread(() =>
+ {
+ if (!isBools)
+ {
+ this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�");
+ }
+#if __IOS__
+ //璺宠浆娣诲姞钀ょ煶璁惧
+ ezsdkDelegate = new IosIHdlInterface();
+ ezsdkDelegate.mAction += (serials) => {
+ var list = VideDoorLockSend.Current.GetVideoDoorLockDeviceList(SPK.VideoDoorLock);
+ if (list.Count > 0)
+ {
+ var function = list.Find((o) => o.sid == serials);
+ if (function != null)
+ {
+ this.SaveFunctionFile(function);
+ }
+ }
+ };
+ EZSDK.IOS.EZSDK.SharedInstance().Delegate= ezsdkDelegate;
+ EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
+
+#else
HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity,spk);
HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, adnroidActionDevSerial) =>
{
@@ -77,11 +94,16 @@
}
}));
+#endif
+
+ });
+
+
});
-#endif
+
}
/// <summary>
@@ -90,55 +112,8 @@
/// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
/// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
/// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
- public void SkipRTVActivity(string deviceSerial, string deviceId, string spk)
- {
-#if __IOS__
-#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)=> {
-
-#if __IOS__
-#else
- HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
-#endif
-
- });
- //鏈疄鐜�
- //this.InitializationAndroidData();
- //
- }
- /// <summary>
- /// 涓存椂瀵嗙爜寮�闂�
- /// <paramref name="deviceId"/>
- /// </summary>
- public void SkipPSWActivity(string deviceId)
+ /// <param name="isDialog">鏄惁闇�瑕佸脊妗�</param>
+ public void SkipRTVActivity(string deviceSerial, string deviceId, string spk, bool isDialog)
{
this.InitializationAndroidData((isBools) =>
@@ -151,9 +126,79 @@
});
}
+
+ if (isDialog)
+ {
+ Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) =>
+ {
+ dialog.Close();
#if __IOS__
+ //鎵撳紑钀ょ煶瑙嗛鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
#else
- HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
+ HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
+#endif
+ }, (dialog) =>
+ {
+ dialog.Close();
+ });
+ }
+ else
+ {
+#if __IOS__
+ //鎵撳紑钀ょ煶瑙嗛鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
+
+#else
+ HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
+#endif
+ }
+
+
+ });
+
+
+
+ }
+ /// <summary>
+ /// 娴忚鍘嗗彶璁板綍
+ /// </summary>
+ public void SkipRecordActivity(string deviceId)
+ {
+ this.InitializationAndroidData((s) =>
+ {
+
+#if __IOS__
+ //鎵撳紑钀ょ煶鍘嗗彶璁板綍鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView(deviceId);
+#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__
+ //鎵撳紑钀ょ煶涓存椂瀵嗙爜鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
+#else
+ HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
#endif
});
@@ -164,8 +209,8 @@
/// </summary>
public void InitializationAndroidData(Action<bool> action)
{
-
-
+
+
bool isBool = true;
this.SunThread(() =>
{
@@ -179,24 +224,24 @@
{
//Token
isBool = false;
- return;
+ return;
}
Application.RunOnMainThread(() =>
{
#if __IOS__
- //iOS
- //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
- EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
- //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
- 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);
- ////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
- EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
- //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
- //info.de
- //EZSDK.IOS.EZSDK.Play(info);
+ //iOS
+ //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
+ EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
+ //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
+ 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);
+ //////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);
@@ -225,28 +270,27 @@
/// <param name="home">瀵硅薄</param>
public void ChangeCurrHome(RegionInfoRes home)
{
+
if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return;
+#if __IOS__
+#else
+ HDLEzvizSdk.Instance.SetHomeId(home.id);
+#endif
}
-#endregion
+ #endregion
/// <summary>
- /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
- /// <param name="comerom">鏉ヨ嚜閭ｉ噷</param>
+ /// 鑾峰彇闂ㄩ攣鍨嬪彿鍒楄〃
/// </summary>
- public string GetVideoDoorLockIcon(Comerom comerom)
+ /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
+ public List<string> GetVideoDoorLockLockModelsList()
{
- if (comerom == Comerom.collect)
- {
- return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
- }
- else
- {
- return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
- }
-
+ return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
}
-#region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
+
+
+ #region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
/// <summary>
/// 淇濆瓨鏈湴鏂囦欢
/// </summary>
@@ -270,7 +314,24 @@
FunctionList.List.DeleteFunction(function);
MainPage.Log($"鏂囦欢鍒犻櫎->{function.name}-->{function.spk}");
}
-#endregion
+ #endregion
+ /// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
+ /// <param name="comerom">鏉ヨ嚜閭ｉ噷</param>
+ /// </summary>
+ public string GetVideoDoorLockIcon(Comerom comerom)
+ {
+ if (comerom == Comerom.collect)
+ {
+ return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
+ }
+ else
+ {
+ return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
+ }
+
+ }
+
/// <summary>
/// 鑾峰彇Loading瀵硅薄
/// </summary>
@@ -317,7 +378,7 @@
#endif
return list;
}
-#region ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
+ #region ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
/// <summary>
/// 瀛愮嚎绋�
/// </summary>
@@ -359,8 +420,8 @@
});
}
-#endregion
-#region --------- 鎻愮ず妗嗭紝纭妗� --------
+ #endregion
+ #region --------- 鎻愮ず妗嗭紝纭妗� --------
/// <summary>
/// 瀵硅瘽妗�(鍙绋嬪簭鎶ラ敊鐨勬椂鍊欐墠鐢ㄥ埌)
/// </summary>
@@ -400,7 +461,7 @@
new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
});
}
-#endregion
+ #endregion
/// <summary>
/// 寮规绫诲瀷
/// </summary>
@@ -422,9 +483,30 @@
}
#if __IOS__
+ IosIHdlInterface ezsdkDelegate;
+ /// <summary>
+ /// 涓撻棬瀹氫箟缁橧os鍥炶皟鐢ㄧ潃,娌℃湁鐗规畩鍚箟
+ /// </summary>
+ public class IosIHdlInterface : EZSDK.IOS.EZSDKDelegate
+ {
+ public Action<string> mAction;
+ public IosIHdlInterface()
+ {
+
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="p0">true鏄叆缃戞垚鍔�(婧愮敓鍥炶皟杩斿洖)</param>
+ /// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
+ public override void AddDeviceSuccessed(string deviceSerial)
+ {
+ mAction?.Invoke(deviceSerial);
+ }
+ }
#else
/// <summary>
- ///
+ /// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤鐫�,娌℃湁鐗规畩鍚箟
/// </summary>
public class AndroidIHdlInterface : Java.Lang.Object, IHdlInterface
{
@@ -451,5 +533,5 @@
}
-
+
}
--
Gitblit v1.8.0