From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 8361ea9..9c61396 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -134,7 +134,12 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = aC.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
arcBar = new DiyArcSeekBar()
{
@@ -265,7 +270,8 @@
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView,aC.name).LoadTopView_FunctionTop(aC, actionRefresh);
+ new TopViewDiv(bodyView,Language.StringByID(StringId.AC)).LoadTopView_FunctionTop(aC, actionRefresh);
+ DriverLayer.Control.Ins.SendReadCommand(aC);
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
--
Gitblit v1.8.0