From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 01 九月 2020 15:33:13 +0800 Subject: [PATCH] 上传一个版本 --- ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs index 7f76b73..62ce91a 100755 --- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs @@ -901,6 +901,60 @@ UserView.HomePage.Instance.RemoveViewByTag("Logic");//绉婚櫎鎵�鏈夋爣璁癓ogic鐣岄潰 if (LogicView.IfString._Logic == if_logic) { + + //鏌ヨ-褰撳墠閫昏緫-鏄惁娣诲姞鍦扮悊浣嶇疆浣滀负鏉′欢 + var exist = Common.Logic.CurrentLogic.Conditions.Find((obj) => obj["Type"] == "7"); + if (exist==null) + { + bool if_type = false; + //鏌ヨ-閫昏緫鍒楄〃-鏄惁娣诲姞杩囧湴鐞嗕綅缃綔涓烘潯浠� + for (int a = 0; a < Common.Logic.LogicList.Count; a++) + { + var logic = Common.Logic.LogicList[a]; + var exist_logic = logic.Conditions.Find((obj) => obj["Type"] == "7"); + if (exist_logic != null) + { + //鏄惁瀛樺湪鍦扮悊浣嶇疆鏉′欢 + if_type = true; + //閫�鍑篺or寰幆 + break; + } + } + if (if_type) + { + //鏌ヨ涔嬪墠鐘舵�佹槸鍚﹀凡缁忓紑鍚疓PS鏈嶅姟(浠ユ湰鍦板瓨鍌ㄧ姸鎬佷负涓� 0:娌″紑鍚�; 1锛氬紑鍚�) + if (Send.If_Exist == "0") + { + //寮�鍚疓PS鏈嶅姟 + Application.StartGPSLocationService(); + //淇濆瓨GPS鏈嶅姟寮�鍚姸鎬� + Send.SaveLocalFile(Config.Instance.HomeId + "_GPS_File", "1"); + } + + } + else + { + //濡傛灉鎵句笉鍒板湴鐞嗕綅缃綔涓烘潯浠剁殑璇�,鍏抽棴GPS鏈嶅姟(鍑忓皯鑰楃數) + if (Send.If_Exist == "1") + { + //鍏抽棴GPS鏈嶅姟 + Application.StopGPSLocationService(); + //淇濆瓨GPS鏈嶅姟鍏抽棴鐘舵�� + Send.SaveLocalFile(Config.Instance.HomeId + "_GPS_File", "0"); + } + } + } + else + { + //鏌ヨ涔嬪墠鐘舵�佹槸鍚﹀凡缁忓紑鍚疓PS鏈嶅姟(浠ユ湰鍦板瓨鍌ㄧ姸鎬佷负涓� 0:娌″紑鍚�; 1锛氬紑鍚�) + if (Send.If_Exist == "0") + { + //寮�鍚疓PS鏈嶅姟 + Application.StartGPSLocationService(); + //淇濆瓨GPS鏈嶅姟寮�鍚姸鎬� + Send.SaveLocalFile(Config.Instance.HomeId + "_GPS_File", "1"); + } + } //鍙埛鏂板垎绫�-鑷姩鍖栦笂涓嬫粦鍔╲iew锛� Phone.Category.CategoryMainForm.instance?.RefreshBodyView(); // Category.Category.instance?.RefreshBodyView(); @@ -944,5 +998,8 @@ /// 鐣岄潰楂樺害 /// </summary> public static int H = 1922; + + + } } -- Gitblit v1.8.0