From 315e336680efe5c654726c2cdae630146fe5c99c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 29 十一月 2019 10:06:19 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 97a234a..e594d9a 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,26 +1,31 @@
-锘�<Properties StartupConfiguration="{7D463846-A275-4A2E-930F-B5EA7200CEAA}|Default">
- <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
+锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
+ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.a8099274022ed2dc56ddf73bdd3a308ad9575ec5" />
- <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs">
+ <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.5c86e4357d63" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.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="Shared/Phone/ZigBee/Device/BindObj.cs" Line="316" Column="9" />
+ <File FileName="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs" Line="597" Column="63" />
+ <File FileName="Shared/Phone/UserCenter/Device/Bind/BindInfo.cs" Line="92" Column="64" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="119" Column="63" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
+ <Node name="GateWay.Droid" expanded="True" />
<Node name="Shared" 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 name="VerticalListControl.cs" selected="True" />
- </Node>
+ <Node name="CommonBase" expanded="True" />
+ <Node name="Device" expanded="True">
+ <Node name="Bind" expanded="True">
+ <Node name="BindTargetsPage.cs" selected="True" />
</Node>
</Node>
+ <Node name="DoorLock" expanded="True" />
+ </Node>
+ <Node name="ZigBee" expanded="True">
<Node name="Device" expanded="True" />
</Node>
</Node>
--
Gitblit v1.8.0