From df237b08cf97c27a2526b8f523f852f298a8b9b1 Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期一, 01 六月 2020 09:30:47 +0800
Subject: [PATCH] 0000
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 4801e5f..811b236 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,9 +1,14 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
+<<<<<<< HEAD
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.2400788643044815020f" />
+=======
+ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
<MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.0F3EFA59-22A1-4A3A-A991-0B8D4D01A5D5" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
<MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundContentForDevice.cs">
<Files>
+<<<<<<< HEAD
<File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundControlForm.cs" Line="170" Column="72" />
<File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundControlContentForm.cs" Line="29" Column="22" />
<File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundContentForDevice.cs" Line="113" Column="70" />
@@ -12,6 +17,15 @@
<File FileName="Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs" Line="50" Column="16" />
<File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs" Line="75" Column="31" />
<File FileName="Shared/Phone/CommonForm/EditorCommonForm.cs" Line="363" Column="48" />
+=======
+ <File FileName="Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs" Line="142" Column="57" IsPinned="True" />
+ <File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundControlForm.cs" IsPinned="True" />
+ <File FileName="Shared/Phone/UserCenter/Device/DeviceListMainForm.cs" />
+ <File FileName="Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs" />
+ <File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs" Line="98" Column="57" />
+ <File FileName="Shared/Phone/UserCenter/UserMain/UserMainForm.cs" />
+ <File FileName="Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs" />
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -31,6 +45,7 @@
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True" />
</Node>
+<<<<<<< HEAD
<Node name="Login" expanded="True" />
<Node name="UserCenter" expanded="True">
<Node name="Abount" expanded="True" />
@@ -50,17 +65,34 @@
</Node>
<Node name="Logic" expanded="True" />
<Node name="Resourse" expanded="True" />
+=======
+ <Node name="Device" expanded="True">
+ <Node name="Logic" expanded="True" />
+ </Node>
+ <Node name="MainPage" expanded="True" />
+ <Node name="UserCenter" expanded="True">
+ <Node name="CommonBase" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="Form" expanded="True" />
+ <Node name="Logic" expanded="True" />
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
</Node>
<Node name="Device" expanded="True">
<Node name="AirConditioner" expanded="True" />
<Node name="Bind" expanded="True" />
<Node name="DoorLock" expanded="True" />
</Node>
+<<<<<<< HEAD
<Node name="Gateway" expanded="True">
<Node name="Manage" expanded="True" />
</Node>
<Node name="OtherParty" expanded="True" />
<Node name="SharedContent" expanded="True" />
+=======
+ <Node name="Member" expanded="True" />
+ <Node name="OtherParty" expanded="True" />
+ <Node name="Residence" expanded="True" />
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
<Node name="SmartSound" expanded="True">
<Node name="Forms" expanded="True">
<Node name="SmartSoundContentForDevice.cs" selected="True" />
@@ -81,7 +113,10 @@
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/lss/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs" relfile="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs" line="77" column="1" />
+ <Breakpoint file="/Users/lss/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs" relfile="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs" line="117" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0