From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 8c2ce4a..8ab081e 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,20 +1,18 @@
-锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c46595" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs">
+锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.822QECU5228FU" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs">
<Files>
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="545" Column="39" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" Line="524" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="42" Column="56" />
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/ErrorCode.cs" Line="69" Column="19" />
- <File FileName="ON/Properties/AndroidManifest.xml" />
- <File FileName="ON.Ios/Info.plist" />
- <File FileName="SmartHome/HDL/Operation/ResponseEntity/GetSensorPushHistory.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/R.cs" Line="368" Column="54" />
- <File FileName="ON.Ios/Resources/Language.ini" Line="213" Column="4" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" Line="867" Column="28" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="1" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs" Line="1" Column="1" />
+ <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" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -26,22 +24,20 @@
<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>
</Node>
- <Node name="IO" expanded="True" />
<Node name="Net" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="Alexa" expanded="True" />
- <Node name="DoorLock" expanded="True" />
- <Node name="Guide" expanded="True">
- <Node name="GuideAddResidence.cs" selected="True" />
+ <Node name="Register" expanded="True">
+ <Node name="AccountView.cs" selected="True" />
</Node>
- <Node name="Register" expanded="True" />
- <Node name="Schedule" expanded="True" />
<Node name="User" expanded="True" />
</Node>
</Node>
@@ -52,21 +48,18 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.DroidService PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.ItemProperties.DroidLib PreferredExecutionTarget="Android.SelectDevice" />
<DisabledProjects>
<String>Shared.Droid/Shared.Droid.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
+ <String>DroidLib/DroidLib.csproj</String>
+ <String>IosService/IosService.csproj</String>
+ <String>DroidService/DroidService.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.446FF651-C1E0-4C68-805D-F62274849738" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" relfile="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" line="375" column="1" />
- <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" relfile="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" line="507" column="1" />
- <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" relfile="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" line="463" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0