新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -28,14 +28,14 @@
        /// <summary>

        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        /// <param name="i_zoonID">防区ID</param>
        public void ShowForm(int i_zoonID)
        /// <param name="i_zoonID">防区ID</param>

        public void ShowForm(int i_zoonID)

        {

            this.zoonID = i_zoonID;



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAlarmTargetSettion));

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAlarmTargetSettion));



            //添加图标

            var btnAdd = new MostRightIconControl(69, 69);

            btnAdd.UnSelectedImagePath = "Item/Add.png";

@@ -45,16 +45,16 @@
            {

                var form = new AlarmTargetAddMenuForm();

                form.AddForm(this.zoonID);

            };

            //初始化中部信息
            this.InitMiddleFrame();
        }

        /// <summary>
        /// 初始化中部信息
        /// </summary>
        private void InitMiddleFrame()
            };



            //初始化中部信息

            this.InitMiddleFrame();

        }



        /// <summary>

        /// 初始化中部信息

        /// </summary>

        private void InitMiddleFrame()

        {

            //清空bodyFrame

            this.ClearBodyFrame();

@@ -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,9 +231,9 @@
        /// </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);

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

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

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

            {

@@ -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);

@@ -314,11 +320,11 @@


        #endregion



        #region ■ 界面重新激活事件___________________
        #region ■ 界面重新激活事件___________________



        /// <summary>

        /// 自身的上层界面关闭后,它自身处于最上层时,触发的事件

        /// </summary>
        /// </summary>

        public override int FormActionAgainEvent()

        {

            //重新刷新界面