2020-12-02 1.增加子账号设备分享。 2.房间删除时间优化。3.消息中心接口对接。4.版本检测更新接口对接。

JLChen

2020-12-02 026ed1573ad8b9ba28f0e2c0bf0c9cd85f1dd2ed

 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs

@@ -34,9 +34,9 @@

        /// <summary>
        /// 显示的消息类型
        /// 1全部 2分享与功能 3报警类 4系统信息
        /// 0全部 1分享与功能 2报警类 3系统信息
        /// </summary>
        int showMesType = 1;
        int showMesType = 0;
        /// <summary>
        /// 推送消息列表
        /// </summary>
@@ -61,9 +61,7 @@

            AddTopMenuView();
            AddMessageView();
            MenuButtonSelect(1);
            //TestLoad();
            GetPushMessageList();
            MenuButtonSelect(showMesType);
        }

        /// <summary>
@@ -93,7 +91,7 @@
            allMenuButton.TextButton.TextID = StringId.All;
            Action allAction = () =>
            {
                MenuButtonSelect(1);
                MenuButtonSelect(0);
            };
            allMenuButton.SelectAction = allAction;
            #endregion
@@ -110,7 +108,7 @@
            shareMenuButton.TextButton.TextID = StringId.SharingAndFunctionality;
            Action shateAction = () =>
            {
                MenuButtonSelect(2);
                MenuButtonSelect(1);
            };
            shareMenuButton.SelectAction = shateAction;
            #endregion
@@ -127,7 +125,7 @@
            alarmMenuButton.TextButton.TextID = StringId.AlarmType;
            Action alarmAction = () =>
            {
                MenuButtonSelect(3);
                MenuButtonSelect(2);
            };
            alarmMenuButton.SelectAction = alarmAction;
            #endregion
@@ -144,7 +142,7 @@
            systemMenuButton.TextButton.TextID = StringId.SystemMessage;
            Action systemAction = () =>
            {
                MenuButtonSelect(4);
                MenuButtonSelect(3);
            };
            systemMenuButton.SelectAction = systemAction;
            #endregion
@@ -177,12 +175,12 @@
        /// <summary>
        /// 
        /// </summary>
        /// <param name="selectId">1全部 2分享与功能 3报警类 4系统信息</param>
        /// <param name="selectId">0全部 1分享与功能 2报警类 3系统信息</param>
        void MenuButtonSelect(int selectId)
        {
            showMesType = selectId;

            if (selectId == 1)
            if (selectId == 0)
            {
                allMenuButton.IsSelected = true;
                shareMenuButton.IsSelected = false;
@@ -190,7 +188,7 @@
                systemMenuButton.IsSelected = false;

            }
            else if (selectId == 2)
            else if (selectId == 1)
            {
                allMenuButton.IsSelected = false;
                shareMenuButton.IsSelected = true;
@@ -198,14 +196,14 @@
                systemMenuButton.IsSelected = false;

            }
            else if (selectId == 3)
            else if (selectId == 2)
            {
                allMenuButton.IsSelected = false;
                shareMenuButton.IsSelected = false;
                alarmMenuButton.IsSelected = true;
                systemMenuButton.IsSelected = false;
            }
            else if (selectId == 4)
            else if (selectId == 3)
            {
                allMenuButton.IsSelected = false;
                shareMenuButton.IsSelected = false;
@@ -213,6 +211,8 @@
                systemMenuButton.IsSelected = true;

            }

            GetPushMessageList(showMesType);
        }


@@ -281,7 +281,6 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text = pushMessageInfo.createTime
            };
            rowView.AddChidren(btnDatetime);

@@ -299,15 +298,60 @@
            rowView.AddRightView(deleteBtn);
            deleteBtn.MouseUpEventHandler = (sender, e) =>
            {
                rowView.RemoveFromParent();
                DeleteThePush(pushMessageInfo, rowView);
            };


            btnDatetime.Text = Utlis.UnixToDateTime(pushMessageInfo.createTime).ToString("yyyy/MM/dd HH:mm:ss");
            //EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            //{
            //};

            //btnTilte.MouseUpEventHandler = eventHandler;
            //btnSubtitle.MouseUpEventHandler = eventHandler;
        }

        /// <summary>
        /// 删除推送消息
        /// <param name="pushMessageInfo"></param>
        /// <param name="rowView"></param>
        void DeleteThePush(PushMessageInfo pushMessageInfo, RowLayout rowView)
        {
            var waitPage = new Loading();
            waitPage.Start(Language.StringByID(StringId.PleaseWait));

            new Thread(() =>
            {
                try
                {
                    var result = new HttpServerRequest().PushSerivceDeleteMessage(pushMessageInfo.id);
                    if (result)
                    {
                        PushMessageInfoList.Remove(pushMessageInfo);
                        //删除成功
                        Application.RunOnMainThread(() =>
                        {
                            rowView.RemoveFromParent();
                        });

                    }
                }
                catch (Exception ex)
                {
                }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                    });
                }
            })
            { IsBackground = true }.Start();
        }

        /// <summary>
@@ -339,9 +383,10 @@
        }

        /// <summary>
        /// 
        /// 查询推送记录
        /// </summary>
        void GetPushMessageList()
        /// <param name="queryType"></param>
        void GetPushMessageList(int queryType = 0)
        {
            var waitPage = new Loading();
            waitPage.Start(Language.StringByID(StringId.PleaseWait));
@@ -352,7 +397,7 @@
            {
                try
                {
                    var result = new HttpServerRequest().PushSerivceGetPushmessagelist();
                    var result = new HttpServerRequest().PushSerivceGetPushmessagelist(queryType);
                    if (result.Code == StateCode.SUCCESS)
                    {
                        PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
@@ -401,10 +446,9 @@
        /// </summary>
        void ParseAndDisplayPushList()
        {
            //
            if (showMesType == 1)
            foreach (var info in PushMessageInfoList)
            {

                AddRowView(bodyScrolView, info);
            }
        }

@@ -418,21 +462,21 @@
            {
                messageTitle = "报警信息",
                messageContent = "门锁被打开",
                createTime = "11月30 10:50",
                createTime = 1606895454,
            });

            PushMessageInfoList.Add(new PushMessageInfo()
            {
                messageTitle = "报警信息1",
                messageContent = "门锁被打开",
                createTime = "11月30 11:50",
                createTime = 1606895454,
            });

            PushMessageInfoList.Add(new PushMessageInfo()
            {
                messageTitle = "报警信息2",
                messageContent = "门锁被打开",
                createTime = "11月30 12:50",
                createTime = 1606895454,
            });

            AddYearRowView(bodyScrolView, "2020年");
@@ -450,21 +494,30 @@
        #endregion
    }


    /// <summary>
    /// 推送消息类型
    ///  推送消息类型详情
    /// </summary>
    [System.Serializable]
    public class PushMessageInfo
    {
        /// <summary>
        /// 记录Id
        /// 记录id
        /// </summary>
        public string id;
        /// <summary>
        /// 是否已读
        /// 推送Token记录Id
        /// </summary>
        public bool isRead;
        public string pushId;
        /// <summary>
        /// 云端定义 推送类型；0：默认；1：报警；2：提示；3：新闻；4：推荐；
        ///
        /// Default：分享与功能；Alarm：报警类；Prompt：系统消息
        /// </summary>
        public int pushType;
        /// <summary>
        /// 消息主题
        /// </summary>
        public string messageTitle;
        /// <summary>
        /// 消息内容
        /// </summary>
@@ -474,26 +527,17 @@
        /// </summary>
        public string messageExpand;
        /// <summary>
        /// 消息主题
        /// </summary>
        public string messageTitle;
        /// <summary>
        /// 消息类型；0：提示；1：报警；2：丰林可是对讲呼叫；3：强制下线推送
        /// </summary>
        public string messageType;
        /// <summary>
        /// 推送Token记录Id
        /// 是否已读
        /// </summary>
        public string pushId;
        /// <summary>
        /// 推送类型；0：默认；1：报警；2：提示；3：新闻；4：推荐；
        /// </summary>
        public string pushType;
        public bool isRead;
        /// <summary>
        /// 推送时间
        /// </summary>
        public string createTime;

        public long createTime;
    }

}