From 796c8eef0f690d0d04e14db1ecd3d365ed604017 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 19:01:57 +0800
Subject: [PATCH] 2020-05-18-3
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 7936ae1..a974e90 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,37 +1,50 @@
-锘�<Properties StartupConfiguration="{7D463846-A275-4A2E-930F-B5EA7200CEAA}|Default">
- <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
- <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
+锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
+ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="121" Column="61" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1177" Column="22" />
- <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1375" Column="51" />
- <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="218" Column="37" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1088" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="744" Column="32" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="302" Column="76" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="547" Column="13" />
+ <File FileName="Shared/R.cs" Line="842" Column="55" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="806" Column="15" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="61" Column="23" />
+ <File FileName="Shared/Common/Logic.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="328" Column="30" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="836" Column="41" />
+ <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="67" Column="14" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="1088" Column="1" />
</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="Home.IOS" expanded="True">
<Node name="Resources" expanded="True" />
</Node>
<Node name="Shared" expanded="True">
<Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
- <Node name="Category" expanded="True" />
<Node name="Logic" expanded="True">
<Node name="DoorLockLogic" expanded="True" />
- <Node name="Send.cs" selected="True" />
+ <Node name="LogicView" expanded="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
- <Node name="CommonBase" expanded="True" />
- <Node name="DoorLock" expanded="True" />
- </Node>
- <Node name="ZigBee" expanded="True">
- <Node name="Device" expanded="True" />
+ <Node name="CommonBase" expanded="True">
+ <Node name="Controls" expanded="True">
+ <Node name="MessageControls" expanded="True" />
+ </Node>
+ </Node>
+ <Node name="DoorLock" expanded="True">
+ <Node name="DoorLockCommonInfo.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
@@ -40,10 +53,10 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <DisabledProjects>
- <String>DroidLib/DroidLib.csproj</String>
- </DisabledProjects>
+ <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
+ <MonoDevelop.Ide.DebuggingService.PinnedWatches>
+ <Watch file="../../../Shared/Phone/Device/Logic/SoneLogicList.cs" line="315" offsetX="-1" offsetY="-1" expression="timeLong" liveUpdate="False" />
+ </MonoDevelop.Ide.DebuggingService.PinnedWatches>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
--
Gitblit v1.8.0