From ec35d79add60d1438dff5291389f7e69c579d9f9 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 21 十一月 2019 18:18:25 +0800
Subject: [PATCH] 完成面板楼层显示处理和下拉刷新处理，请合并最新代码
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 9a1e660..9538497 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,34 +2,28 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.B2DE3886-169F-4A06-8F62-51254112D190" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs">
<Files>
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="139" Column="1" />
- <File FileName="Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs" Line="556" Column="11" />
- <File FileName="Shared/Phone/ZigBee/Device/Panel.cs" Line="62" Column="19" />
- <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="2085" Column="91" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="213" Column="19" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs" Line="145" Column="24" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserManagement.cs" Line="42" Column="17" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" Line="135" Column="84" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs" Line="66" Column="103" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" Line="758" Column="100" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserManagement.cs" Line="153" Column="15" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs" Line="130" Column="15" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="87" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs" Line="9" Column="6" />
+ <File FileName="Shared/Phone/ZigBee/Device/ZbGateway.cs" Line="3424" Column="41" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs" Line="59" Column="9" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="34" Column="87" />
+ <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="2054" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs" Line="54" Column="15" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" Line="74" Column="15" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="GateWay.Droid" expanded="True">
- <Node name="libs" expanded="True">
- <Node name="armeabi-v7a" expanded="True" />
- </Node>
- </Node>
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="UserCenter" expanded="True">
- <Node name="Device" expanded="True" />
<Node name="DoorLock" expanded="True">
- <Node name="DoorLockCommonInfo.cs" selected="True" />
+ <Node name="MemberFrozenPage.cs" selected="True" />
</Node>
</Node>
<Node name="ZigBee" expanded="True">
@@ -51,7 +45,10 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191118/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs" relfile="Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs" line="234" column="1" />
+ <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191118/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" relfile="Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" line="282" column="14" />
+ <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191118/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" relfile="Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" line="283" column="14" />
+ <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191118/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" relfile="Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" line="438" column="1" />
+ <Breakpoint file="/Users/hdl/Desktop/git/HomeApp20191118/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" relfile="Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs" line="439" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
--
Gitblit v1.8.0