From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 九月 2020 09:46:29 +0800
Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，Alexa 的场景同样增加通用开关的支持。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index da460e1..55400ea 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -2,22 +2,25 @@
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs" Line="16" Column="36" IsPinned="True" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingInfraredModule.cs" Line="5" Column="2" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" Line="254" Column="46" />
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="146" Column="20" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" Line="2409" Column="1" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs" Line="172" Column="78" />
- <File FileName="SmartHome/HDL/Operation/Device/Common.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Alexa/AlexaDeviceListPage.cs" Line="750" Column="41" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Droid" expanded="True" selected="True">
- <Node name="Assets" expanded="True" />
- <Node name="Properties" expanded="True" />
- <Node name="Resources" expanded="True" />
+ <Node name="ON.Droid" selected="True" />
+ <Node name="ON.Ios" expanded="True">
+ <Node name="Resources" expanded="True">
+ <Node name="Base.lproj" expanded="True" />
+ <Node name="en.lproj" expanded="True" />
+ <Node name="InfraredCode" expanded="True" />
+ <Node name="InfraredType" expanded="True" />
+ <Node name="js" expanded="True" />
+ <Node name="MJRefresh.bundle" expanded="True" />
+ <Node name="PGDatePicker.bundle" expanded="True" />
+ <Node name="theme" expanded="True" />
+ <Node name="zh-Hans.lproj" expanded="True" />
+ </Node>
</Node>
<Node name="Shared" expanded="True">
<Node name="HDL" expanded="True">
@@ -26,18 +29,17 @@
<Node name="ResponseEntity" expanded="True" />
</Node>
</Node>
- <Node name="IO" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
+ <Node name="AC" expanded="True" />
<Node name="Alexa" expanded="True" />
- <Node name="Curtain" expanded="True" />
- <Node name="Guide" expanded="True" />
- <Node name="Music" expanded="True" />
- <Node name="Panel" expanded="True" />
- <Node name="Register" expanded="True" />
+ <Node name="DoorLock" expanded="True" />
+ <Node name="Light" expanded="True" />
<Node name="Room" expanded="True" />
<Node name="Scene" expanded="True" />
+ <Node name="TV" expanded="True" />
+ <Node name="UniversalDevice" expanded="True" />
</Node>
</Node>
</Node>
@@ -57,7 +59,10 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
<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/Phone/Scene/SceneMethod.cs" relfile="SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs" line="359" 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="691" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0