From b9cb076fe6127160c96c35bf9c8cebcffe1d5ccd Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:35:23 +0800
Subject: [PATCH] 2020.1.10
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 599249b..37eb562 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,49 +2,33 @@
<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/AC/ACControl.cs">
<Files>
- <File FileName="Shared/R.cs" Line="872" Column="17" />
+ <File FileName="Shared/R.cs" Line="1364" Column="1" />
<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/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/Phone/Device/CommonForm/SceneCategoryView.cs" />
+ <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" />
+ <File FileName="Shared/Phone/Device/AC/ACControl.cs" Line="127" Column="9" />
+ <File FileName="Shared/Phone/ZigBee/Device/AC.cs" Line="98" Column="22" />
</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="AC" expanded="True" />
- <Node name="Category" expanded="True">
- <Node name="Category.cs" selected="True" />
+ <Node name="AC" expanded="True">
+ <Node name="ACControl.cs" selected="True" />
</Node>
- <Node name="CommonForm" expanded="True" />
+ <Node name="Category" 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="Common" expanded="True" />
- <Node name="Controls" expanded="True">
- <Node name="MessageControls" expanded="True" />
- </Node>
- </Node>
</Node>
<Node name="UserView" expanded="True" />
+ <Node name="ZigBee" expanded="True">
+ <Node name="Device" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
@@ -52,8 +36,11 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.F39298B7-E473-472E-A80F-B0125726C55D" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
+ <DisabledProjects>
+ <String>Home.Ios/Home.IOS.csproj</String>
+ <String>Elian.iOS/Elian.iOS.csproj</String>
+ </DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
--
Gitblit v1.8.0