From 8413f493d6e527c3f71cf704c6b22212e94a6c60 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 24 十二月 2020 16:00:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 09f1f6d..068cdb4 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,32 +1,37 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="369" Column="69" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="75" Column="27" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="235" Column="61" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" Line="831" Column="54" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="352" Column="65" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="81" Column="8" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="599" Column="53" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="404" Column="64" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="164" Column="57" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="147" Column="33" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="549" Column="30" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="641" Column="12" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="24" Column="1" />
</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="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI1-Login" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="FuntionControlView" expanded="True">
- <Node name="EnvironmentalScience" expanded="True">
- <Node name="EnvironmentalSensorPage.cs" selected="True" />
- </Node>
- </Node>
- </Node>
- </Node>
+ <Node name="HDL-ON_Android" selected="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
+ </State>
+ </Pad>
+ <Pad Id="MonoDevelop.Debugger.WatchPad">
+ <State>
+ <Value>light.RedColor</Value>
+ <Value>light.GreenColor</Value>
+ <Value>light.BlueColor</Value>
+ <Value>e2[0]</Value>
+ <Value>e2[1]</Value>
+ <Value>e2[2]</Value>
+ <Value>deviceList</Value>
</State>
</Pad>
</Pads>
@@ -37,13 +42,13 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmebly.cs" relfile="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" line="730" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" line="315" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="288" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="90" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Light.cs" relfile="HDL_ON/Entity/Function/Light.cs" line="180" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0