From 509e7b543f8a8770cf09dff97000acf78140c119 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 06 一月 2020 09:46:13 +0800
Subject: [PATCH] 2019、1、6
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 0c25828..599249b 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,39 +2,46 @@
<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/SelectFloor.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
<Files>
- <File FileName="Shared/R.cs" Line="2042" Column="35" />
+ <File FileName="Shared/R.cs" Line="872" Column="17" />
<File FileName="GateWay.Droid/Assets/Language.ini" />
- <File FileName="Shared/Phone/Device/Category/Category.cs" Line="470" Column="19" />
- <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" Line="1" Column="1" />
- <File FileName="Shared/Common/Device.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="823" Column="58" />
- <File FileName="Shared/Phone/Device/Room/RoomManagement.cs" Line="190" Column="15" />
- <File FileName="Shared/Phone/UserView/UserPage.cs" Line="278" Column="26" />
- <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs" Line="227" Column="95" />
- <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs" Line="187" Column="21" />
- <File FileName="Shared/Common/Room.cs" Line="346" Column="47" />
- <File FileName="Shared/Phone/Device/Category/SelectFloor.cs" Line="7" Column="18" />
+ <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/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" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
+ <Node name="GateWay.Droid" expanded="True" />
+ <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="Account" expanded="True" />
+ <Node name="AC" expanded="True" />
<Node name="Category" expanded="True">
- <Node name="SelectFloor.cs" selected="True" />
+ <Node name="Category.cs" selected="True" />
</Node>
<Node name="CommonForm" expanded="True" />
+ <Node name="Curtain" expanded="True" />
+ <Node name="Light" expanded="True" />
<Node name="Room" expanded="True" />
</Node>
<Node name="UserCenter" expanded="True">
+ <Node name="Abount" expanded="True" />
<Node name="CommonBase" expanded="True">
- <Node name="Logic" expanded="True" />
+ <Node name="Common" expanded="True" />
+ <Node name="Controls" expanded="True">
+ <Node name="MessageControls" expanded="True" />
+ </Node>
</Node>
</Node>
<Node name="UserView" expanded="True" />
--
Gitblit v1.8.0