From 375751523a86b9ba0b3a27f04c3d3c4f19538690 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 03 三月 2021 09:35:00 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 8ab081e..f1d4a46 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,43 +1,26 @@
-锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
+锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.822QECU5228FU" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/HDL/Common/HDLLinkUtlis.cs">
<Files>
- <File FileName="SmartHome/HDL/Operation/UserConfig.cs" Line="200" Column="39" IsPinned="True" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="453" Column="65" />
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="77" Column="10" />
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/API.cs" Line="60" Column="60" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/SubaccountListView.cs" Line="15" Column="35" />
- <File FileName="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" Line="568" Column="57" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="415" Column="32" />
- <File FileName="SmartHome/UI/SimpleControl/R.cs" Line="246" Column="55" />
- <File FileName="ON.Ios/Resources/Language.ini" Line="333" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="324" Column="46" />
+ <File FileName="SmartHome/HDL/Common/HDLLinkUtlis.cs" Line="125" Column="21" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Ios" expanded="True">
- <Node name="Resources" expanded="True" />
- </Node>
+ <Node name="ON.Droid" expanded="True" />
+ <Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
- <Node name="DLL" expanded="True" />
<Node name="HDL" expanded="True">
<Node name="Common" expanded="True">
<Node name="HttpUtil" expanded="True" />
- </Node>
- <Node name="Operation" expanded="True">
- <Node name="ResponseEntity" expanded="True" />
+ <Node name="HDLLinkUtlis.cs" selected="True" />
</Node>
</Node>
- <Node name="Net" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Register" expanded="True">
- <Node name="AccountView.cs" selected="True" />
- </Node>
<Node name="User" expanded="True" />
</Node>
</Node>
@@ -57,7 +40,7 @@
<String>DroidService/DroidService.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0