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/AddLogicPage.cs | 4 ++--
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 27 +++++++++++++--------------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 12 ++++++++----
4 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index a5cc122..d68aa0e 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/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>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index ba0ace7..c339db0 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 5e267b2..4deb7fc 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/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")
{
//濡傛灉娌℃湁寮�鍚疓PS鏈嶅姟,鎵撳紑鏈嶅姟骞朵笖淇濆瓨鐘舵�佸湪鏈湴锛�
+ //娌℃湁鎵撳紑GPS鏈嶅姟,鍦扮悊鏉′欢鐢ㄤ笉浜嗭紱
Application.StartGPSLocationService();
Send.SaveLocalFile("GPS_File", "1");
}
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