合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -240,13 +240,11 @@
                dicTaskinfo = null;



                //获取状态的显示文本

                string statuText = HdlSafeguardLogic.Current.GetLightAlarmStatuText(listData);

                string statuText = HdlSafeguardLogic.Current.GetAdjustTargetStatuText(listData);

                this.FinishSelectEvent(statuText, listData);



                this.CloseForm();

            };

            //动画效果

            frameTransparent.Animate = Animate.DownToUp;

        }



        #endregion

@@ -256,10 +254,10 @@
        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseForm()

        public override void CloseFormBefore()

        {

            this.FinishSelectEvent = null;

            base.CloseForm();

            base.CloseFormBefore();

        }



        #endregion