From 2ebaff33420cabdf1c9c2937343185ae4b5ff985 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 08 五月 2020 17:37:27 +0800
Subject: [PATCH] 2020-05-08-1

---
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index ee6fd98..8b3b296 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,19 +1,18 @@
 锘�<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/R.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SkipView.cs">
     <Files>
-      <File FileName="Shared/Phone/Category/SelectFloorForm.cs" Line="168" Column="1" IsPinned="True" />
-      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="21" Column="24" />
-      <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="271" Column="15" />
-      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="148" Column="118" />
-      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="22" Column="12" />
-      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1055" Column="70" />
-      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1" Column="1" />
-      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="41" Column="36" />
-      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="100" Column="22" />
-      <File FileName="GateWay.Droid/Assets/Language.ini" Line="549" Column="1" />
-      <File FileName="Shared/R.cs" Line="127" Column="64" />
+      <File FileName="Shared/Phone/Category/SelectFloorForm.cs" Line="149" Column="1" IsPinned="True" />
+      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="24" Column="23" />
+      <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="99" Column="61" />
+      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="24" Column="21" />
+      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" />
+      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1066" Column="15" />
+      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1265" Column="28" />
+      <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="190" Column="43" />
+      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="658" Column="10" />
+      <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="58" Column="13" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
@@ -32,12 +31,16 @@
                 <Node name="Device" expanded="True">
                   <Node name="Logic" expanded="True">
                     <Node name="LogicView" expanded="True" />
+                    <Node name="SkipView.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>
                   </Node>
@@ -45,10 +48,10 @@
                   <Node name="Residence" expanded="True" />
                 </Node>
                 <Node name="ZigBee" expanded="True">
+                  <Node name="Common" expanded="True" />
                   <Node name="Device" expanded="True" />
                 </Node>
               </Node>
-              <Node name="R.cs" selected="True" />
             </Node>
           </Node>
         </State>

--
Gitblit v1.8.0