From e13a9980ce617db1394a76944186c5d5bd595d5d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 六月 2021 14:37:12 +0800
Subject: [PATCH] 5月需求bug修复
---
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 9407e12..1ff1ef2 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -141,7 +141,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);
@@ -259,10 +259,10 @@
private void AddTopSettingIcon(Button btnHigherDeviceName, Button btnHigherRoom)
{
//濡傛灉鏄垚鍛樻病鏈夊姛鑳�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
- {
- return;
- }
+ //if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
+ //{
+ // return;
+ //}
//璁剧疆鍥炬爣
var btnSetting = new PicViewControl(28, 28);
btnSetting.X = Application.GetRealWidth(337);
--
Gitblit v1.8.0