From 7ded9bc93b6beb5d7311ed4d013f90c521f85b5e Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 24 八月 2020 11:47:24 +0800 Subject: [PATCH] 2020.08.24.1 --- ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs index b7f5439..5e267b2 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs @@ -7,6 +7,7 @@ using ZigBee.Device; using Shared.Phone.Device.Logic.LogicView; + namespace Shared.Phone.Device.Logic { @@ -19,7 +20,7 @@ public void Show() { - + #region 鐣岄潰鐨勫竷灞�浠g爜 TopView view = new TopView(); this.AddChidren(view.TopRowView()); @@ -74,6 +75,7 @@ UserView.HomePage.Instance.PageIndex += 1; roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic; roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate)); + }; securityView.clickviewBtn.MouseUpEventHandler += (sender, e) => { @@ -477,13 +479,22 @@ accounts.Add("Latitude", latitudW.ToString()); accounts.Add("Longitude", longitudeH.ToString()); accounts.Add("Radius", mRadius.ToString()); + + if (Send.It_Exist == "0") + { + //濡傛灉娌℃湁寮�鍚疓PS鏈嶅姟,鎵撳紑鏈嶅姟骞朵笖淇濆瓨鐘舵�佸湪鏈湴锛� + Application.StartGPSLocationService(); + Send.SaveLocalFile("GPS_File", "1"); + } + LogicIfon.Addaccounts(accounts); LogicIfon.AddLocationconditions(LocationConditionsInfo); + var logicCommunalPage = new LogicCommunalPage(); UserView.HomePage.Instance.AddChidren(logicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); - }, strname, true, latitude, longitude, r); + }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r); }; } @@ -492,6 +503,7 @@ /// </summary> void TimeView() { + UserView.HomePage.Instance.ScrollEnabled = false; Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>(); #region ------鐣岄潰甯冨眬閮ㄥ垎 @@ -573,6 +585,7 @@ }; } + } } -- Gitblit v1.8.0