From 38ab16c66df6fc523f2c385fd583a2f2e86a781c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 17:58:45 +0800
Subject: [PATCH] 2020-4-29-1
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index d3afcec..6f2ed5f 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,43 +1,52 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicView/TipView.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="37" Column="36" />
- <File FileName="Shared/R.cs" Line="820" Column="47" />
- <File FileName="GateWay.Droid/Assets/Language.ini" Line="537" Column="5" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="70" Column="26" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs" Line="219" Column="43" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs" Line="550" Column="39" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs" Line="281" Column="17" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="11" Column="29" />
- <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="430" Column="42" />
- <File FileName="Shared/Common/Device.cs" Line="1147" Column="44" />
- <File FileName="Shared/Phone/ZigBee/Device/CommonDevice.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="160" Column="32" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="214" Column="31" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="326" Column="22" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs" Line="179" Column="15" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs" Line="483" Column="19" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="43" Column="74" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="214" Column="45" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs" Line="205" Column="48" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1068" Column="64" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="783" Column="38" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="10" Column="21" />
+ <File FileName="Shared/Phone/Device/Logic/CustomText.cs" Line="26" Column="82" />
+ <File FileName="Shared/Common/ZigbeeColor.cs" Line="354" Column="62" />
+ <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/LogicView/FunView.cs" Line="28" Column="65" />
</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>
+ <Node name="GateWay.Droid" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="DoorLockLogic" expanded="True" />
- <Node name="LogicIfon.cs" selected="True" />
+ <Node name="LogicView" expanded="True">
+ <Node name="TipView.cs" selected="True" />
+ </Node>
</Node>
</Node>
<Node name="UserCenter" expanded="True">
<Node name="CommonBase" expanded="True">
+ <Node name="Controls" expanded="True">
+ <Node name="BaseCommonControl" expanded="True">
+ <Node name="Base" expanded="True" />
+ </Node>
+ <Node name="MessageControls" expanded="True" />
+ <Node name="NormalControls" expanded="True" />
+ </Node>
<Node name="Logic" expanded="True" />
</Node>
+ <Node name="Device" expanded="True">
+ <Node name="Bind" expanded="True" />
+ </Node>
<Node name="DoorLock" expanded="True" />
</Node>
<Node name="ZigBee" expanded="True">
--
Gitblit v1.8.0