From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index ca241c3..895f065 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,44 +1,38 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.56440ECD-0D65-4AAC-BE0E-D340F917B617" />
+ <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Light/LightControl.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Light/DimmableLightControl.cs">
<Files>
- <File FileName="GateWay.Droid/Assets/Language.ini" Line="617" Column="10" />
- <File FileName="Shared/R.cs" />
- <File FileName="Shared/Common/House.cs" />
- <File FileName="Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs" Line="253" Column="17" />
- <File FileName="Shared/Common/Room.cs" Line="561" Column="9" />
- <File FileName="Shared/Phone/Device/AC/ACControlBase.cs" Line="413" Column="34" />
- <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1031" Column="32" />
- <File FileName="Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs" Line="25" Column="29" />
- <File FileName="Shared/Phone/Device/Light/LightControl.cs" Line="155" Column="19" />
+ <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1234" Column="79" />
+ <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="2282" Column="81" />
+ <File FileName="Shared/Common/SceneUI.cs" Line="216" Column="1" />
+ <File FileName="Shared/Phone/Device/CommonForm/FunctionRow.cs" Line="62" Column="46" />
+ <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs" Line="121" Column="51" />
+ <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" Line="347" Column="56" />
+ <File FileName="Shared/Phone/Device/CommonForm/SceneTargetFunctionRow.cs" Line="116" Column="8" />
+ <File FileName="Shared/Common/DeviceUI.cs" Line="322" Column="27" />
+ <File FileName="Shared/Phone/Device/Light/DimmableLightControl.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
<Node name="GateWay.Droid" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="Item" expanded="True" />
- </Node>
- </Node>
+ <Node name="Assets" expanded="True" />
</Node>
<Node name="Shared" expanded="True">
<Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
- <Node name="AC" expanded="True" />
<Node name="Category" expanded="True" />
<Node name="CommonForm" expanded="True" />
<Node name="Light" expanded="True">
- <Node name="LightControl.cs" selected="True" />
+ <Node name="DimmableLightControl.cs" selected="True" />
</Node>
</Node>
- <Node name="UserCenter" expanded="True">
- <Node name="Residence" expanded="True" />
- </Node>
+ <Node name="UserCenter" expanded="True" />
+ <Node name="UserView" expanded="True" />
</Node>
</Node>
</Node>
@@ -49,7 +43,9 @@
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs" relfile="Shared/Phone/Device/Category/CategoryAddScene.cs" line="795" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0