From 8dabf6b3c19e2191f45b3d05530ecacc06371e10 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 22:01:56 +0800
Subject: [PATCH] 2020-12-22 1.成员分享数据增加场景分享。2.分享房间的操作去掉,改为由云端处理。3.查询分享,去掉指定设备查询,不传参数指定查询全部。

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/LogicView/FunAllAreaView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs
old mode 100644
new mode 100755
similarity index 91%
rename from HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/LogicView/FunAllAreaView.cs
rename to HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs
index 4381fa0..9f803da
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/LogicView/FunAllAreaView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs
@@ -17,8 +17,8 @@
         /// </summary>
         public Button btnIcon1 = new Button
         {
-            Width = Application.GetMinRealAverage(16),
-            Height = Application.GetMinRealAverage(16),
+            Width = Application.GetRealWidth(16),
+            Height = Application.GetRealWidth(16),
             Y = Application.GetRealHeight(19),
             X = Application.GetRealWidth(TextSize.left16),
             UnSelectedImagePath = "LogicIcon/down.png",
@@ -45,8 +45,8 @@
         /// </summary>
         public Button btnIcon2 = new Button
         {
-            Width = Application.GetMinRealAverage(16),
-            Height = Application.GetMinRealAverage(16),
+            Width = Application.GetRealWidth(16),
+            Height = Application.GetRealWidth(16),
             Y = Application.GetRealHeight(19),
             X = Application.GetRealWidth(122),
             UnSelectedImagePath = "LogicIcon/down.png",

--
Gitblit v1.8.0