新代码

xm

2020-07-20 b02e8275a21dc06bf54b66273485d44e007a2616

 ZigbeeApp/Shared/Common/Device.cs

old mode 100644
new mode 100755
@@ -896,22 +896,6 @@
        }



        /// <summary>

        /// 检测设备是否拥有一键同步功能

        /// </summary>

        /// <param name="device"></param>

        /// <returns></returns>

        public bool DeviceIsCanSynchronization(CommonDevice device)

        {

            //获取设备类型的

            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)

            {

                return true;

            }

            return false;

        }



        /// <summary>

        /// 检测设备是否拥有开关的功能(输出簇)

        /// </summary>

        /// <param name="device"></param>

@@ -2541,20 +2525,6 @@
            {

                //新风的湿度传感器不显示

                return false;

            }

            //如果是新风面板或环境面板,则都不显示任何回路
            var myInfoTypeTemp = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
            if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir || myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
            {
                return false;
            }
            else if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
            {
                if (i_device.Type != DeviceType.OnOffOutput)
                {
                    return false;
                }
            }



            //如果是新风面板或环境面板,则都不显示任何回路