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, 22 insertions(+), 33 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 47ebb82..81abd25 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,46 +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/Device/Room/EditRoom.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/SelectFunctionView.cs">
<Files>
- <File FileName="Shared/Phone/Device/CommonForm/CommonFormResouce.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
- <File FileName="Shared/Phone/Device/Category/Category.cs" />
- <File FileName="Shared/Phone/Device/AC/ACControl.cs" />
- <File FileName="Shared/Phone/ZigBee/Device/AC.cs" />
+ <File FileName="Shared/R.cs" Line="1364" Column="1" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" />
+ <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/Phone/Device/Category/CategoryAddScene.cs" />
- <File FileName="Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs" />
- <File FileName="Shared/Phone/Device/Room/EditRoom.cs" Line="508" Column="28" />
+ <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="DroidLib" expanded="True" />
- <Node name="GateWay.Droid" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="Device" expanded="True" />
- <Node name="RoomIcon" expanded="True" />
- <Node name="SceneIcon" expanded="True" />
- </Node>
- </Node>
- </Node>
<Node name="Shared" expanded="True">
- <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="Room" expanded="True">
- <Node name="EditRoom.cs" selected="True" />
+ <Node name="CommonForm" expanded="True">
+ <Node name="SelectFunctionView.cs" selected="True" />
</Node>
- </Node>
- <Node name="UserView" expanded="True" />
- <Node name="ZigBee" expanded="True">
- <Node name="Device" expanded="True" />
</Node>
</Node>
</Node>
@@ -50,11 +37,13 @@
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <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>
- <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs" relfile="Shared/Phone/Device/Account/AccountRegister.cs" line="277" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
--
Gitblit v1.8.0