2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

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

@@ -119,7 +119,7 @@
            var btnStatu = row.frameTable.AddMostRightView("", 400);

            if (data.TaskList.Count > 0)

            {

                btnStatu.Text = HdlSafeguardLogic.Current.GetLightAlarmStatuText(data.TaskList);

                btnStatu.Text = HdlSafeguardLogic.Current.GetAdjustTargetStatuText(data.TaskList);

            }

            else

            {

@@ -134,7 +134,7 @@
                btnEditor.ButtonClickEvent += (sender, e) =>

                {

                    //编辑报警目标

                    this.EditorAlarmTarget(btnStatu, data);

                    this.EditorAlarmTarget(row, btnStatu, data);

                };

            }



@@ -231,7 +231,7 @@
        /// </summary>

        /// <param name="btnStatu"></param>

        /// <param name="resObj"></param>

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

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

        {

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

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

@@ -241,6 +241,8 @@
                form.AddForm(device, resObj.TaskList);

                form.FinishSelectEvent += (statuText, listInfo) =>

                {

                    //还原左右菜单

                    deviceRow?.HideMenu();

                    btnStatu.Text = statuText;

                    //保存编辑的报警目标

                    this.SaveEditorAlarmTarget(resObj, listInfo);

@@ -252,6 +254,8 @@
                form.AddForm(device, resObj.TaskList);

                form.FinishSelectEvent += (statuText, listInfo) =>

                {

                    //还原左右菜单

                    deviceRow?.HideMenu();

                    btnStatu.Text = statuText;

                    //保存编辑的报警目标

                    this.SaveEditorAlarmTarget(resObj, listInfo);

@@ -264,6 +268,8 @@
                form.AddForm(device, resObj.TaskList);

                form.FinishSelectEvent += (statuText, listInfo) =>

                {

                    //还原左右菜单

                    deviceRow?.HideMenu();

                    btnStatu.Text = statuText;

                    //保存编辑的报警目标

                    this.SaveEditorAlarmTarget(resObj, listInfo);