From fcebedf4555b2d597668006ba21ed47630343da3 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 24 八月 2020 14:37:07 +0800 Subject: [PATCH] 2020-08-24-2 --- ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs index 4d6893e..3f0ea28 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs @@ -537,14 +537,18 @@ alert.ConfirmClickEvent += () => { Common.Logic.CurrentLogic.Conditions.Remove(conditions); + selecteddevice.selecetdFrameLayout.RemoveFromParent(); + var exist = Common.Logic.CurrentLogic.Conditions.Find((obj) => obj["Type"] == "7"); if (exist == null) { - //濡傛灉娌℃湁寮�鍚疓PS鏈嶅姟,鎵撳紑鏈嶅姟骞朵笖淇濆瓨鐘舵�佸湪鏈湴锛� - Application.StopGPSLocationService(); - Send.SaveLocalFile("GPS_File", "0"); + //濡傛灉鎵句笉鍒板湴鐞嗕綅缃綔涓烘潯浠剁殑璇�,鍏抽棴GPS鏈嶅姟(鍑忓皯鑰楃數) + if (Send.It_Exist == "1") + { + Application.StopGPSLocationService(); + Send.SaveLocalFile("GPS_File", "0"); + } } - selecteddevice.selecetdFrameLayout.RemoveFromParent(); //var logicCommunalPage = new LogicCommunalPage(); //UserView.HomePage.Instance.AddChidren(logicCommunalPage); //UserView.HomePage.Instance.PageIndex += 1; -- Gitblit v1.8.0