From 2a88b9b559fd20f42d163d08b582f2d19ff329f4 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 30 九月 2024 17:05:58 +0800
Subject: [PATCH] Update HDLLinphone.cs
---
HDL_ON/Common/HDLCommon.cs | 136 +++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 61 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 5944bdc..8b23ca2 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -237,21 +237,6 @@
#endregion
- ///// <summary>
- ///// 鎭㈠浣忓畢
- ///// 2020-12-03 寰呮祴璇曟湭妫�娴�
- ///// </summary>
- //public void RestoreHomeBackup(string RegionID)
- //{
- // var isExist = FileUtils.ExistRegion(RegionID);
- // if (isExist)
- // {
- // //瀛樺湪鍒欐仮澶�
- // string newRegionRootPath = FileUtils.CreateRegionBackup(RegionID);
- // FileUtils.RestoreRegionFiles(newRegionRootPath);
- // }
- //}
-
#region 鈻� 鎺ㄩ�佸鐞哶______________________
/// <summary>
/// 鎺ㄩ�佹秷鎭鐞�
@@ -262,8 +247,7 @@
{
try
{
- //Console.WriteLine($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
-
+ //MainPage.Log($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
//Extras涓虹┖涓嶅鐞�
if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
@@ -284,7 +268,7 @@
//鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
ShowAlarmPushMessage(jpushMessageInfo, true);
//钀ょ煶闂ㄩ攣鎺ㄩ��
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
+ UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
{
@@ -311,12 +295,10 @@
}
else if (jpushMessageInfo.messageType == PushMessageType.HDL_INTERPHONE.ToString())
{
-
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
//瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
-
//1.瑙嗗璁插巶瀹剁被鍨�
string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
@@ -371,36 +353,46 @@
}
}
}
- catch { }
-
-
+ catch (Exception ex)
+ {
+ MainPage.Log("Error", $"鑷爺鍙瀵硅閫氱煡寮傚父:{ex.StackTrace}");
+ }
#if __ANDROID__
- Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime = 30;
- Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(true);
- Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.PlayRingtone();
- new Thread(() =>
+ try
{
- try
+ //瀹夊崜濡傛灉璁剧疆浜嗛潤闊筹紝涓嶈兘鍝嶉搩
+ if (Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.AudioManager.RingerMode.ToString().ToLower() == "normal")
{
- DateTime dateTime = DateTime.Now;
- while (true)
+ Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime = 30;
+ Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(true);
+ Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.PlayRingtone();
+ new Thread(() =>
{
- Thread.Sleep(1000);
- if (!Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MediaPlayerPlayingStatus || dateTime.AddSeconds(Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime) <= DateTime.Now)
+ try
{
- break;
+ DateTime dateTime = DateTime.Now;
+ while (true)
+ {
+ Thread.Sleep(1000);
+ if (!Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MediaPlayerPlayingStatus || dateTime.AddSeconds(Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime) <= DateTime.Now)
+ {
+ break;
+ }
+ }
+ Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
}
- }
- Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
+ catch (Exception ex)
+ {
+ MainPage.Log("error", "鑷爺鍙瀵硅閾冨０鎾斁寮傚父:" + ex.Message);
+ }
+ })
+ { IsBackground = true }.Start();
}
- catch (Exception ex)
- {
- MainPage.Log("error", "鑷爺鍙瀵硅閾冨０鎾斁寮傚父:" + ex.Message);
- }
- })
- { IsBackground = true }.Start();
-
+ }catch(Exception ex)
+ {
+ MainPage.Log("Error", $"瀹夊崜鍙瀵硅鍝嶉搩寮傚父:{ex.StackTrace}");
+ }
#elif __IOS__
SoundPlayer.Ins.PlaySound();
new Thread(() => {
@@ -437,19 +429,15 @@
{ IsBackground = true }.Start();
#endif
-
- //HDL Linphone 鐙勮�愬厠
+ MainPage.Log("鎺ユ敹鍒版帹閫�:HDL Linphone 鐙勮�愬厠");
eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
eSVideoInfo.callId = json["callId"].ToString();
eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
eSVideoInfo.DeviceName = json["deviceName"].ToString();
eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
eSVideoInfo.spk = json["spk"].ToString();
-
-
- //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
//鎵撳紑鍛煎彨椤甸潰
- HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString());
+ HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString(), jpushMessageInfo.isNotificationGoing);
return;
}
else if (interphoneTypeEnum == InterphoneType.FREEVIEW.ToString())
@@ -481,11 +469,46 @@
}
else if (jpushMessageInfo.messageType == (PushMessageType.DOOR_BELL.ToString()))
{
+ try
+ {
+ var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
+ string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
+ if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
+ ESVideoInfo eSVideoInfo = new ESVideoInfo();
+ if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
+ {
+ eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
+ eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
+ eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ eSVideoInfo.spk = json["spk"].ToString();
+ if (eSVideoInfo.spk == SPK.Peephole)
+ {
+ eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
+ if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString()))
+ {
+ eSVideoInfo.msgId = json["msgId"].ToString();
+ }
+ if (json.ContainsKey("currentTime") && !string.IsNullOrEmpty(json["currentTime"].ToString()))
+ {
+ eSVideoInfo.currentTime = json["currentTime"].ToString();
+ }
+
+ if (eSVideoInfo != null)
+ {
+ //鎵撳紑鍛煎彨椤甸潰
+ ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);
+ return;
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("Error", $"缁撴潫闂ㄩ搩鎺ㄩ�佹暟鎹紓甯�:{ex.Message}");
+ }
//钀ょ煶闂ㄩ攣鎺ㄩ��
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
-
-
}
}
catch (Exception EX)
@@ -493,8 +516,6 @@
Utlis.WriteLine("catch: " + EX.ToString());
}
}
- //{"code":0,"data":{"list":[{"createTime":"1625798305115","modifyTime":"1625798305115","region":"100000000000000001","id":"1413326644794294273","alarmId":"20210709103818-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103818-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:38:17","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{"createTime":"1625798057197","modifyTime":"1625798057197","region":"100000000000000001","id":"1413325604946640898","alarmId":"20210709103413-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103413-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:34:12","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797973320","modifyTime":"1625797973320","region":"100000000000000001","id":"1413325253141004289","alarmId":"20210709103236-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103236-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:32:31","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797782136","modifyTime":"1625797782136","region":"100000000000000001","id":"1413324451261382658","alarmId":"20210709102937-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102937-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:29:37","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797668771","modifyTime":"1625797668771","region":"100000000000000001","id":"1413323975769915394","alarmId":"20210709102743-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102743-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:27:42","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797539846","modifyTime":"1625797539846","region":"100000000000000001","id":"1413323435023466498","alarmId":"20210709102534-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102534-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:25:34","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797530627","modifyTime":"1625797530627","region":"100000000000000001","id":"1413323396351983618","alarmId":"20210709102525-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102525-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:25:25","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625796028089","modifyTime":"1625796028089","region":"100000000000000001","id":"1413317094255034369","alarmId":"20210709100024-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709100024-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:00:23","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625795974558","modifyTime":"1625795974558","region":"100000000000000001","id":"1413316869729746946","alarmId":"20210709095931-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709095931-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T09:59:31","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625795966933","modifyTime":"1625795966933","region":"100000000000000001","id":"1413316837748178946","alarmId":"20210709095923-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709095923-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T09:59:22","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"}],"totalCount":"13","totalPage":"2","pageNo":"1","pageSize":"10"},"timestamp":"1625807415164","isSuccess":true}
- //{"platform":"1","timestamp":"1625805660249","appKey":"HDL-HOME-APP-TEST","sign":"02e433c40485b30451ebdc5ca3cd959c","deviceSerial":"F41014762","homeId":"1396717478877241345"}
/// <summary>
/// 瑙ｆ瀽涓版灄鍙瀵硅鎺ㄩ�佹暟鎹�
/// </summary>
@@ -533,14 +554,7 @@
//Application.Activity.StartActivity()
#endif
- //娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
- switch (UserInfo.Current.AccountString)
- {
- case "464027401@qq.com":
- case "15626203746":
-
- return;
- }
+
//鏈櫥褰曚笉鐢ㄥ鐞�
//if (!UserInfo.Current.IsLogin) return;
@@ -602,7 +616,7 @@
//6.娓呯┖Siri鍏变韩鏁版嵁淇℃伅
new Other.SkipControl().SetData(false, "", "", "", "");
var sDM = new SiriKit.SceneDateManager();
- Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
+ //Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
#endif
}
catch (Exception ex)
--
Gitblit v1.8.0