From f54a487bb42ac49bf81bd7b5eea311fc79231bc6 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 06 六月 2024 17:37:22 +0800
Subject: [PATCH] 备份
---
HDL_ON/Common/HDLCommon.cs | 393 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 232 insertions(+), 161 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 9d6ed34..a1629e6 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -7,11 +7,13 @@
using HDL_ON.Entity;
using System.Threading;
using HDL_ON.DriverLayer;
+using System.Collections.Generic;
namespace HDL_ON
{
/// <summary>
/// HDLCommon
+ /// 鏆傛椂娌＄敤
/// </summary>
public class HDLCommon
{
@@ -81,68 +83,6 @@
/// </summary>
public void CheckIfNeedForceUpdate()
{
- System.Threading.Tasks.Task.Run(() =>
- {
- try
- {
- var revertObj = new HttpServerRequest().CheckAppVersion();
- if (revertObj.Code == StateCode.SUCCESS)
- {
- if (revertObj.Data != null)
- {
- var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(revertObj.Data.ToString());
- if (appVersionRes != null)
- {
-
- var mForceUpdateInfo = new UpdateDialogInfo()
- {
- UpdateType = appVersionRes.isEnforce ? 2 : 1,
- NewVersion = appVersionRes.version,
- NewVersionUrl = appVersionRes.packageUrl
- };
-#if __IOS__
- mForceUpdateInfo.NewVersionUrl = appVersionRes.packageUrl;
-#endif
- //瑙ｆ瀽鏇存柊鍐呭璇︽儏
- //var reasonStrJson = GetReasonStrJson(appVersionRes.remark);
- //if (reasonStrJson != null)
- //{
- // if (Language.CurrentLanguage == "Chinese")
- // {
- // mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
- // }
- // else
- // {
- // mForceUpdateInfo.ReasonStr = reasonStrJson.English;
- // }
- //}
- mForceUpdateInfo.ReasonStr = appVersionRes.remark;
-
- if (appVersionRes.version != MainPage.VersionString)
- {
- Application.RunOnMainThread(() =>
- {
- ShowForceUpdateDialog(mForceUpdateInfo);
- });
- }
- }
- }
- }
- else
- {
- Utlis.WriteLine("璇锋眰澶辫触");
- }
- }
- catch (Exception ex)
- {
- //Shared.Utlis.WriteLine (ex.ToString ());
- }
- finally
- {
-
- }
-
- });
}
@@ -173,62 +113,6 @@
/// </summary>
public void ShowForceUpdateDialog(UpdateDialogInfo mUpdateDialogInfo)
{
- // 1.1 娌℃湁鏇存柊 杩斿洖
- if (mUpdateDialogInfo.UpdateType == 0) return;
- // 1.2 鏈夋柊鐗堟湰浣嗘槸蹇界暐杩� 杩斿洖
- if (mUpdateDialogInfo.UpdateType == 1 && (OnAppConfig.Instance.IgnoreUpdateVersion == mUpdateDialogInfo.NewVersion)) return;
- // 2.1 鏈夋柊鐗堟湰娌℃湁蹇界暐杩� 鎻愮ず鏇存柊
- if (mUpdateDialogInfo.UpdateType == 1)
- {
- Action okAction = () =>
- {
- if (string.IsNullOrEmpty(mUpdateDialogInfo.NewVersionUrl)) return;
-
- HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
- };
-
- Action cancelAction = () =>
- {
- OnAppConfig.Instance.IgnoreUpdateVersion = mUpdateDialogInfo.NewVersion;
- OnAppConfig.Instance.SaveConfig();
- };
-
- //1鎻愮ず鏇存柊
- var dialog = new UpdateTipDialog();
- var tipStr = Language.StringByID(StringId.VersionNumber) + mUpdateDialogInfo.NewVersion;
- dialog.ShowUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mUpdateDialogInfo.ReasonStr, okAction, cancelAction);
-
- }
- else if (mUpdateDialogInfo.UpdateType == 2) //2.2 闇�瑕佸己鍒舵洿鏂�
- {
- //2寮哄埗鏇存柊
- //"1.鍙戠幇鏂扮増鏈珹pp,褰撳墠鐗堟湰宸插仠鐢�,椹笂鏇存柊!\n2.璇蜂笅杞藉拰瀹夎鏂扮増鏈�!....."
- Action okAction = () =>
- {
- if (string.IsNullOrEmpty(mUpdateDialogInfo.NewVersionUrl))
- {
- Utlis.ShowTip(Language.StringByID(StringId.DataExceptionPleaseTryAgain));
- return;
- };
-
- HDLUtils.OpenUrl(mUpdateDialogInfo.NewVersionUrl);
- };
-
- //1鎻愮ず鏇存柊
- var dialog = new UpdateTipDialog();
- var tipStr = Language.StringByID(StringId.VersionNumber) + mUpdateDialogInfo.NewVersion;
- dialog.ShowForcedUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mUpdateDialogInfo.ReasonStr, okAction);
- }
- else //3. 鍙渶鎻愮ず
- {
- //3鎻愮ず閫氱煡
- Action okAction = () =>
- {
-
- };
- var dialog = new UpdateTipDialog();
- dialog.ShowTipDialog(Language.StringByID(StringId.Tip), mUpdateDialogInfo.ReasonStr, okAction);
- }
}
#endregion
@@ -258,10 +142,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,41 +159,174 @@
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.HDL_INTERPHONE.ToString()))
+ //else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
+ //{
+ // if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
+
+ // ESVideoInfo eSVideoInfo = GetESOnVideoJson(jpushMessageInfo.expantContent);
+
+ // if (eSVideoInfo == null) return;
+
+ // if (string.IsNullOrEmpty(eSVideoInfo.uuid)) return;
+
+ // if (eSVideoInfo.uuid.Contains(","))
+ // {
+ // var uuid = eSVideoInfo.uuid.Split(',');
+ // eSVideoInfo.ESVideoUUID = uuid[0];
+ // }
+ // else
+ // {
+ // eSVideoInfo.ESVideoUUID = eSVideoInfo.uuid;
+ // }
+
+ // ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.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
+
+
+ //1.瑙嗗璁插巶瀹剁被鍨�
+ string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
+ if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
+ ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
+ //2.鏍规嵁鍙瀵硅鍘傚绫诲瀷锛屽鐞嗕笉鍚岀殑鏁版嵁
+ //if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
+ //{
+ // //澶у崕涔愭
+ // eSVideoInfo.callId = json["callId"].ToString();
+ // //eSVideoInfo.Lc_AccessToken = UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken;//json["subAccountToken"].ToString();//
+ // eSVideoInfo.Lc_AccessToken = json["subAccountToken"].ToString();//2021-05-13 鐩墠浜戠杩樻病鎷垮埌Lc_AccessToken锛岀洰鍓嶆病鍔炴硶姝ｅ父浣跨敤
+ // eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ // eSVideoInfo.Lc_Location = OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1;
+ // eSVideoInfo.Lc_PlayToken = json["token"].ToString();
+ // //eSVideoInfo.Lc_Psk = json["cname"].ToString();
+ // eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK瀛楁涓嶈兘鍙朿name
+ //}
+ //else
+ if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
{
- var pushTime = json["pushTime"];
- if (!string.IsNullOrEmpty(pushTime.ToString()))
+ //钀ょ煶鐚溂
+ 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()))
{
- var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
- if (pushDateTime.AddSeconds(30) < DateTime.Now)
+ 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())
+ {
+ 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();
+ 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());
+ return;
}
- catch { }
+ //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();
+
+ // //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ // //鎵撳紑鍛煎彨椤甸潰
+ // HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString());
+ // return;
+ //}
+
+ //3.鎵撳紑鍛煎彨椤甸潰
+ if (eSVideoInfo == null) return;
+ 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 == (PushMessageType.DOOR_BELL.ToString()))
+ //{
+ // //钀ょ煶闂ㄩ攣鎺ㄩ��
+ // //HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
+ //}
+
+
}
}
catch (Exception EX)
{
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>
+ /// <param name="jsonStr"></param>
+ /// <returns></returns>
+ ESVideoInfo GetESOnVideoJson(string jsonStr)
+ {
+ try
+ {
+ if (!string.IsNullOrEmpty(jsonStr))
+ {
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<ESVideoInfo>(jsonStr);
+ }
+ return null;
+ }
+ catch
+ {
+ return null;
}
}
@@ -318,11 +337,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;
}
@@ -332,7 +364,14 @@
//璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- Logout();
+ try
+ {
+ Logout();
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鎸や笅绾垮紓甯�:{ex.Message}");
+ }
}
/// <summary>
@@ -355,12 +394,18 @@
UserInfo.Current.LastTime = DateTime.MinValue;
UserInfo.Current.SaveUserInfo();
DB_ResidenceData.Instance.EixtAccount();
-
+ MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
+ //4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
+ HDLLinphone.Current.LogoutAllAccount();
+ MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
+
#if __IOS__
- //.娓呯┖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}");
+ //5.鍏ㄨ閫氱櫥鍑�
+ //Shared.IOS.HDLFVSDK.Video.Logout();
+ //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}");
#endif
}
catch (Exception ex)
@@ -373,6 +418,7 @@
{
if (waitPage != null)
{
+ waitPage.Hide();
waitPage.RemoveFromParent();
waitPage = null;
}
@@ -420,9 +466,9 @@
MainPage.CurPageIndex = 9999;
MainPage.UserBasePage.ChooseCollection();
#if __IOS__
- //var sdm = new SiriKit.SceneDateManager();
- //sdm.RegionUrl = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
- //sdm.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ var sdm = new SiriKit.SceneDateManager();
+ sdm.RegionUrl = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
+ sdm.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
#endif
}
}
@@ -463,9 +509,9 @@
}
-#endregion
+ #endregion
-#region 鈻� 甯哥敤鏂规硶_______________________
+ #region 鈻� 甯哥敤鏂规硶_______________________
/// <summary>
/// 璁剧疆涓嬪垝绾挎寜閽姸鎬�
/// 缁熶竴灏佽璁剧疆鏂规硶
@@ -526,7 +572,7 @@
if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
{
MainPage.InternetStatus = 0;
- DAL.Mqtt.MqttClient.InitState();
+ //DAL.Mqtt.MqttClient.DisConnectRemote();//.InitState();
}
else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1
{
@@ -540,9 +586,9 @@
Control.Ins.SearchLoaclGateway();
}
}
-#endregion
+ #endregion
-#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
+ #region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
/// <summary>
/// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
@@ -558,6 +604,7 @@
{
try
{
+ var list = UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockLockModelsList();
//鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
var result = new HttpServerRequest().EZGetChildToken();
if (result.Code == StateCode.SUCCESS)
@@ -569,7 +616,9 @@
{
if (!string.IsNullOrEmpty(ezChildAccessToken))
{
+
#if __IOS__
+
//iOS
//鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
@@ -578,12 +627,30 @@
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();
+
+ //////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);
+ }
+ try
+ {
+ EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(nSObject);
+ }catch(Exception x)
+ {
+ MainPage.Log("Error", x.Message);
+ }
+
+
#else
//Android
//1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧�
@@ -595,21 +662,25 @@
{
((BaseActivity)Shared.Application.Activity).SetPermission(result =>
{
- 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);
- }
+ //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,
+ HttpUtil.APP_KEY,HttpUtil.SECRET_KEY);
+ 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");
}
@@ -644,6 +715,6 @@
{ IsBackground = true }.Start();
}
-#endregion
+ #endregion
}
}
--
Gitblit v1.8.0