From df7dd3e3f8830eceb615c59099631fc2a744b0ee Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 27 一月 2021 17:20:42 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index beebf1a..bbb3581 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,19 +1,19 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.94B44E9C-E1BC-4BF7-812E-FC71E9B623B2" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs">
<Files>
- <File FileName="HDL_ON/UI/1-test-/TestDialog.cs" Line="151" Column="4" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="175" Column="19" />
- <File FileName="HDL-ON_iOS/BlueWifi.cs" Line="124" Column="14" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="96" Column="54" />
- <File FileName="HdlBluWi/obj/Debug/ios/HdlBlufi/BlufiDelegate.g.cs" Line="270" Column="1" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="25" Column="55" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="212" Column="52" />
- <File FileName="HDL_ON/Common/R.cs" Line="308" Column="38" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs" Line="38" Column="61" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1052" Column="7" />
+ <File FileName="HDL_ON/Common/R.cs" Line="8" Column="51" />
+ <File FileName="HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs" Line="26" Column="28" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs" Line="70" Column="45" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="271" Column="31" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="89" Column="47" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="465" Column="23" />
+ <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1" Column="1" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="522" Column="82" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="264" Column="48" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs" Line="17" Column="10" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="264" Column="55" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -21,20 +21,35 @@
<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="Server" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
- <Node name="1-test-" expanded="True" />
+ <Node name="CSS" expanded="True" />
+ <Node name="UI0-Public" expanded="True">
+ <Node name="Widget" expanded="True" />
+ </Node>
<Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="SearchDevice" expanded="True">
- <Node name="SearchDevicePage.cs" selected="True" />
+ <Node name="1-HomePage" expanded="True" />
+ <Node name="2-Classification" expanded="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True">
+ <Node name="LogicView" expanded="True" />
</Node>
+ </Node>
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="AboutOn" expanded="True" />
+ <Node name="AddFunction" expanded="True" />
+ <Node name="PersonalCenterPageBLL.cs" selected="True" />
+ </Node>
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="AC" expanded="True" />
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="Other" expanded="True" />
<Node name="Resources" expanded="True" />
</Node>
</Node>
@@ -48,7 +63,7 @@
<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>
--
Gitblit v1.8.0