From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25

---
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index cb3761e..e903987 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,15 +2,20 @@
   <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/RoomButton.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/RoomMainView.cs">
     <Files>
       <File FileName="Shared/R.cs" Line="2042" Column="35" />
       <File FileName="GateWay.Droid/Assets/Language.ini" />
-      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1702" Column="41" />
-      <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" Line="314" Column="36" />
-      <File FileName="Shared/Common/Device.cs" Line="1587" Column="23" />
+      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1617" Column="112" />
+      <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" Line="198" Column="1" />
+      <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" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
@@ -23,11 +28,9 @@
               <Node name="Common" expanded="True" />
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
-                  <Node name="Category" expanded="True" />
                   <Node name="CommonForm" expanded="True">
-                    <Node name="RoomButton.cs" selected="True" />
+                    <Node name="RoomMainView.cs" selected="True" />
                   </Node>
-                  <Node name="Curtain" expanded="True" />
                   <Node name="Room" expanded="True" />
                 </Node>
                 <Node name="UserCenter" expanded="True">

--
Gitblit v1.8.0