From 6c71e8a178d9cb83a178f08e3411090fe8da505d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 15:33:33 +0800
Subject: [PATCH] 删除了萤石功能，埃克斯影音中控，海信电视，
---
HDL_ON/Common/HDLCommon.cs | 190 ++++++++--------------------------------------
1 files changed, 35 insertions(+), 155 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 749e26e..a981693 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,12 @@
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,26 +303,14 @@
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;
//瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
- try
- {
- var pushTime = json["pushTime"];
- if (!string.IsNullOrEmpty(pushTime.ToString()))
- {
- var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
- if (pushDateTime.AddSeconds(30) < DateTime.Now)
- {
- return;
- }
- }
- }
- catch { }
+
//1.瑙嗗璁插巶瀹剁被鍨�
string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
@@ -341,15 +329,26 @@
//eSVideoInfo.Lc_Psk = json["cname"].ToString();
eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK瀛楁涓嶈兘鍙朿name
}
- else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
- {
- //钀ょ煶鐚溂
- eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
- eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
- eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
- }
+
else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
{
+ try
+ {
+ var pushTime = json["pushTime"];
+ if (pushTime == null)
+ {
+ return;
+ }
+ if (!string.IsNullOrEmpty(pushTime.ToString()))
+ {
+ var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
+ if (pushDateTime.AddSeconds(30) < DateTime.Now)
+ {
+ return;
+ }
+ }
+ }
+ catch { }
//HDL Linphone 鐙勮�愬厠
eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
eSVideoInfo.callId = json["callId"].ToString();
@@ -384,18 +383,16 @@
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)
@@ -439,13 +436,18 @@
}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;
}
@@ -491,7 +493,7 @@
#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();
@@ -662,7 +664,7 @@
if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
{
MainPage.InternetStatus = 0;
- DAL.Mqtt.MqttClient.InitState();
+ //DAL.Mqtt.MqttClient.DisConnectRemote();//.InitState();
}
else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1
{
@@ -678,127 +680,5 @@
}
#endregion
-#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
-
- /// <summary>
- /// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
- /// </summary>
- /// <param name="bodyView"></param>
- public void Go2EZvizMonitor(FrameLayout bodyView)
- {
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
-
- new Thread(() =>
- {
- try
- {
- var list = UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockLockModelsList();
- //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
- var result = new HttpServerRequest().EZGetChildToken();
- if (result.Code == StateCode.SUCCESS)
- {
- var ezChildAccessToken = result.Data.ToString();
-
- //var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString());
- Application.RunOnMainThread(() =>
- {
- if (!string.IsNullOrEmpty(ezChildAccessToken))
- {
-
-#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);
-
- //2023骞�03鏈�29鏃�13:08:35 淇敼
- Foundation.NSObject[] nSObject = new Foundation.NSObject[list.Count];
- for (int i = 0; i < list.Count; i++)
- {
- string strValue = list[i];
- nSObject[i] = new Foundation.NSString(strValue);
- }
- EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(nSObject);
-
-
-
-#else
- //Android
- //1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧�
- //2.璁剧疆钀ょ煶瀛愯处鍙风殑token
- //3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
- ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
- {
- if (b)
- {
- ((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);
- //if (result)
- //{
- // Android.Content.Intent intent = new Android.Content.Intent();
- // var bundle = new Android.OS.Bundle();
- // //浼犻�抧ame鍙傛暟涓簍inyphp
- // bundle.PutString("EzChildAccessToken", ezChildAccessToken);
- // bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
- // bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
- // bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
- // bundle.PutInt("Platform", 1);
- // bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
- // intent.PutExtras(bundle);
- // intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
- // Shared.Application.Activity.StartActivity(intent);
- //}
- }, "android.permission.RECORD_AUDIO");
-
- }
- });
-#endif
-
-
- }
-
- });
- }
- else
- {
- IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
- }
- }
- catch (Exception ex)
- {
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- if (waitPage != null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
- });
- }
- })
- { IsBackground = true }.Start();
- }
-
-#endregion
}
}
--
Gitblit v1.8.0