From 60fea1a35f8bfd2eb1399cae05d853b93b3674f9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 03 一月 2020 13:47:35 +0800
Subject: [PATCH] 2020-01-03 1.增加信mqtt网关设备类型支持。 2.住宅ID改为string类型。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 93c3098..a236f4a 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,28 +1,52 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.SelectDevice" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MainPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs">
<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/Room/UserRoom.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" />
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs" />
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="177" Column="45" />
- <File FileName="SmartHome/HDL/Operation/Control.cs" />
- <File FileName="../../../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS/Xamarin.iOS.Common.targets" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/Timer.cs" Line="20" Column="22" IsPinned="True" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="40" Column="57" IsPinned="True" />
+ <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="245" Column="72" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/SendJson.cs" Line="335" Column="29" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/Alexa.cs" Line="199" Column="22" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" Line="854" Column="23" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs" Line="466" Column="65" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/HomeListView.cs" Line="639" Column="61" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs" Line="576" Column="65" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" Line="314" Column="50" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" Line="103" Column="45" />
+ <File FileName="SmartHome/HDL/Operation/Utlis.cs" Line="39" Column="38" />
+ <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="73" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" Line="287" Column="73" />
+ <File FileName="SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs" Line="9" Column="22" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" Line="435" Column="72" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" 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="Operation" expanded="True">
+ <Node name="Device" 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="MainPage.cs" selected="True" />
+ <Node name="Phone" expanded="True">
+ <Node name="Alexa" expanded="True">
+ <Node name="AlexaDeviceListPage.cs" selected="True" />
+ </Node>
+ <Node name="DoorLock" expanded="True" />
+ <Node name="Guide" expanded="True" />
+ <Node name="Register" expanded="True" />
+ <Node name="Room" expanded="True" />
+ <Node name="Schedule" expanded="True" />
+ <Node name="System" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
@@ -31,7 +55,7 @@
</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>
@@ -39,9 +63,16 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
+ <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.254b82433419c7ca1850b1dfb524c79b7aeb0640" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/hdl/Desktop/APP/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs" relfile="SmartHome/UI/SimpleControl/MqttCommon.cs" line="106" column="1" />
+ <Breakpoint file="/Users/hdl/Desktop/APP/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs" relfile="SmartHome/UI/SimpleControl/MqttCommon.cs" line="221" column="1" />
+ <Breakpoint file="/Users/hdl/Desktop/APP/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs" relfile="SmartHome/UI/SimpleControl/MqttCommon.cs" line="343" column="1" />
+ <Breakpoint file="/Users/hdl/Desktop/APP/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" line="287" column="1" />
+ <Breakpoint file="/Users/hdl/Desktop/APP/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" relfile="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" line="306" column="1" />
+ <Breakpoint file="/Users/hdl/Desktop/APP/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" relfile="SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs" line="313" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0