From ee888ab45a850245b1e1372375ba9040316086ab Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 30 四月 2020 18:05:34 +0800
Subject: [PATCH] 2020-04-30
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 34c29ec..0cb68fd 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,12 +1,21 @@
锘�<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/MemberList.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="64" Column="10" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="721" Column="7" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="327" Column="62" />
- <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="19" Column="22" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="8" Column="43" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs" Line="442" Column="18" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs" Line="483" Column="19" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="28" Column="26" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="214" Column="45" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="161" Column="45" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="834" Column="50" />
+ <File FileName="Shared/R.cs" Line="559" Column="23" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="119" Column="23" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="608" Column="22" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" Line="138" Column="60" />
+ <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="42" Column="41" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -19,13 +28,29 @@
<Node name="Resources" expanded="True" />
</Node>
<Node name="Shared" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
- <Node name="Category" expanded="True" />
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="DoorLockLogic" expanded="True" />
- <Node name="MemberList.cs" selected="True" />
+ <Node name="LogicView" expanded="True" />
+ <Node name="SoneLogicList.cs" selected="True" />
</Node>
+ </Node>
+ <Node name="UserCenter" expanded="True">
+ <Node name="CommonBase" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="Controls" expanded="True">
+ <Node name="BaseCommonControl" expanded="True">
+ <Node name="Base" expanded="True" />
+ </Node>
+ <Node name="MessageControls" expanded="True" />
+ <Node name="NormalControls" expanded="True" />
+ </Node>
+ </Node>
+ <Node name="DoorLock" expanded="True" />
+ </Node>
+ <Node name="ZigBee" expanded="True">
+ <Node name="Device" expanded="True" />
</Node>
</Node>
</Node>
@@ -34,11 +59,9 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.9992EB40-E6DD-48F4-AFED-CEB5E811ACDD" />
- <MonoDevelop.Ide.DebuggingService.PinnedWatches>
- <Watch file="../../../Shared/Phone/Device/Logic/Method.cs" line="779" offsetX="-1" offsetY="-1" expression="Phone" liveUpdate="False" />
- </MonoDevelop.Ide.DebuggingService.PinnedWatches>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
+ <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
+ <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0