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/FuntionControlView/Electrical/TVPage.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
old mode 100644
new mode 100755
index 5b65089..737c59b
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -111,10 +111,14 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = tv.collection
+ IsSelected = tv.collect
};
- controlView.AddChidren(btnCollection);
-
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
btnChangeTVAV = new Button()
{
@@ -332,6 +336,7 @@
LoadEventList();
new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(tv, actionRefresh);
+ DriverLayer.Control.Ins.SendReadCommand(tv);
}
--
Gitblit v1.8.0