From 6b7a07bcbe147be7ed64994c40bcc5b0a2042aae Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:23:35 +0800
Subject: [PATCH] 代码合并-温居城
---
HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index e2d1475..3608632 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -55,14 +55,14 @@
/// </summary>
public NormalFrameLayout FrameWhiteCentet2 = null;
- /// <summary>
- /// 鏄惁鏄剧ず鏀惰棌鎸夐挳
+ /// <summary>
+ /// 鏄惁鏄剧ず鏀惰棌鎸夐挳
/// </summary>
public bool ShowColltionButton = true;
#endregion
-
+
#region 鈻� 鍒濆鍖朹____________________________
-
+
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
@@ -145,8 +145,7 @@
btnRoomName.Text = device.GetRoomListName();
btnRoomName.Width = btnRoomName.GetRealWidthByText();
FrameWhiteCentet1.AddChidren(btnRoomName);
- //鎴愬憳娌℃湁鏀惰棌鍔熻兘
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false && ShowColltionButton)
+ if (ShowColltionButton)
{
var btnCollection = new IconViewControl(40);
btnCollection.X = Application.GetRealWidth(273);
@@ -313,7 +312,7 @@
topFrameLayout.AddChidren(btnSetting);
//濡傛灉鏄垚鍛樻病鏈夊姛鑳�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
{
btnSetting.Visible = false;
}
--
Gitblit v1.8.0