From 5d6626e390f7bccbbfbc0df1e95f8fb86a53af58 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 18:25:47 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
index 3d34f22..50ba14e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -111,7 +111,7 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = tv.collection
+ IsSelected = tv.collect
};
controlView.AddChidren(btnCollection);
@@ -331,7 +331,7 @@
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView(tv, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(tv, actionRefresh);
}
@@ -342,6 +342,7 @@
FrameLayout dialogView = new FrameLayout()
{
+ AnimateSpeed = 0.3f,
Animate = Animate.DownToUp,
};
dialog.AddChidren(dialogView);
--
Gitblit v1.8.0