合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

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

        private async System.Threading.Tasks.Task<bool> SetTickIsRead(string strId)

        {

            var pra = new { Id = strId };

            await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/TickIsRead", true, pra);

            return true;

            string strUrl = "ZigbeeUsers/TickIsRead?Id=" + strId;

            var result = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, Common.Config.Instance.Token, "GET");

            var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(Encoding.UTF8.GetString(result));

            //检测是否存在错误信息

            var falge = UserCenterLogic.CheckNotEorrorMsg(revertObj, "ZigbeeUsers/TickIsRead", null, null);

            return falge;

        }



        /// <summary>

@@ -335,9 +338,18 @@
        /// <param name="rowContr"></param>

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

        {

            var pra = new { Id = strId };

            var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/DeletePushMessage", true, pra);

            if (result == true && frameList != null)

            string strUrl = "ZigbeeUsers/DeletePushMessage?Id=" + strId;



            var result = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, Common.Config.Instance.Token, "GET");

            if (result == null)

            {

                return UserCenterLogic.CheckNotEorrorMsg(null, "ZigbeeUsers/DeletePushMessage", null, null);

            }

            var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(Encoding.UTF8.GetString(result));

            //检测是否存在错误信息

            var falge = UserCenterLogic.CheckNotEorrorMsg(revertObj, "ZigbeeUsers/DeletePushMessage", null, null);



            if (falge == true && frameList != null)

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

@@ -347,7 +359,7 @@
                    this.AdjustControlLocation(frameList, rowContr);

                });

            }

            return result;

            return falge;

        }



        /// <summary>