From 19e762179bdc9efc23704bc471cf974ed282b43d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 31 三月 2021 17:42:30 +0800
Subject: [PATCH] 合并可视对讲代码
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 11ba9e7..b97ce74 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,46 +1,42 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.26569F89-0BA9-4C06-81F2-764A3AF2E1B7" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/LoginPage.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/ApiUtlis.cs">
<Files>
- <File FileName="HDL_ON/Common/R.cs" Line="1310" Column="45" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="386" Column="60" />
- <File FileName="HDL_ON/Entity/FunctionList.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="214" Column="44" />
<File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
<File FileName="../../Library/Containers/com.tencent.WeWorkMac/Data/Library/Application Support/WXWork/Data/1688852687634638/Cache/File/2021-03/DeviceTemperatureHistoryForm(1).cs" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs" Line="1" Column="1" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="488" Column="50" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="20" Column="16" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="498" Column="45" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="508" Column="1" />
<File FileName="HDL_ON/DAL/Server/IMessageCommon.cs" Line="213" Column="43" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="89" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs" Line="44" Column="1" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1824" Column="90" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="262" Column="14" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" Line="366" Column="55" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="284" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2244" Column="95" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="101" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="209" Column="22" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
+ <Node name="Common" expanded="True">
+ <Node name="ApiUtlis.cs" selected="True" />
+ </Node>
<Node name="DAL" expanded="True">
<Node name="Server" expanded="True" />
</Node>
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
- <Node name="UI0-Stan" expanded="True">
- <Node name="Form" expanded="True">
- <Node name="Base" expanded="True" />
- </Node>
- </Node>
- <Node name="UI1-Login" expanded="True">
- <Node name="LoginPage.cs" selected="True" />
- </Node>
+ <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="2-Classification" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="AddFunction" expanded="True" />
- </Node>
<Node name="FuntionControlView" expanded="True">
- <Node name="Electrical" expanded="True" />
+ <Node name="Video" expanded="True" />
</Node>
</Node>
</Node>
@@ -51,6 +47,11 @@
</Node>
</State>
</Pad>
+ <Pad Id="MonoDevelop.Debugger.WatchPad">
+ <State>
+ <Value>apiPath</Value>
+ </State>
+ </Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
@@ -59,10 +60,12 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/ApiUtlis.cs" relfile="HDL_ON/Common/ApiUtlis.cs" line="284" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0