From 4aac54380264b76496ec6cf6aa829299154433de Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 24 十一月 2023 13:40:30 +0800
Subject: [PATCH] Update AcControlPage.cs
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 126 ++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index a4456b7..1e761e9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -6,7 +6,6 @@
#if __IOS__
using Foundation;
#else
-using Com.Videogo.Hdl;
#endif
namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
@@ -16,7 +15,7 @@
/// </summary>
public class CommonMethod
{
-
+
private Loading loading;
/// <summary>
/// 璁板綍褰撳墠鐣岄潰绱㈠紩鍊�
@@ -55,6 +54,7 @@
this.SunThread(() =>
{
var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
+
this.MainThread(() =>
{
#if __IOS__
@@ -75,15 +75,6 @@
EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
#else
- HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk,list);
- HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) =>
- {
- if (isBool)
- {
- this.GetYingshiDeviceList(serials);
- }
-
- }));
#endif
});
@@ -165,7 +156,25 @@
EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
#else
- HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
+#endif
+
+
+ }
+ /// <summary>
+ /// 鎵撳紑瀹炴椂瑙嗛鐢婚潰
+ /// </summary>
+ /// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
+ /// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
+ /// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
+ /// <param name="msgId">娑堟伅id</param>
+ private void SkipRTVActivity(string deviceSerial, string deviceId, string spk, string msgId)
+ {
+
+#if __IOS__
+ //鎵撳紑钀ょ煶瑙嗛鐣岄潰
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk, msgId);
+
+#else
#endif
@@ -184,7 +193,6 @@
//鎵撳紑钀ょ煶鍘嗗彶璁板綍鐣岄潰
EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView(deviceId);
#else
- HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
#endif
});
});
@@ -204,7 +212,6 @@
//鎵撳紑钀ょ煶涓存椂瀵嗙爜鐣岄潰
EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
#else
- HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
#endif
});
});
@@ -234,10 +241,10 @@
}
string appKey = "1aa98a90489b4838b966b57018b4b04b";//姝ｅ紡鏈嶅姟鍣�
- //if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
- //{
- // appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
- //}
+ //if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
+ //{
+ // appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
+ //}
#if __IOS__
@@ -256,7 +263,6 @@
//EZSDK.IOS.EZSDK.Play(info);
#else
- HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, appKey, 1, DB_ResidenceData.Instance.CurrentRegion.id);
#endif
@@ -288,7 +294,7 @@
if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return;
#if __IOS__
#else
- HDLEzvizSdk.Instance.SetHomeId(home.id);
+
#endif
}
@@ -320,30 +326,50 @@
this.MainThread(() =>
{
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
- //{ "deviceSid":"J92513662","type":"opendoormsg","extDevId":"J92513662","deviceId":"1641010144999936001","spk":"security.door.ezviz"}
- var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<ExpantContent>(jpushMessageInfo.expantContent);
- if (expantContent == null)
+ try
{
- return;
+ //{ "deviceSid":"J92513662","type":"opendoormsg","extDevId":"J92513662","deviceId":"1641010144999936001","spk":"security.door.ezviz"}
+ var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<ExpantContent>(jpushMessageInfo.expantContent);
+ if (expantContent == null)
+ {
+ return;
+ }
+ if (expantContent.spk == null)
+ {
+ return;
+ }
+ if (expantContent.spk != SPK.VideoDoorLock)
+ {
+ return;
+ }
+ if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+ {
+ ///鎵撳紑瑙嗛闂ㄩ攣
+ string currentTimeStr = Utlis.GetTimestamp(); // 褰撳墠鏃堕棿
+
+ if (string.IsNullOrEmpty(expantContent.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(expantContent.currentTime)) > 30000)
+ { // 瓒呮椂30s
+ this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
+ }
+ else
+ {
+ this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, expantContent.msgId);
+ }
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
+ {
+ //浣庣數閲忔帹閫�
+ this.UpdateDoorLockState(PushMessageType.Alarm);
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
+ {
+ //寮�闂ㄦ帹閫�
+ this.UpdateDoorLockState(PushMessageType.Prompt);
+ }
}
- if (expantContent.spk != SPK.VideoDoorLock)
+ catch (Exception ex)
{
- return;
- }
- if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
- {
- ///鎵撳紑瑙嗛闂ㄩ攣
- this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
- }
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
- {
- //浣庣數閲忔帹閫�
- this.UpdateDoorLockState(PushMessageType.Alarm);
- }
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
- {
- //寮�闂ㄦ帹閫�
- this.UpdateDoorLockState(PushMessageType.Prompt);
+
}
});
@@ -458,7 +484,7 @@
}
-
+
#region ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
/// <summary>
/// 瀛愮嚎绋�
@@ -543,7 +569,7 @@
});
}
-
+
#endregion
/// <summary>
/// 寮规绫诲瀷
@@ -592,11 +618,12 @@
/// <summary>
/// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤,娌℃湁鐗规畩鍚箟
/// </summary>
- public class AndroidIHdlInterface : Java.Lang.Object, IHdlInterface
+ public class AndroidIHdlInterface : Java.Lang.Object//, IHdlInterface
{
- Action<bool,string> mAction;
- public AndroidIHdlInterface(Action<bool,string> action)
+ Action<bool, string> mAction;
+ Action<string> mDoorlockAnswer;
+ public AndroidIHdlInterface(Action<bool, string> action)
{
mAction = action;
}
@@ -607,10 +634,13 @@
/// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
public void AddCallback(bool p0, string p1)
{
- mAction?.Invoke(p0,p1);
+ mAction?.Invoke(p0, p1);
}
-
+ public void DoorlockAnswer(string p0)
+ {
+ mDoorlockAnswer?.Invoke(p0);
+ }
}
#endif
--
Gitblit v1.8.0