From f270cd68364fad5766ec9060d7ce835fe6b456b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 24 七月 2020 14:44:06 +0800
Subject: [PATCH] 2020-07-24-2
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 7e7b7a3..2af1f32 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,21 +1,17 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|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/SkipView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="341" Column="59" />
- <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="304" Column="24" />
- <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="232" Column="34" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/RoomClickView.cs" Line="37" Column="72" />
- <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="33" Column="1" />
- <File FileName="Shared/Common/ZigbeeColor.cs" Line="352" Column="42" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="68" Column="47" />
+ <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="528" Column="78" />
+ <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1305" Column="48" />
+ <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="495" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="121" Column="50" />
+ <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="159" Column="42" />
+ <File FileName="Shared/Phone/Device/Logic/LogicDveiceStatus.cs" Line="180" Column="83" />
+ <File FileName="Shared/Phone/Device/Logic/Illumination.cs" Line="214" Column="31" />
+ <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="136" Column="40" />
+ <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="47" Column="67" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -28,20 +24,23 @@
</Node>
</Node>
</Node>
- <Node name="Home.IOS" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
- <Node name="Category" expanded="True" />
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="SkipView.cs" selected="True" />
+ <Node name="LogicIfon.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
<Node name="CommonBase" expanded="True">
- <Node name="Controls" expanded="True" />
+ <Node name="Common" expanded="True" />
</Node>
+ </Node>
+ <Node name="UserView" expanded="True" />
+ <Node name="ZigBee" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="Device" expanded="True" />
</Node>
</Node>
</Node>
@@ -50,9 +49,9 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
+ <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
--
Gitblit v1.8.0