From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index e594d9a..1386467 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,28 +2,34 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.a8099274022ed2dc56ddf73bdd3a308ad9575ec5" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.5c86e4357d63" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs">
<Files>
- <File FileName="Shared/Phone/ZigBee/Device/BindObj.cs" Line="316" Column="9" />
- <File FileName="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs" Line="597" Column="63" />
- <File FileName="Shared/Phone/UserCenter/Device/Bind/BindInfo.cs" Line="92" Column="64" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="119" Column="63" />
+ <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs" Line="1" Column="1" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="75" Column="8" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs" Line="1" Column="1" />
</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>
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="UserCenter" expanded="True">
- <Node name="CommonBase" expanded="True" />
- <Node name="Device" expanded="True">
- <Node name="Bind" expanded="True">
- <Node name="BindTargetsPage.cs" selected="True" />
- </Node>
+ <Node name="CommonBase" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="Logic" expanded="True" />
</Node>
- <Node name="DoorLock" expanded="True" />
+ <Node name="Device" expanded="True">
+ <Node name="Bind" expanded="True" />
+ </Node>
+ <Node name="DoorLock" expanded="True">
+ <Node name="EntryStatusPage.cs" selected="True" />
+ </Node>
</Node>
<Node name="ZigBee" expanded="True">
<Node name="Device" expanded="True" />
@@ -33,6 +39,12 @@
</Node>
</State>
</Pad>
+ <Pad Id="MonoDevelop.Debugger.WatchPad">
+ <State>
+ <Value>curAccountObj.SubAccountDistributedMark</Value>
+ <Value>curDoorLockUser.ConnectedAccount</Value>
+ </State>
+ </Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
--
Gitblit v1.8.0