合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs

@@ -233,7 +233,7 @@
        /// <param name="resObj"></param>

        private void EditorAlarmTarget(DeviceRoomControl deviceRow, NormalViewControl btnStatu, Safeguard.CatActionResponseObj resObj)

        {

            var device = HdlDeviceCommonLogic.Current.GetDevice(resObj.DeviceAddr, resObj.Epoint);

            var device = Common.LocalDevice.Current.GetDevice(resObj.DeviceAddr, resObj.Epoint);

            if (device.Type == DeviceType.DimmableLight//调光器

                || device.Type == DeviceType.ColorDimmableLight)//彩灯

            {