From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs b/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
index c64ef01..9f5be03 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
@@ -96,13 +96,18 @@
};
//鑾峰彇妤煎眰
- this.curFloorId = Config.Instance.Home.CurrentFloorId;
-
var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
return;
}
+ //妤煎眰鍒濆ID
+ foreach (var floorId in dicFloor.Keys)
+ {
+ this.curFloorId = floorId;
+ break;
+ }
+
//妤煎眰鍥炬爣
var btnIconContr = new MostRightIconControl(69, 69);
btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";
@@ -120,9 +125,9 @@
{
//妤煎眰鑿滃崟
var floors = new Category.SelectFloorForm();
+ floors.CurFloorId = this.curFloorId;
AddChidren(floors);
- floors.changeFloor = false;
- floors.CurFloorId = curFloorId;
+ floors.CurFloorId = this.curFloorId;
floors.Init(599, 161, Direction.Right);
floors.FloorAction += (floorId) =>
{
@@ -156,6 +161,11 @@
/// </summary>
public void RefreshListRoom()
{
+ if (Config.Instance.Home.FloorDics.Count == 0)
+ {
+ //鏉ュ洖鍒囨崲澶囦唤,浼氬嚭鐜伴棶棰�,妤煎眰id娌℃竻闄�
+ this.curFloorId = string.Empty;
+ }
//淇濋櫓璧疯,杩欓噷瑕佸叧闂湭鍒嗛厤鐣岄潰
this.CloseUnallocatedRoomForm();
@@ -219,7 +229,6 @@
{
return;
}
- string oldFloorId = Config.Instance.Home.CurrentFloorId;
CommonPage.Instance.CloseLeftMenu();
HdlThreadLogic.Current.RunThread(() =>
@@ -231,10 +240,11 @@
//鐐瑰嚮鐨勬槸鏀惰棌鎴块棿鐨勮瘽,涓嶅彉鏇村綋鍓嶆ゼ灞俰d
if (room.FloorId != string.Empty)
{
- Config.Instance.Home.CurrentFloorId = room.FloorId;
- if (oldFloorId != room.FloorId)
+ if (Config.Instance.Home.CurrentFloorId != room.FloorId)
{
//妤煎眰閮藉垏鎹㈢殑璇�,鍒锋柊鏁翠釜涓婚〉
+ Config.Instance.Home.CurrentFloorId = room.FloorId;
+ HdlRoomLogic.Current.NowMainPageRoom = room;
UserPage.Instance.ReFreshControl();
return;
}
@@ -288,7 +298,7 @@
frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
//鏈垎閰�
- var btnName = new NormalViewControl(141, 84, true);
+ var btnName = new NormalViewControl(250, 84, true);
btnName.X = this.GetPictrueRealSize(244);
btnName.Y = this.GetPictrueRealSize(131);
btnName.IsBold = true;
--
Gitblit v1.8.0