From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index cb6edff..e6e122d 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,40 +1,35 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.26569F89-0BA9-4C06-81F2-764A3AF2E1B7" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Application.cs">
<Files>
- <File FileName="HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs" Line="66" Column="22" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="203" Column="92" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="165" Column="14" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs" Line="145" Column="60" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="29" Column="16" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="210" Column="58" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs" Line="106" Column="51" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs" Line="242" Column="1" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="309" Column="33" />
- <File FileName="HDL_ON/Common/OnAppConfig.cs" Line="94" Column="9" />
- <File FileName="HDL_ON/Common/UserInfo.cs" Line="155" Column="23" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" Line="121" Column="42" />
- <File FileName="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" Line="36" Column="30" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs" Line="38" Column="21" />
+ <File FileName="HDL_ON/UI/UI0-Public/TopViewDiv.cs" Line="151" Column="14" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" />
+ <File FileName="HDL_ON/Common/FileUtlis.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="176" Column="1" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" />
+ <File FileName="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" Line="8" Column="31" />
+ <File FileName="HDL-ON_Android/Application.cs" Line="329" Column="58" />
</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" />
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
<Node name="UI0-Public" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="UnlockSetting" expanded="True">
- <Node name="AppUnlockPasswordPage.cs" selected="True" />
- </Node>
- </Node>
- </Node>
</Node>
+ </Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Application.cs" selected="True" />
</Node>
<Node name="HDL-ON_iOS" expanded="True" />
</Node>
@@ -48,12 +43,13 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
<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/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" line="822" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0