From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 25 七月 2024 17:34:32 +0800 Subject: [PATCH] 2024年07月25日17:33:40 --- HDL_ON/Common/HDLCommon.cs | 212 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 159 insertions(+), 53 deletions(-) diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs index 88ca761..d99e10b 100644 --- a/HDL_ON/Common/HDLCommon.cs +++ b/HDL_ON/Common/HDLCommon.cs @@ -7,7 +7,6 @@ using HDL_ON.Entity; using System.Threading; using HDL_ON.DriverLayer; - namespace HDL_ON { /// <summary> @@ -91,7 +90,7 @@ { if (revertObj.Data != null) { - var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(revertObj.Data.ToString()); + var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(revertObj.Data.ToString()); if (appVersionRes != null) { @@ -99,29 +98,33 @@ { UpdateType = appVersionRes.isEnforce ? 2 : 1, NewVersion = appVersionRes.version, - NewVersionUrl = appVersionRes.androidUrl + NewVersionUrl = appVersionRes.packageUrl }; #if __IOS__ - mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl; + mForceUpdateInfo.NewVersionUrl = appVersionRes.packageUrl; #endif //瑙f瀽鏇存柊鍐呭璇︽儏 - var reasonStrJson = GetReasonStrJson(appVersionRes.updateDescription); - if (reasonStrJson != null) - { - if (Language.CurrentLanguage == "Chinese") - { - mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese; - } - else - { - mForceUpdateInfo.ReasonStr = reasonStrJson.English; - } - } + //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; - Application.RunOnMainThread(() => + if (appVersionRes.version != MainPage.VersionString) { - ShowForceUpdateDialog(mForceUpdateInfo); - }); + Application.RunOnMainThread(() => + { + ShowForceUpdateDialog(mForceUpdateInfo); + }); + } } } } @@ -255,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(); } @@ -270,12 +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; @@ -298,12 +305,15 @@ 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); + + //1.瑙嗗璁插巶瀹剁被鍨� string interphoneTypeEnum = json["interphoneTypeEnum"].ToString(); if (string.IsNullOrEmpty(interphoneTypeEnum)) return; @@ -326,11 +336,38 @@ //钀ょ煶鐚溂 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()) { - + 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(); @@ -341,7 +378,22 @@ //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�"); //鎵撳紑鍛煎彨椤甸潰 - HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo); + 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(); + + //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�"); + //鎵撳紑鍛煎彨椤甸潰 + HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString()); return; } @@ -350,10 +402,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 == (PushMessageType.DOOR_BELL.ToString())) + { + //钀ょ煶闂ㄩ攣鎺ㄩ�� + HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo); + } + + } } catch (Exception EX) @@ -363,12 +424,12 @@ } //{"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> - /// 瑙f瀽涓版灄鍙瀵硅鎺ㄩ�佹暟鎹� - /// </summary> - /// <param name="jsonStr"></param> - /// <returns></returns> - ESVideoInfo GetESOnVideoJson(string jsonStr) + /// <summary> + /// 瑙f瀽涓版灄鍙瀵硅鎺ㄩ�佹暟鎹� + /// </summary> + /// <param name="jsonStr"></param> + /// <returns></returns> + ESVideoInfo GetESOnVideoJson(string jsonStr) { try { @@ -391,11 +452,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; } @@ -405,7 +479,13 @@ //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈� 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> @@ -428,14 +508,16 @@ 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__ //5.鍏ㄨ閫氱櫥鍑� - Shared.IOS.HDLFVSDK.Video.Logout(); + //Shared.IOS.HDLFVSDK.Video.Logout(); //6.娓呯┖Siri鍏变韩鏁版嵁淇℃伅 - new Other.SkipControl().SetData(false, "", "", "",""); + 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 @@ -450,6 +532,7 @@ { if (waitPage != null) { + waitPage.Hide(); waitPage.RemoveFromParent(); waitPage = null; } @@ -593,6 +676,7 @@ public void UpdateInternetStatus(int internetStatus, bool IsEnterBackground = false) { MainPage.Log($"缃戠粶鐘舵�佸彉鍖栵紝褰撳墠缃戠粶:{internetStatus} 鏄惁鍚庡彴:{IsEnterBackground.ToString()}"); + MainPage.LinkHdlMqttCount = 0; //缃戠粶鐘舵�佸彉鍖� 閲嶇疆缃戝叧鐘舵�侀噸鏂版悳绱� Control.Ins.GatewayOnline_Cloud = false; Control.Ins.GatewayOnline_Local = false; @@ -602,6 +686,7 @@ if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0 { MainPage.InternetStatus = 0; + //DAL.Mqtt.MqttClient.DisConnectRemote();//.InitState(); } else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1 { @@ -633,6 +718,7 @@ { try { + var list = UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockLockModelsList(); //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken var result = new HttpServerRequest().EZGetChildToken(); if (result.Code == StateCode.SUCCESS) @@ -644,7 +730,9 @@ { if (!string.IsNullOrEmpty(ezChildAccessToken)) { + #if __IOS__ + //iOS //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b"); @@ -653,12 +741,25 @@ 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); + } + EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(nSObject); + + + #else //Android //1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧� @@ -670,21 +771,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"); } @@ -698,7 +803,8 @@ } else { - IMessageCommon.Current.ShowErrorInfoAlter(result.Code); + if (result.Code != "-1") + IMessageCommon.Current.ShowErrorInfoAlter(result.Code); } } catch (Exception ex) -- Gitblit v1.8.0