From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 55 ++++++++++++++++++++-----------------------------------
1 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index cbea63f..81abd25 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,51 +1,33 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
- <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
+ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
<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/UserView/UserPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/SelectFunctionView.cs">
<Files>
- <File FileName="Shared/R.cs" />
+ <File FileName="Shared/R.cs" Line="1364" Column="1" />
<File FileName="GateWay.Droid/Assets/Language.ini" />
- <File FileName="Shared/Phone/Device/Light/DimmableLightControl.cs" Line="410" Column="1" />
- <File FileName="Shared/Phone/Device/Category/Category.cs" Line="366" Column="68" />
- <File FileName="Shared/Phone/Device/AC/ACControl.cs" Line="243" Column="33" />
- <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs" Line="44" Column="78" />
- <File FileName="Shared/Common/CommonPage.cs" Line="60" Column="99" />
- <File FileName="Shared/Phone/UserView/UserPage.cs" Line="251" Column="30" />
+ <File FileName="Shared/Phone/Device/CommonForm/SelectedStatuButton.cs" />
+ <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs" />
+ <File FileName="Shared/Phone/Device/Room/UnallocatedRoom.cs" />
+ <File FileName="Shared/Common/Room.cs" />
+ <File FileName="Shared/Phone/Device/Room/RoomManagement.cs" />
+ <File FileName="Shared/Common/House.cs" />
+ <File FileName="Shared/Phone/ZigBee/Device/Scene.cs" />
+ <File FileName="Shared/Phone/Device/Category/Category.cs" />
+ <File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" />
+ <File FileName="Shared/Phone/Device/CommonForm/SelectFunctionView.cs" Line="138" Column="22" />
+ <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
</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 name="Phone" expanded="True" />
- </Node>
- </Node>
<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="CommonForm" expanded="True" />
- <Node name="DeviceLogic" 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="CommonForm" expanded="True">
+ <Node name="SelectFunctionView.cs" selected="True" />
</Node>
- </Node>
- <Node name="UserView" expanded="True">
- <Node name="UserPage.cs" selected="True" />
- </Node>
- <Node name="ZigBee" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="Device" expanded="True" />
</Node>
</Node>
</Node>
@@ -54,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