From 48948f5f0ecf57de037feb04d03db5554fe7c821 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 06 六月 2021 16:16:02 +0800
Subject: [PATCH] 2021-6-6-3
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 69 +++++++---------------------------
1 files changed, 15 insertions(+), 54 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f15acea..95ed532 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,70 +1,35 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
-<<<<<<< Updated upstream
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.94B44E9C-E1BC-4BF7-812E-FC71E9B623B2" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs">
<Files>
- <File FileName="HDL_ON/UI/MainPage.cs" Line="166" Column="36" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="148" Column="23" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="284" Column="7" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/Entity/UserInfo.cs" Line="97" Column="25" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" Line="1" Column="1" />
-=======
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/UserInfo.cs">
- <Files>
- <File FileName="HDL_ON/UI/MainPage.cs" Line="137" Column="10" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="148" Column="23" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="281" Column="7" />
- <File FileName="HDL_ON/Common/DB_AccountList.cs" Line="22" Column="44" />
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="104" Column="33" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/Entity/UserInfo.cs" Line="90" Column="19" />
->>>>>>> Stashed changes
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="41" Column="68" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="93" Column="28" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="618" Column="19" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="203" Column="61" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="155" Column="18" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="229" Column="40" />
</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="DAL" expanded="True">
-<<<<<<< Updated upstream
- <Node name="DriverLayer" expanded="True" />
-=======
->>>>>>> Stashed changes
<Node name="Server" expanded="True" />
</Node>
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- <Node name="UserInfo.cs" selected="True" />
- </Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
<Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
<Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True">
- <Node name="NewSceneMenuListPage.cs" selected="True" />
- </Node>
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True">
- <Node name="AddRoom" expanded="True" />
- </Node>
- <Node name="UnlockSetting" expanded="True" />
+ <Node name="Automation" expanded="True" />
</Node>
<Node name="FuntionControlView" expanded="True">
- <Node name="EnvironmentalScience" expanded="True" />
+ <Node name="Video" expanded="True">
+ <Node name="VideoMainView.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True" />
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
@@ -78,13 +43,9 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Function.cs" relfile="HDL_ON/Entity/Function/Function.cs" line="292" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" line="449" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" line="526" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0