From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 3d34f22..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()
{
@@ -331,7 +335,8 @@
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView(tv, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(tv, actionRefresh);
+ DriverLayer.Control.Ins.SendReadCommand(tv);
}
@@ -342,6 +347,7 @@
FrameLayout dialogView = new FrameLayout()
{
+ AnimateSpeed = 0.3f,
Animate = Animate.DownToUp,
};
dialog.AddChidren(dialogView);
--
Gitblit v1.8.0