From 159ec8ae413683e1ce134ec204d1c0b4d175baec Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 15:55:32 +0800
Subject: [PATCH] 2019.11.14

---
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml |   42 ++++++++++++++++++------------------------
 1 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index a69e926..cc67a2d 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,43 +1,37 @@
-锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
+锘�<Properties StartupConfiguration="{7D463846-A275-4A2E-930F-B5EA7200CEAA}|Default">
   <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
   <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
   <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs">
     <Files>
-      <File FileName="Shared/R.cs" Line="1091" Column="23" />
+      <File FileName="Shared/R.cs" Line="5228" Column="52" />
       <File FileName="GateWay.Droid/Assets/Language.ini" />
-      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="406" Column="43" />
+      <File FileName="Shared/Phone/Device/Category/Category.cs" />
       <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
-      <File FileName="Shared/Phone/Device/Curtain/RollerShadeControl.cs" />
+      <File FileName="Shared/Phone/Device/Room/EditRoom.cs" />
+      <File FileName="Shared/Common/Room.cs" />
+      <File FileName="Shared/Phone/Device/AC/ACControl.cs" Line="535" Column="1" />
+      <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="2201" Column="2" />
+      <File FileName="Shared/Phone/UserCenter/Gateway/Manage/GatewayUploadAndDownLoadForm.cs" Line="67" Column="77" />
+      <File FileName="Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs" Line="68" Column="81" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="GateWay" expanded="True">
-            <Node name="GateWay.Droid" expanded="True">
-              <Node name="Assets" expanded="True">
-                <Node name="Phone" expanded="True">
-                  <Node name="AC" expanded="True" />
-                </Node>
-              </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="DLL" expanded="True" />
               <Node name="Phone" expanded="True">
-                <Node name="Device" expanded="True">
-                  <Node name="AC" expanded="True" />
-                  <Node name="Account" expanded="True" />
-                  <Node name="AirSwitch" expanded="True" />
-                  <Node name="Category" expanded="True">
-                    <Node name="Category.cs" selected="True" />
+                <Node name="UserCenter" expanded="True">
+                  <Node name="Gateway" expanded="True">
+                    <Node name="Manage" expanded="True">
+                      <Node name="GatewayGeneralInformationForm.cs" selected="True" />
+                    </Node>
                   </Node>
-                  <Node name="CommonForm" expanded="True" />
-                  <Node name="Curtain" expanded="True" />
-                  <Node name="Light" expanded="True" />
-                </Node>
-                <Node name="UserView" expanded="True" />
-                <Node name="ZigBee" expanded="True">
-                  <Node name="Device" expanded="True" />
                 </Node>
               </Node>
             </Node>

--
Gitblit v1.8.0