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 | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 55d9783..895f065 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,13 +1,18 @@
锘�<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/R.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Light/DimmableLightControl.cs">
<Files>
- <File FileName="Shared/Phone/UserCenter/Device/DeviceListMainForm.cs" Line="404" Column="20" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs" Line="16" Column="23" />
- <File FileName="GateWay.Droid/Assets/Language.ini" Line="1253" Column="1" />
- <File FileName="Shared/R.cs" Line="3441" Column="1" />
+ <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">
@@ -17,17 +22,18 @@
<Node name="Assets" expanded="True" />
</Node>
<Node name="Shared" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
- <Node name="UserCenter" expanded="True">
- <Node name="CommonBase" expanded="True">
- <Node name="Controls" expanded="True">
- <Node name="ListViewLayoutControls" expanded="True" />
- </Node>
+ <Node name="Device" expanded="True">
+ <Node name="Category" expanded="True" />
+ <Node name="CommonForm" expanded="True" />
+ <Node name="Light" expanded="True">
+ <Node name="DimmableLightControl.cs" selected="True" />
</Node>
- <Node name="Device" expanded="True" />
</Node>
+ <Node name="UserCenter" expanded="True" />
+ <Node name="UserView" expanded="True" />
</Node>
- <Node name="R.cs" selected="True" />
</Node>
</Node>
</State>
@@ -35,9 +41,11 @@
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
+ <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