From dc840e2d67654781ebc9c7640e6c44a63a6d04d0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 09:44:37 +0800
Subject: [PATCH] 2020-12-11 1.注册、忘记密码、重置密码、点击返回到时候屏蔽检测错误提示。底部按钮使能效果优化修改。邮箱变密码输入问题修复。2.网络请求底层增加token过期检测刷新方法。3.更新控件库，iOS EditText取消默认密码输入方式。
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 60cbac3..4608ca6 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -71,7 +71,7 @@
{
bodyView = this;
roomsShowed = new List<Room>();
- roomsShowed.AddRange(DB_ResidenceData.Rooms);
+ roomsShowed.AddRange(DB_ResidenceData.residenceData.Rooms);
}
public void LoadPage()
@@ -226,7 +226,7 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
Radius = (uint)Application.GetRealWidth(12),
- Tag = room.uid,
+ Tag = room.roomId,
};
roomListView.AddChidren(roomView);
@@ -234,10 +234,13 @@
{
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
- ImagePath = room.backgroundImage,
+ //ImagePath = room.backgroundImage,
Radius = (uint)Application.GetRealWidth(12),
};
roomView.AddChidren(roomViewbg);
+
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
var roomViewbgColor = new Button()
{
@@ -341,7 +344,7 @@
var btnAllClose = new Button()
{
X = Application.GetRealWidth(282),
- Y = Application.GetRealHeight(126),
+ Y = Application.GetRealWidth(126),
Width = Application.GetMinRealAverage(58),
Height = Application.GetMinRealAverage(58),
UnSelectedImagePath = "Classification/Room/AllCloseIcon.png",
@@ -363,7 +366,12 @@
btnFloorAndRoomName.Text = room.floorName + room.roomName;
};
- var view = new RoomPage(room, ReloadRoomName);
+ //鎴块棿鍒犻櫎浜嬩欢
+ Action deleteAction = () => {
+ roomView.RemoveFromParent();
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -810,10 +818,10 @@
};
dispalyView.AddChidren(contentView);
- if (Floor.InsFloor.Floors.Count < 2)
+ if (SpatialInfo.CurrentSpatial.FloorList.Count < 2)
{
}
- else if (Floor.InsFloor.Floors.Count < 3)
+ else if (SpatialInfo.CurrentSpatial.FloorList.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -828,7 +836,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (Floor.InsFloor.Floors.Count < 4)
+ else if (SpatialInfo.CurrentSpatial.FloorList.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -863,7 +871,7 @@
List<string> chooseList = new List<string>();
chooseList.Add(Language.StringByID(StringId.All));
- foreach (var f in Floor.InsFloor.Floors)
+ foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
{
chooseList.Add(f.roomName);
}
@@ -903,11 +911,11 @@
roomsShowed.Clear();
if (floor == Language.StringByID(StringId.All))
{
- roomsShowed.AddRange(DB_ResidenceData.Rooms);
+ roomsShowed.AddRange(DB_ResidenceData.residenceData.Rooms);
}
else
{
- foreach (var room in DB_ResidenceData.Rooms)
+ foreach (var room in DB_ResidenceData.residenceData.Rooms)
{
if (room.floorName == floor)
{
--
Gitblit v1.8.0