From aed247d7fa4499665041864479fae82089eafe5f Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 07 一月 2020 09:15:57 +0800
Subject: [PATCH] 2019.1.7

---
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 599249b..a78585f 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,49 +2,54 @@
   <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
   <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" 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/Device/Light/DimmableLightControl.cs">
     <Files>
-      <File FileName="Shared/R.cs" Line="872" Column="17" />
+      <File FileName="Shared/R.cs" Line="988" Column="13" />
       <File FileName="GateWay.Droid/Assets/Language.ini" />
-      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1841" Column="104" />
       <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
-      <File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" Line="343" Column="45" />
-      <File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" Line="95" Column="1" />
+      <File FileName="Shared/Phone/Device/Category/Category.cs" />
+      <File FileName="Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs" />
+      <File FileName="Shared/Phone/Device/CommonForm/SelectZone.cs" />
+      <File FileName="Shared/Phone/Device/Room/UnallocatedRoom.cs" />
+      <File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" />
       <File FileName="Shared/Common/Room.cs" />
-      <File FileName="Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs" Line="382" Column="41" />
-      <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs" Line="209" Column="46" />
-      <File FileName="Shared/Common/DeviceUI.cs" Line="1" Column="1" />
-      <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs" Line="278" Column="1" />
+      <File FileName="Shared/Common/DeviceUI.cs" />
+      <File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" />
+      <File FileName="Shared/Phone/Device/Room/EditRoom.cs" />
+      <File FileName="Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs" />
+      <File FileName="Shared/Phone/UserCenter/UserMain/UserInformationForm.cs" />
+      <File FileName="Shared/Phone/Device/Light/DimmableLightControl.cs" Line="530" Column="31" />
+      <File FileName="Shared/Phone/Device/Curtain/RollerShadeControl.cs" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="GateWay" expanded="True">
-            <Node name="GateWay.Droid" expanded="True" />
+            <Node name="GateWay.Droid" expanded="True">
+              <Node name="Assets" expanded="True" />
+            </Node>
             <Node name="Home.IOS" expanded="True" />
             <Node name="Shared" expanded="True">
               <Node name="Common" expanded="True" />
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
                   <Node name="AC" expanded="True" />
-                  <Node name="Category" expanded="True">
-                    <Node name="Category.cs" selected="True" />
-                  </Node>
+                  <Node name="Category" expanded="True" />
                   <Node name="CommonForm" expanded="True" />
                   <Node name="Curtain" expanded="True" />
-                  <Node name="Light" expanded="True" />
+                  <Node name="Light" expanded="True">
+                    <Node name="DimmableLightControl.cs" selected="True" />
+                  </Node>
                   <Node name="Room" expanded="True" />
                 </Node>
                 <Node name="UserCenter" expanded="True">
-                  <Node name="Abount" expanded="True" />
-                  <Node name="CommonBase" expanded="True">
-                    <Node name="Common" expanded="True" />
-                    <Node name="Controls" expanded="True">
-                      <Node name="MessageControls" expanded="True" />
-                    </Node>
-                  </Node>
+                  <Node name="Residence" expanded="True" />
+                  <Node name="UserMain" expanded="True" />
                 </Node>
                 <Node name="UserView" expanded="True" />
+                <Node name="ZigBee" expanded="True">
+                  <Node name="Device" expanded="True" />
+                </Node>
               </Node>
             </Node>
           </Node>

--
Gitblit v1.8.0