黄学彪
2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134
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();
@@ -233,7 +233,7 @@
        /// <param name="resObj"></param>
        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)//彩灯
            {
@@ -320,11 +320,11 @@
        #endregion
        #region ■ 界面重新激活事件___________________
        #region ■ 界面重新激活事件___________________
        /// <summary>
        /// 自身的上层界面关闭后,它自身处于最上层时,触发的事件
        /// </summary>
        /// </summary>
        public override int FormActionAgainEvent()
        {
            //重新刷新界面