From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
index cb25261..bd4329d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
+++ b/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>
--
Gitblit v1.8.0