From 0058d3fd5cf6052016ae744aeca2272623bfb6c8 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 17:49:52 +0800
Subject: [PATCH] 2019-10-28-2
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index bdd5d95..0d3ca2f 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,36 +2,33 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Common/ZigbeeColor.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="373" Column="71" />
- <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="207" Column="23" />
- <File FileName="Shared/Phone/Device/Category/Category.cs" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" />
- <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="199" Column="44" />
- <File FileName="Shared/Phone/Device/Logic/TemplateDeviceAction.cs" Line="211" Column="44" />
- <File FileName="Shared/Common/Room.cs" />
- <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1383" Column="62" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="668" Column="18" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="152" Column="62" />
+ <File FileName="Shared/Common/ZigbeeColor.cs" Line="286" Column="21" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="GateWay.Ios" expanded="True" />
+ <Node name="GateWay.Droid" expanded="True">
+ <Node name="Assets" expanded="True" />
+ </Node>
+ <Node name="GateWay.Ios" expanded="True">
+ <Node name="Resources" expanded="True" />
+ </Node>
<Node name="Shared" expanded="True">
- <Node name="Common" expanded="True" />
+ <Node name="Common" expanded="True">
+ <Node name="ZigbeeColor.cs" selected="True" />
+ </Node>
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
- <Node name="Category" expanded="True" />
<Node name="Logic" expanded="True">
- <Node name="TemplateDeviceCondition.cs" selected="True" />
+ <Node name="DoorLockLogic" expanded="True" />
</Node>
- <Node name="Room" expanded="True" />
</Node>
- <Node name="UserCenter" expanded="True">
- <Node name="Device" expanded="True" />
- </Node>
- <Node name="UserView" expanded="True" />
</Node>
</Node>
</Node>
@@ -40,6 +37,9 @@
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
+ <DisabledProjects>
+ <String>DroidLib/DroidLib.csproj</String>
+ </DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
--
Gitblit v1.8.0