陈嘉乐
2020-08-24 fcebedf4555b2d597668006ba21ed47630343da3
2020-08-24-2

打开GPS服务
4个文件已修改
43 ■■■■ 已修改文件
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,31 +1,30 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid AndroidDesignerPreferredTheme="MyTheme1" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench ActiveDocument="GateWay.Droid/Properties/AndroidManifest.xml">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/AddLogicPage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="477" Column="67" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1370" Column="10" />
      <File FileName="GateWay.Droid/Application.cs" Line="190" Column="52" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="159" Column="44" />
      <File FileName="Shared/Phone/Device/Logic/LogicDveiceStatus.cs" Line="544" Column="54" />
      <File FileName="Shared/Common/CommonPage.cs" Line="41" Column="45" />
      <File FileName="Shared/Phone/UserView/HomePage.cs" Line="38" Column="36" />
      <File FileName="Shared/Phone/UserView/UserPage.cs" Line="81" Column="14" />
      <File FileName="GateWay.Droid/Properties/AndroidManifest.xml" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1206" Column="57" />
      <File FileName="GateWay.Droid/Application.cs" Line="190" Column="53" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="159" Column="46" />
      <File FileName="Shared/Common/CommonPage.cs" Line="40" Column="44" />
      <File FileName="Shared/Phone/Device/Logic/LogicDveiceStatus.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Properties" expanded="True">
                <Node name="AndroidManifest.xml" selected="True" />
              </Node>
              <Node name="Properties" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True" />
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="AddLogicPage.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserView" expanded="True" />
              </Node>
            </Node>
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -19,8 +19,7 @@
        }
        public void Show()
        {
            #region  界面的布局代码
            TopView view = new TopView();
            this.AddChidren(view.TopRowView());
@@ -483,6 +482,7 @@
                    if (Send.It_Exist == "0")
                    {
                        //如果没有开启GPS服务,打开服务并且保存状态在本地;
                        //没有打开GPS服务,地理条件用不了;
                        Application.StartGPSLocationService();
                        Send.SaveLocalFile("GPS_File", "1");
                    }
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)
                            {
                                //如果没有开启GPS服务,打开服务并且保存状态在本地;
                                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;