合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs

@@ -68,10 +68,10 @@
        /// <summary>

        /// 初始化中部信息

        /// </summary>

        private async void InitMiddleData(bool showReload)

        private void InitMiddleData(bool showReload)

        {

            //获取数据

            var dicData = await this.GetMessageData();

            var dicData = this.GetMessageData();

            if (dicData == null)

            {

                if (showReload == true)

@@ -157,7 +157,7 @@
                            framBack.Name = dateIndex.ToString();

                            framBack.Height = Application.GetRealHeight(100);

                            framBack.BackgroundColor = UserCenterColor.Current.White;

                            listView.AddChidrenFrame(framBack);

                            listView.AddChidren(framBack);



                            //日期

                            string strMonth = Language.StringByID(R.MyInternationalizationString.Month);

@@ -279,14 +279,14 @@
            var btnMsg = rowControl.frameTable.AddMostRightView(recordInfo.listMsg[msgIndex], 600, 60);

            btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnMsg.Y = Application.GetRealHeight(5) + rowControl.frameTable.chidrenYaxis;

            rowControl.frameTable.AddChidren(btnMsg, ChidrenBindMode.BindEventOnly);

            rowControl.frameTable.AddChidren(btnMsg, ChidrenBindMode.BindEvent);

            //时间

            var btnTime = rowControl.frameTable.AddMostRightView("", 200, 50);

            btnTime.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnTime.Y = btnMsg.Bottom + Application.GetRealHeight(12);

            var convertTime = UserCenterLogic.ConvertUtcTimeToLocalTime(recordInfo.CreatedOnUtc);

            btnTime.Text = convertTime.ToString("HH：mm");

            rowControl.frameTable.AddChidren(btnTime, ChidrenBindMode.BindEventOnly);

            rowControl.frameTable.AddChidren(btnTime, ChidrenBindMode.BindEvent);

            //底线

            if (addLine == true)

            {

@@ -312,7 +312,7 @@
                btnNewTip.UnSelectedImagePath = "Item/NewVersion.png";

                btnNewTip.Y = Application.GetRealHeight(9) + rowControl.frameTable.chidrenYaxis;

                btnNewTip.X = btnMsgObject.Right + Application.GetRealWidth(10);

                rowControl.frameTable.AddChidren(btnNewTip, ChidrenBindMode.BindEventOnly);

                rowControl.frameTable.AddChidren(btnNewTip, ChidrenBindMode.BindEvent);

            }



            //主要主人和管理员能够删除

@@ -324,9 +324,9 @@
                {

                    //确认删除消息?

                    string msg = Language.StringByID(R.MyInternationalizationString.uDeleteMessageMsg);

                    this.ShowMassage(ShowMsgType.Confirm, msg, async () =>

                    this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                    {

                        await this.DeleteMsg(recordInfo.Id, frameList, rowControl);

                        this.DeleteMsg(recordInfo.Id, frameList, rowControl);

                    });

                };

            }

@@ -348,7 +348,7 @@
                if (sender != null)

                {

                    //标记已读(不管它成功不成功)

                    await this.SetTickIsRead(recordInfo.Id);

                    this.SetTickIsRead(recordInfo.Id);

                }

            };

        }

@@ -361,12 +361,12 @@
        /// 标记已读

        /// </summary>

        /// <param name="strId"></param>

        private async Task<bool> SetTickIsRead(string strId)

        private bool SetTickIsRead(string strId)

        {

            var pra = new MessageReadStatuPra();

            pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

            pra.Id = strId;

            var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagMessageMessageCenterItem", true, pra);

            var result = UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagMessageMessageCenterItem", true, pra);

            return result;

        }



@@ -382,7 +382,7 @@
            //确认标记全部消息为已读?

            this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uUnTipAllMessageMsg), () =>

            {

                HdlThreadLogic.Current.RunThread(async () =>

                HdlThreadLogic.Current.RunThread(() =>

                {

                    //打开进度条

                    this.ShowProgressBar();

@@ -390,7 +390,7 @@
                    var pra = new MessageReadStatuPra();

                    pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

                    pra.TagAllOrClearType = 0;

                    var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);

                    var result = UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);

                    //关闭进度条

                    this.CloseProgressBar();

                    if (result == false)

@@ -420,12 +420,12 @@
        /// <param name="strId"></param>

        /// <param name="frameList"></param>

        /// <param name="rowContr"></param>

        private async Task<bool> DeleteMsg(string strId, FrameListControl frameList, RowLayoutControl rowContr)

        private bool DeleteMsg(string strId, FrameListControl frameList, RowLayoutControl rowContr)

        {

            var pra = new MessageReadStatuPra();

            pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

            pra.Id = strId;

            var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/DelMessageCenterItem", true, pra);

            var result = UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/DelMessageCenterItem", true, pra);

            if (result == false)

            {

                return false;

@@ -457,7 +457,7 @@
            //确认删除全部消息?

            this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteAllMessageMsg), () =>

            {

                HdlThreadLogic.Current.RunThread(async () =>

                HdlThreadLogic.Current.RunThread(() =>

                {

                    //打开进度条

                    this.ShowProgressBar();

@@ -465,7 +465,7 @@
                    var pra = new MessageReadStatuPra();

                    pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

                    pra.TagAllOrClearType = 1;

                    var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);

                    var result = UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);

                    if (result == false)

                    {

                        //关闭进度条

@@ -552,7 +552,7 @@
        /// 获取消息记录

        /// </summary>

        /// <returns></returns>

        private async Task<Dictionary<string, List<List<MessageRecordInfo>>>> GetMessageData()

        private Dictionary<string, List<List<MessageRecordInfo>>> GetMessageData()

        {

            this.dicAllRow = new Dictionary<string, RowLayoutControl>();

            var allListData = new List<MessageRecordInfo>();

@@ -562,7 +562,7 @@


            //传感器上报

            pra.Topic = "/IASInfoReport";

            var dataInfo = await this.GetMessageDataFromDb(pra);

            var dataInfo = this.GetMessageDataFromDb(pra);

            if (dataInfo == null)

            {

                return null;

@@ -571,7 +571,7 @@


            //门锁上报

            pra.Topic = "/Alarms/SendAlarmInform";

            dataInfo = await this.GetMessageDataFromDb(pra);

            dataInfo = this.GetMessageDataFromDb(pra);

            if (dataInfo == null)

            {

                return null;

@@ -580,7 +580,7 @@


            //撤防

            pra.Topic = "/Security/WithdrawMode_Respon";

            dataInfo = await this.GetMessageDataFromDb(pra);

            dataInfo = this.GetMessageDataFromDb(pra);

            if (dataInfo == null)

            {

                return null;

@@ -589,7 +589,7 @@


            //布防

            pra.Topic = "/Security/EnableMode_Respon";

            dataInfo = await this.GetMessageDataFromDb(pra);

            dataInfo = this.GetMessageDataFromDb(pra);

            if (dataInfo == null)

            {

                return null;

@@ -598,7 +598,7 @@


            //逻辑触发上报

            pra.Topic = "/Logic/Execute_Respon";

            dataInfo = await this.GetMessageDataFromDb(pra);

            dataInfo = this.GetMessageDataFromDb(pra);

            if (dataInfo == null)

            {

                return null;

@@ -607,7 +607,7 @@


            //场景触发上报

            pra.Topic = "/Scene/Exec_Respon";

            dataInfo = await this.GetMessageDataFromDb(pra);

            dataInfo = this.GetMessageDataFromDb(pra);

            if (dataInfo == null)

            {

                return null;

@@ -623,10 +623,10 @@
        /// </summary>

        /// <param name="pra"></param>

        /// <returns></returns>

        private async Task<List<MessageRecordInfo>> GetMessageDataFromDb(MessageInfoPra pra)

        private List<MessageRecordInfo> GetMessageDataFromDb(MessageInfoPra pra)

        {

            var result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra);

            if (result == null)

            var result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra);

            if (string.IsNullOrEmpty(result) == true)

            {

                return null;

            }

@@ -768,7 +768,8 @@
            {

                recordInfo.IconPath = "Device/Sensor.png";

                //消息类型:传感器

                recordInfo.MsgObjectText = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId1200);

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A402");

                recordInfo.MsgObjectText = infoContent != null ? infoContent.A官方名字 : string.Empty;

            }

            else

            {

@@ -826,7 +827,8 @@
            {

                recordInfo.IconPath = "Device/IntelligentLocks.png";

                //消息类型:智能门锁

                recordInfo.MsgObjectText = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);

                var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A405");

                recordInfo.MsgObjectText = infoContent != null ? infoContent.A官方名字 : string.Empty;

            }

            else

            {

@@ -964,7 +966,8 @@
        /// </summary>

        public override void CloseFormBefore()

        {

            if (UserCenterResourse.DicActionForm.ContainsKey("UserMainForm") == false)

            var userPageForm = UserView.UserPage.Instance.GetNowActionForm();

            if (userPageForm != null && userPageForm.FormID == "UserMainForm")

            {

                Common.CommonPage.Instance.IsDrawerLockMode = false;

            }