From da9905ebb2794d276f37d798f1624c8c59dc074e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 17:37:24 +0800
Subject: [PATCH] 2020-07-20-2
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 2d1a426..7e7b7a3 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,33 +1,41 @@
-锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
+锘�<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/CurrentDeviceState.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SkipView.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="487" Column="54" />
+ <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="372" Column="1" />
+ <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="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" />
+ <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" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="GateWay.Droid" expanded="True" />
+ <Node name="GateWay.Droid" expanded="True">
+ <Node name="Assets" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="ZigeeLogic" expanded="True" />
+ </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="LogicView" expanded="True" />
- <Node name="CurrentDeviceState.cs" selected="True" />
+ <Node name="SkipView.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
--
Gitblit v1.8.0