From ce2a26883e5dccaa0639cfdb4c4045ac7b5d9207 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 17:28:44 +0800
Subject: [PATCH] 2020-12-20 1.报警推送弹窗方案效果修改，点击查看跳转信息中心，实现避免重复弹窗。2.
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
old mode 100644
new mode 100755
index 3ebe052..01ae7e2
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -228,7 +228,12 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = function.collect
};
- bodyDiv.AddChidren(btnCollectionIcon);
+ //bodyDiv.AddChidren(btnCollectionIcon);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ bodyDiv.AddChidren(btnCollectionIcon);
+ }
}
/// <summary>
@@ -245,7 +250,7 @@
{
X = Application.GetRealWidth(14),
Y = Application.GetRealHeight(85),
- Width = Application.GetRealWidth(22),
+ Width = Application.GetRealWidth(30),
Height = Application.GetRealHeight(21),
Text = "0%",
TextAlignment = TextAlignment.CenterLeft,
@@ -277,7 +282,7 @@
{
X = Application.GetRealWidth(14 + 22+180),
Y = Application.GetRealHeight(85),
- Width = Application.GetRealWidth(35),
+ Width = Application.GetRealWidth(45),
Height = Application.GetRealHeight(21),
Text = "100%",
TextAlignment = TextAlignment.CenterLeft,
--
Gitblit v1.8.0