From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/Common/HDLCommon.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index f30ab05..ecced88 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,8 +295,32 @@
eSVideoInfo.ESVideoUUID = eSVideoInfo.uuid;
}
- ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo);
+ ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, "FLVI");
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
+ {
+ if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
+
+ //瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
+ var json= Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
+ 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锛岀洰鍓嶆病鍔炴硶姝ｅ父浣跨敤
+ 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();
+
+ if (eSVideoInfo == null) return;
+
+ ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, "IMOUVISIAL");
+
+ }
+ else if(jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
+ {
+ ShowAlarmPushMessage(jpushMessageInfo, false);
}
}
}
@@ -307,7 +331,7 @@
}
/// <summary>
- ///
+ /// 瑙ｆ瀽涓版灄鍙瀵硅鎺ㄩ�佹暟鎹�
/// </summary>
/// <param name="jsonStr"></param>
/// <returns></returns>
@@ -349,6 +373,8 @@
case "13602944661":
case "18778381374":
case "18316672920":
+ case "15626203746":
+ case "551775569@qq.com":
return;
}
@@ -409,7 +435,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)
@@ -420,6 +447,25 @@
//璺宠浆淇℃伅涓績椤甸潰
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 = () =>
@@ -441,7 +487,7 @@
//闃叉澶氭寮圭獥澶勭悊
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
--
Gitblit v1.8.0