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 | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index d8f37f7..e594d9a 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,24 +1,42 @@
锘�<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.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
- <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs">
+ <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.a8099274022ed2dc56ddf73bdd3a308ad9575ec5" />
+ <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.5c86e4357d63" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs">
<Files>
- <File FileName="Shared/Phone/UserCenter/Common/IMessageCommon.cs" Line="56" Column="78" />
- <File FileName="Shared/R.cs" />
- <File FileName="Shared/Common/Device.cs" />
- <File FileName="GateWay.Ios/AppDelegate.cs" />
- <File FileName="Shared/Common/ZigbeeColor.cs" />
- <File FileName="Shared/Phone/ZigBee/Common/Config.cs" />
- <File FileName="Shared/Phone/UserCenter/HdlBackup/HdlAutoBackUpForm.cs" />
- <File FileName="Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs" Line="1" Column="1" />
+ <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="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>
+ </Node>
+ </Node>
+ </State>
+ </Pad>
+ </Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <DisabledProjects>
- <String>Shared.Droid/Shared.Droid.csproj</String>
- </DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0