From 49add64d7f25448baa06ac5a9ebbeac0a3ae97e0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 13 一月 2020 13:50:29 +0800
Subject: [PATCH] Version 2.50113 1.优化更新。 2.第一次引导或者添加住宅，默认添加2个房间。编辑住宅不处理。 3.设备名超过20字节限制。 4.修复编辑住宅名字重复不提示问题。 5.优化添加住宅逻辑。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index f48312e..562a2b5 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,63 +1,58 @@
锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.364c4b3158493098" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MqttCommon.cs">
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="ON.Ios/Info.plist" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Curtain/UserCurtainPage.cs" />
- <File FileName="Shared.IOS/UI/PickerView.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs" />
- <File FileName="SmartHome/HDL/Operation/Control.cs" />
- <File FileName="../../../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS/Xamarin.iOS.Common.targets" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="273" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="190" Column="87" />
+ <File FileName="ON/Properties/AndroidManifest.xml" />
+ <File FileName="ON/Properties/AssemblyInfo.cs" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Droid" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Phone2" expanded="True">
- <Node name="CrabtreeAdd" expanded="True" />
- </Node>
- </Node>
- <Node name="Libs" expanded="True" />
+ <Node name="ON.Droid" expanded="True" selected="True">
+ <Node name="Properties" expanded="True" />
</Node>
<Node name="Shared" expanded="True">
+ <Node name="HDL" expanded="True">
+ <Node name="Operation" expanded="True">
+ <Node name="Device" expanded="True" />
+ <Node name="ResponseEntity" expanded="True" />
+ </Node>
+ </Node>
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
+ <Node name="Alexa" expanded="True" />
+ <Node name="Curtain" expanded="True" />
+ <Node name="Guide" expanded="True" />
+ <Node name="Light" expanded="True" />
<Node name="Register" expanded="True" />
<Node name="Room" expanded="True" />
+ <Node name="Schedule" expanded="True" />
<Node name="User" expanded="True" />
</Node>
- <Node name="MqttCommon.cs" selected="True" />
</Node>
</Node>
</Node>
</Node>
</State>
</Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>methodType</Value>
- <Value>url</Value>
- </State>
- </Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.DroidService PreferredExecutionTarget="Android.SelectDevice" />
+ <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>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.766EA50A-EED6-45E2-A98E-7499EA9344CC" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs" relfile="SmartHome/UI/SimpleControl/MqttCommon.cs" line="316" column="12" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs" relfile="SmartHome/UI/SimpleControl/MqttCommon.cs" line="305" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0