请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 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