From bbbfbb1fff6d2520c3f7c85d834b166e813a8a74 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 06 四月 2023 10:34:49 +0800
Subject: [PATCH] 1.更新EZSDK.IOS.dll 2.增加使用app中定位隐私描述 3.更新添加萤石设备storyboard 4.更改萤石门锁页面适配
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 96 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 1d9736b..2e5ad01 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -2,6 +2,8 @@
using HDL_ON.Entity;
using System.Collections.Generic;
using Shared;
+using HDL_ON.DAL.Server;
+using Foundation;
#if __IOS__
#else
using Com.Videogo.Hdl;
@@ -60,6 +62,9 @@
this.GetYingshiDeviceList(serials);
};
EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate;
+ NSObject[] nSObject = new NSObject[1];
+ nSObject[0] = new NSString("DP1");
+ EZSDK.IOS.EZSDK.SharedInstance().ConnectTipModels = nSObject;
EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
#else
@@ -278,7 +283,65 @@
{
return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
}
+ /// <summary>
+ /// 闂ㄩ攣鎺ㄩ��
+ /// </summary>
+ /// <param name="pushMessageType"></param>
+ /// <param name="jPushMessageInfo"></param>
+ public void DoorLockPush(JPushMessageInfo jpushMessageInfo)
+ {
+ 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)
+ {
+ return;
+ }
+ if (expantContent.spk != SPK.VideoDoorLock)
+ {
+ 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);
+ }
+ });
+ }
+ /// <summary>
+ /// 鏇存柊寮�閿佸浘鏍囧拰鐢垫睜鐘舵��
+ /// </summary>
+ private void UpdateDoorLockState(PushMessageType pushMessageType)
+ {
+ int childrenCount = MainPage.BasePageView.ChildrenCount - 1;
+ for (int i = childrenCount; childrenCount > i; i--)
+ {
+ View view = MainPage.BasePageView.GetChildren(i);
+ if (view is VideoDoorLockPage)
+ {
+ VideoDoorLockPage videoDoorLockPage = (VideoDoorLockPage)view;
+ if (videoDoorLockPage != null)
+ {
+ videoDoorLockPage.UpdateState(pushMessageType);
+ }
+
+ }
+ }
+
+ }
/// <summary>
/// 鑾峰彇钀ょ煶瑙嗛銆愰棬閿併�戝垪琛�
/// </summary>
@@ -292,37 +355,6 @@
#endif
return list;
}
-
- /// <summary>
- /// 鏇存柊寮�閿佸浘鏍囧拰鐢垫睜鐘舵��
- /// </summary>
- public void UpdateDoorLockState(PushMessageType pushMessageType, string homeId, string spk, string stateContent)
- {
- if (spk != SPK.VideoDoorLock)
- {
- return;
- }
- this.MainThread(() =>
- {
- int childrenCount = MainPage.BasePageView.ChildrenCount - 1;
- for (int i = childrenCount; childrenCount > i; i--)
- {
- View view = MainPage.BasePageView.GetChildren(i);
- if (view is VideoDoorLockPage)
- {
- VideoDoorLockPage videoDoorLockPage = (VideoDoorLockPage)view;
- if (videoDoorLockPage != null)
- {
- videoDoorLockPage.UpdateState(pushMessageType);
- }
-
- }
- }
- });
-
- }
-
-
#region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
/// <summary>
/// 淇濆瓨鏈湴鏂囦欢
@@ -482,6 +514,8 @@
new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
});
}
+
+
#endregion
/// <summary>
/// 寮规绫诲瀷
--
Gitblit v1.8.0