From 9cfd22c2c308adc7a7ce38cf96be04a70048de01 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 15:57:57 +0800
Subject: [PATCH] 2020-07-20-1
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index a5a41aa..2d1a426 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,30 +1,38 @@
-锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
+锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicView/SaveView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="25" Column="42" />
- <File FileName="Home.Ios/AppDelegate.cs" Line="14" Column="55" />
- <File FileName="Shared/Phone/Device/Logic/Nightlight.cs" Line="13" Column="10" />
- <File FileName="Shared/Phone/Device/Logic/Illumination.cs" Line="191" Column="60" />
- <File FileName="Home.Ios/Resources/Language.ini" Line="616" Column="10" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/TopView.cs" Line="42" Column="44" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/SaveView.cs" Line="7" Column="18" />
+ <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="487" Column="54" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="687" Column="6" />
+ <File FileName="Shared/R.cs" Line="1160" Column="22" />
+ <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="372" Column="1" />
+ <File FileName="Shared/Phone/MainPage/Controls/DeviceFunctionUnallocatedControl.cs" Line="55" Column="73" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs" Line="358" Column="27" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/RoomDeviceGroupMenuControl.cs" Line="164" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/AddScenePage.cs" Line="40" Column="83" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/RoomClickView.cs" Line="8" Column="10" />
+ <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="25" Column="16" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="Home.IOS" expanded="True">
- <Node name="Resources" expanded="True" />
- </Node>
+ <Node name="GateWay.Droid" expanded="True" />
+ <Node name="Home.IOS" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
+ <Node name="Category" expanded="True" />
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="LogicView" expanded="True">
- <Node name="SaveView.cs" selected="True" />
- </Node>
+ <Node name="LogicView" expanded="True" />
+ <Node name="CurrentDeviceState.cs" selected="True" />
+ </Node>
+ </Node>
+ <Node name="UserCenter" expanded="True">
+ <Node name="CommonBase" expanded="True">
+ <Node name="Controls" expanded="True" />
</Node>
</Node>
</Node>
@@ -34,7 +42,7 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
+ <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0