From 9f1d51429ec86d618bcdb75aee505a57ae94db30 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 09 十二月 2019 11:11:19 +0800
Subject: [PATCH] 2019.12.9

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

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 761e5f3..6a0d51b 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,33 +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/Room/EditRoom.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Common/Room.cs">
     <Files>
-      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="515" Column="62" />
-      <File FileName="Shared/Phone/Device/Category/Category.cs" />
-      <File FileName="Shared/Phone/Device/AC/ACControl.cs" />
-      <File FileName="Shared/Phone/ZigBee/Device/CommonDevice.cs" />
-      <File FileName="Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs" />
-      <File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" />
-      <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" />
-      <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" Line="919" Column="68" />
-      <File FileName="Shared/Phone/Device/CommonForm/RoomView.cs" Line="185" Column="49" />
-      <File FileName="Shared/Phone/Device/Room/EditRoom.cs" Line="210" Column="53" />
+      <File FileName="Shared/Common/CommonPage.cs" Line="163" Column="30" />
+      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="654" Column="51" />
+      <File FileName="Shared/R.cs" Line="667" Column="18" />
+      <File FileName="GateWay.Droid/Assets/Language.ini" Line="632" Column="18" />
+      <File FileName="Shared/Common/House.cs" Line="1" Column="1" />
+      <File FileName="Shared/Common/Room.cs" Line="647" Column="26" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="GateWay" expanded="True">
-            <Node name="DroidLib" expanded="True" />
-            <Node name="GateWay.Droid" 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="Room.cs" selected="True" />
+              </Node>
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
-                  <Node name="CommonForm" expanded="True" />
-                  <Node name="Room" expanded="True">
-                    <Node name="EditRoom.cs" selected="True" />
-                  </Node>
+                  <Node name="Account" expanded="True" />
+                  <Node name="Category" expanded="True" />
+                  <Node name="DeviceLogic" expanded="True" />
                 </Node>
+                <Node name="UserCenter" expanded="True">
+                  <Node name="CommonBase" expanded="True" />
+                </Node>
+                <Node name="UserView" expanded="True" />
               </Node>
             </Node>
           </Node>
@@ -37,6 +40,9 @@
     </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+  <DisabledProjects>
+    <String>Home.Ios/Home.IOS.csproj</String>
+  </DisabledProjects>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />

--
Gitblit v1.8.0