From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
old mode 100755
new mode 100644
index fd3c277..b202963
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
@@ -14,6 +14,7 @@
/// </summary>
public MessageManagementControl()
{
+
this.Height = Application.GetMinRealAverage(69);
this.Width = Application.GetMinRealAverage(69);
this.UnSelectedImagePath = "Item/MessageManagement.png";
@@ -75,6 +76,11 @@
{
if (dataInfo.PageData[i].IsReading == false)
{
+ if (dataInfo.PageData[i].Topic == "/DoorLock/DoorLockOperatingEventNotificationCommand")
+ {
+ //鏆傛椂涓嶅鐞嗚繖涓富棰�
+ continue;
+ }
ControlCommonResourse.HadNewMessage = true;
Application.RunOnMainThread(() =>
{
@@ -93,7 +99,7 @@
public override void RemoveFromParent()
{
ControlCommonResourse.listMessageManaContr.Remove(this);
-
+
base.RemoveFromParent();
}
}
--
Gitblit v1.8.0