From 0f13be8b24ef37fe16cd34c8411a907f93b7f304 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 28 十一月 2023 09:35:42 +0800
Subject: [PATCH] Merge branch 'Wxr-V2.4.2' into Google-2023-11-17-1
---
HDL_ON/Common/HDLCommon.cs | 106 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 42a0b9a..f766680 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -258,10 +258,12 @@
{
try
{
+ //Console.WriteLine($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
+
//Extras涓虹┖涓嶅鐞�
if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
- if (jpushMessageInfo.Extras.Contains(PushMessageType.OffLine.ToString()))
+ if (jpushMessageInfo.Extras == (PushMessageType.OffLine.ToString()))
{
CheckLogout();
}
@@ -273,14 +275,14 @@
if (string.IsNullOrEmpty(jpushMessageInfo.messageType)) return;
//鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈Alarm鍏抽敭瀛楃殑锛�
- if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
+ if (jpushMessageInfo.messageType == (PushMessageType.Alarm.ToString()))
{
//鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
ShowAlarmPushMessage(jpushMessageInfo, true);
//钀ょ煶闂ㄩ攣鎺ㄩ��
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString()))
+ else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
{
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
@@ -303,7 +305,7 @@
ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.ToString());
}
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
+ else if (jpushMessageInfo.messageType == (PushMessageType.HDL_INTERPHONE.ToString()))
{
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
@@ -312,7 +314,16 @@
var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
try
{
+ //var pushHomeId = json["homeId"];
+ //if (pushHomeId == null || string.IsNullOrEmpty(pushHomeId.ToString())){
+ // Console.WriteLine("homeId is null");
+ // return;
+ //}
var pushTime = json["pushTime"];
+ if(pushTime == null)
+ {
+ return;
+ }
if (!string.IsNullOrEmpty(pushTime.ToString()))
{
var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
@@ -346,37 +357,48 @@
//钀ょ煶鐚溂
eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
+ eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ eSVideoInfo.spk = json["spk"].ToString();
+
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();
+ }
}
else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
{
//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();
+ //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());
+ ////ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ ////鎵撳紑鍛煎彨椤甸潰
+ //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString());
return;
}
else if (interphoneTypeEnum == InterphoneType.FREEVIEW.ToString())
{
//鍏ㄨ閫� 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();
+ //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.FREEVIEW.ToString());
- return;
+ ////ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ ////鎵撳紑鍛煎彨椤甸潰
+ //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString());
+ //return;
}
//3.鎵撳紑鍛煎彨椤甸潰
@@ -384,18 +406,19 @@
ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);
}
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
+ else if (jpushMessageInfo.messageType == (PushMessageType.Prompt.ToString()))
{
ShowAlarmPushMessage(jpushMessageInfo, false);
//钀ょ煶闂ㄩ攣鎺ㄩ��
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
- else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+ else if (jpushMessageInfo.messageType == (PushMessageType.DOOR_BELL.ToString()))
{
//钀ょ煶闂ㄩ攣鎺ㄩ��
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
+
}
}
catch (Exception EX)
@@ -433,11 +456,24 @@
/// </summary>
public void CheckLogout()
{
+#if __IOS__
+ try{
+ HDL_ON_iOS.AppDelegate.rootViewController.PopToRootViewController(false);
+ }catch(Exception ex){
+ MainPage.Log($"鍥炲埌璺熺被澶辫触:{ex.Message}");
+ }
+#else
+ //Application.Activity.StartActivity()
+#endif
+
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
switch (UserInfo.Current.AccountString)
{
case "464027401@qq.com":
+ case "13580507523":
case "15626203746":
+ case "18316672920":
+
return;
}
@@ -478,12 +514,12 @@
DB_ResidenceData.Instance.EixtAccount();
MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
//4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
- HDLLinphone.Current.LogoutAllAccount();
+ //HDLLinphone.Current.LogoutAllAccount();
MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
#if __IOS__
//5.鍏ㄨ閫氱櫥鍑�
- Shared.IOS.HDLFVSDK.Video.Logout();
+ //Shared.IOS.HDLFVSDK.Video.Logout();
//6.娓呯┖Siri鍏变韩鏁版嵁淇℃伅
new Other.SkipControl().SetData(false, "", "", "", "");
var sDM = new SiriKit.SceneDateManager();
@@ -591,9 +627,9 @@
}
- #endregion
+#endregion
- #region 鈻� 甯哥敤鏂规硶_______________________
+#region 鈻� 甯哥敤鏂规硶_______________________
/// <summary>
/// 璁剧疆涓嬪垝绾挎寜閽姸鎬�
/// 缁熶竴灏佽璁剧疆鏂规硶
@@ -654,7 +690,7 @@
if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
{
MainPage.InternetStatus = 0;
- DAL.Mqtt.MqttClient.InitState();
+ //DAL.Mqtt.MqttClient.DisConnectRemote();//.InitState();
}
else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1
{
@@ -668,9 +704,9 @@
Control.Ins.SearchLoaclGateway();
}
}
- #endregion
+#endregion
- #region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
+#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
/// <summary>
/// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
@@ -740,8 +776,8 @@
((BaseActivity)Shared.Application.Activity).SetPermission(result =>
{
//2023骞�03鏈�29鏃�13:08:35 淇敼
- Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
- Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
+ //Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
+ //Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
//if (result)
//{
// Android.Content.Intent intent = new Android.Content.Intent();
@@ -791,6 +827,6 @@
{ IsBackground = true }.Start();
}
- #endregion
+#endregion
}
}
--
Gitblit v1.8.0