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 |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 0cb68fd..a974e90 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,21 +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/SoneLogicList.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs">
     <Files>
-      <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" />
+      <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">
@@ -32,25 +32,19 @@
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
                   <Node name="Logic" expanded="True">
+                    <Node name="DoorLockLogic" expanded="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 name="DoorLock" expanded="True">
+                    <Node name="DoorLockCommonInfo.cs" selected="True" />
+                  </Node>
                 </Node>
               </Node>
             </Node>
@@ -60,7 +54,9 @@
     </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+  <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