合并温居城代码

wxr

2021-07-01 b409ece9569247d7e7b44fc15e8a02556ca05a57

 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()))
                    {
@@ -297,6 +297,10 @@

                        ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo);

                    }
                    else if(jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
                    {
                        ShowAlarmPushMessage(jpushMessageInfo, false);
                    }
                }
            }
@@ -411,7 +415,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)
@@ -422,6 +427,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 = () =>
@@ -443,7 +467,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