From 6b7a07bcbe147be7ed64994c40bcc5b0a2042aae Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:23:35 +0800
Subject: [PATCH] 代码合并-温居城
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 39fadc2..d28de8c 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,6 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs">
<Files>
<File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="15" Column="35" />
<File FileName="HDL_ON/Common/HDLCommon.cs" />
@@ -10,28 +10,41 @@
<File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" Line="11" Column="27" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="14" Column="78" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="87" Column="59" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="946" Column="53" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="406" Column="26" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="148" Column="49" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs" Line="341" Column="13" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs" Line="309" 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="DAL" expanded="True">
- <Node name="Mqtt" expanded="True" />
+ <Node name="Entity" expanded="True">
+ <Node name="Function" expanded="True" />
</Node>
- <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
- <Node name="BindingResidence" expanded="True" />
+ <Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True" />
+ <Node name="1-HomePage" expanded="True" />
+ <Node name="2-Classification" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Electrical" expanded="True">
+ <Node name="PjtPage.cs" selected="True" />
+ </Node>
</Node>
- <Node name="4-PersonalCenter" expanded="True" />
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True" selected="True" />
- <Node name="HDL-ON_iOS" expanded="True" />
+ <Node name="HDL-ON_Android" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
+ </Node>
</Node>
</State>
</Pad>
@@ -43,7 +56,7 @@
<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="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
--
Gitblit v1.8.0