合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs

@@ -37,6 +37,10 @@
            /// 空调目标
            /// </summary>
            AC = 5,
            /// <summary>
            /// 地暖目标
            /// </summary>
            Fh = 6,
        }

        #endregion
@@ -725,12 +729,8 @@
        {
            bool result = true;
            //获取设备类型的
            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
            {
                result = false;
            }
            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)
            var clu = device.OutClusterList.Find((obj) => obj.OutCluster == 514);
            if (clu != null)
            {
                result = false;
            }