From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
index 7a129f1..b071030 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
+++ b/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锛歮m");
- 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;
}
--
Gitblit v1.8.0