From a9a4e7c5928a0b7031e7104eeeb960059f26f5c0 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期四, 08 七月 2021 18:51:24 +0800 Subject: [PATCH] 2021-07-08 1.增加注释 --- HDL_ON/Common/HDLCommon.cs | 95 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 74 insertions(+), 21 deletions(-) diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs index 266b24f..af8827c 100644 --- a/HDL_ON/Common/HDLCommon.cs +++ b/HDL_ON/Common/HDLCommon.cs @@ -273,7 +273,7 @@ if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString())) { //鎶ヨ鎺ㄩ�佸脊绐楁彁绀� - ShowAlarmPushMessage(jpushMessageInfo); + ShowAlarmPushMessage(jpushMessageInfo, true); } else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString())) { @@ -295,7 +295,7 @@ eSVideoInfo.ESVideoUUID = eSVideoInfo.uuid; } - ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, "FLVI"); + ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.ToString()); } else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString())) @@ -303,24 +303,44 @@ if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return; //瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡 - var json= Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent); + var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent); + //1.瑙嗗璁插巶瀹剁被鍨� + string interphoneTypeEnum = json["interphoneTypeEnum"].ToString(); + if (string.IsNullOrEmpty(interphoneTypeEnum)) return; + // ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent); - 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锛岀洰鍓嶆病鍔炴硶姝e父浣跨敤 - 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(); + //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锛岀洰鍓嶆病鍔炴硶姝e父浣跨敤 + 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(); + } + else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString()) + { + //钀ょ煶鐚溂 + eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken + eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙� + eSVideoInfo.HomeId = jpushMessageInfo.HomeId; + } + //3.鎵撳紑鍛煎彨椤甸潰 if (eSVideoInfo == null) return; + ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum); - ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, "IMOUVISIAL"); - + } + else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString())) + { + ShowAlarmPushMessage(jpushMessageInfo, false); } } } - catch(Exception EX) + catch (Exception EX) { Utlis.WriteLine("catch: " + EX.ToString()); } @@ -369,6 +389,8 @@ case "13602944661": case "18778381374": case "18316672920": + case "15626203746": + case "551775569@qq.com": return; } @@ -429,7 +451,8 @@ /// 鎶ヨ鎺ㄩ�佸脊绐楁彁绀�,鐐瑰嚮鏌ョ湅璺宠浆淇℃伅涓績 /// </summary> /// <param name="jpushMessageInfo"></param> - public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo) + /// <param name="isAlarm">鏄惁鏄姤璀︿俊鎭紝锛堝姞杞界殑寮圭獥棰滆壊涓嶄竴鏍凤級</param> + public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo, bool isAlarm) { //娌$櫥褰曚笉澶勭悊 if (UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null) @@ -440,12 +463,35 @@ //璺宠浆淇℃伅涓績椤甸潰 Action goAction = () => { + //鏌ョ湅瀵瑰簲浣忓畢鐨勪俊鎭紝瑕佸垏鎹㈠埌瀵瑰簲浣忓畢 + if (jpushMessageInfo.HomeId != DB_ResidenceData.Instance.CurrentRegion.id) + { + var homeTemp = UserInfo.Current.regionList.Find((obj) => jpushMessageInfo.HomeId == obj.id); + if (homeTemp != null) + { + DB_ResidenceData.Instance.CurrentRegion = homeTemp; + DB_ResidenceData.Instance.SaveResidenceData(); + DB_ResidenceData.Instance.EixtAccount(); + //鍒锋柊浣忓畢鏁版嵁 + Common.ApiUtlis.Ins.DownloadData(); + while (MainPage.BasePageView.ChildrenCount > 1) + { + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 2; + } + MainPage.CurPageIndex = 9999; + MainPage.UserBasePage.ChooseCollection(); + } + } //Dialog alarmPushConfirmDialog = null; Action backAction = () => { }; + while (MainPage.BasePageView.ChildrenCount > 1) + { + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 2; + } var skipPage = new MessageCenterPage(); MainPage.BasePageView.AddChidren(skipPage); skipPage.LoadPage(backAction); @@ -458,10 +504,11 @@ alarmPushConfirmDialog = null; }; + //闃叉澶氭寮圭獥澶勭悊 if (alarmPushConfirmDialog == null) { - alarmPushConfirmDialog = new ConfirmDialog(); + alarmPushConfirmDialog = new ConfirmDialog(isAlarm); alarmPushConfirmDialog.ShowDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver); } else @@ -569,22 +616,28 @@ var result = new HttpServerRequest().EZGetChildToken(); if (result.Code == StateCode.SUCCESS) { - var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString()); + var ezChildAccessToken = result.Data.ToString(); + + //var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString()); Application.RunOnMainThread(() => { - if (!string.IsNullOrEmpty(ezChildAccessToken.accessToken)) + if (!string.IsNullOrEmpty(ezChildAccessToken)) { #if __IOS__ //iOS - + //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY + EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b"); //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧� EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken); - EZSDK.IOS.EZSDK.SetRequestHttpsHost(OnAppConfig.Instance.RequestHttpsHost); + EZSDK.IOS.EZSDK.SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id); //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK - EZSDK.IOS.EZSDK.SetEZAccessToken(ezChildAccessToken.accessToken); - //3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈� + EZSDK.IOS.EZSDK.SetEZAccessToken(ezChildAccessToken); + ////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈� EZSDK.IOS.EZSDK.Go2EZvizMonitor(); + //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo(); + //info.de + //EZSDK.IOS.EZSDK.Play(info); #else //Android //1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧� -- Gitblit v1.8.0