From ee5f2543624a0e3ae9d046062b822727a31685e1 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy
---
HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index e2d1475..f67503e 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>
@@ -146,7 +146,7 @@
btnRoomName.Width = btnRoomName.GetRealWidthByText();
FrameWhiteCentet1.AddChidren(btnRoomName);
//鎴愬憳娌℃湁鏀惰棌鍔熻兘
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false && ShowColltionButton)
+ //if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false && ShowColltionButton)
{
var btnCollection = new IconViewControl(40);
btnCollection.X = Application.GetRealWidth(273);
--
Gitblit v1.8.0