From 616849c27dc296060981bd71f7f19459b47825dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 七月 2021 14:57:19 +0800
Subject: [PATCH] 代码合并整理2
---
HDL_ON/DAL/Server/NewAPI.cs | 2 +-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 44 +++++++++-----------------------------------
HDL_ON/HDL_ON.projitems | 1 -
3 files changed, 10 insertions(+), 37 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 224fa0f..cbb1f16 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,53 +1,27 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs">
<Files>
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1193" Column="45" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
- <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" />
- <File FileName="HDL_ON/Entity/Enumerative/Command.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneCatchFunctionListPage.cs" />
- <File FileName="HDL_ON/Entity/Function/Scene.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="566" Column="15" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs" Line="13" Column="10" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="5" Column="18" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2286" Column="63" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs" Line="19" Column="29" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
- <Node name="HDL_APP_Project" expanded="True">
+ <Node name="HDL_APP_Project" expanded="True" selected="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True">
- <Node name="LogicView" expanded="True">
- <Node name="TopView.cs" selected="True" />
- </Node>
- </Node>
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="AddDevice" expanded="True">
- <Node name="MiniRemoteControl" expanded="True" />
- </Node>
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Energy" expanded="True" />
+ <Node name="Automation" expanded="True" />
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 1377465..4be919c 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -616,7 +616,7 @@
public const string API_POST_VideoDevice_UpdateCallStatus = "/home-wisdom/platform/imou/updateCallStatus";
#endregion
-
+ #region 鍙瀵硅鏍囧噯閫氱敤鎺ュ彛
/// <summary>
/// 鍒ゆ柇闂ㄩ攣鏄惁绗竴浣跨敤
/// </summary>
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 7f0ab9d..73160f0 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -207,7 +207,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\SetPir.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\BrandList.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\EditControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\Method.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\AddControlComplete.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\AddButton.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\BrandListView.cs" />
--
Gitblit v1.8.0