From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs
index 4464584..afbb668 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs
+++ b/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

--
Gitblit v1.8.0