From 0a29eff6a0db2015622d682497fa868b637a115b Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 30 十二月 2019 14:10:10 +0800
Subject: [PATCH] 2019.12.30

---
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml |   35 ++++++++++++-----------------------
 1 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index e903987..c920a19 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,47 +2,36 @@
   <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/CommonForm/RoomMainView.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/SceneMainView.cs">
     <Files>
-      <File FileName="Shared/R.cs" Line="2042" Column="35" />
+      <File FileName="Shared/R.cs" Line="809" Column="16" />
       <File FileName="GateWay.Droid/Assets/Language.ini" />
-      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1617" Column="112" />
+      <File FileName="Shared/Phone/Device/Category/Category.cs" />
       <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" />
       <File FileName="Shared/Common/Device.cs" />
-      <File FileName="Shared/Phone/Device/CommonForm/RoomButton.cs" Line="7" Column="15" />
-      <File FileName="Shared/Phone/Device/Category/SelectScene.cs" />
-      <File FileName="Shared/Common/DeviceUI.cs" Line="468" Column="99" />
-      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="699" Column="35" />
-      <File FileName="Shared/Phone/Device/CommonForm/RoomView.cs" Line="260" Column="21" />
-      <File FileName="Shared/Phone/Device/Room/RoomManagement.cs" Line="173" Column="45" />
-      <File FileName="Shared/Phone/Device/CommonForm/RoomMainView.cs" Line="30" Column="16" />
+      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1083" Column="68" />
+      <File FileName="Shared/Phone/Device/Light/LightControl.cs" />
+      <File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" />
+      <File FileName="Shared/Phone/Device/CommonForm/FunctionMainView.cs" Line="162" Column="28" />
+      <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" Line="1" Column="1" />
     </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>
             <Node name="Shared" expanded="True">
               <Node name="Common" expanded="True" />
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
                   <Node name="CommonForm" expanded="True">
-                    <Node name="RoomMainView.cs" selected="True" />
+                    <Node name="SceneMainView.cs" selected="True" />
                   </Node>
+                  <Node name="DeviceLogic" expanded="True" />
+                  <Node name="Light" expanded="True" />
                   <Node name="Room" expanded="True" />
                 </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="ClickButtonControls" expanded="True" />
-                    </Node>
-                  </Node>
+                  <Node name="Residence" expanded="True" />
                 </Node>
                 <Node name="UserView" expanded="True" />
               </Node>

--
Gitblit v1.8.0