From b68cdc7e103a00d5df73e4b75603be8da1815b4a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 13:59:52 +0800
Subject: [PATCH] 上传版本
---
ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
index aba2d34..aa8dd52 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using Shared.Common;
-using Shared.Phone.Device.Category;
using Shared.Phone.Device.CommonForm;
using Shared.Phone.UserCenter;
using Shared.Phone.UserView;
@@ -66,9 +65,6 @@
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitBodyFrameLayout();
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.RoomList));
-
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
}
@@ -79,7 +75,11 @@
private void InitTopFrame()
{
//鍒濆鍖栧ご閮ㄦ帶浠�
- this.InitTopFrameLayout();
+ this.InitTopFrameLayout();
+
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.RoomList));
+
//閲嶇疆杩斿洖鎸夐敭鐨勪簨浠�
var btnBack = this.GetBackButton();
btnBack.ButtonClickEvent = null;
@@ -90,7 +90,10 @@
};
//鑾峰彇妤煎眰
- this.curFloorId = Config.Instance.Home.CurrentFloorId;
+ if (this.curFloorId == string.Empty)
+ {
+ this.curFloorId = Config.Instance.Home.CurrentFloorId;
+ }
var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
@@ -112,7 +115,7 @@
btnIconContr.ButtonClickEvent += (sender, e) =>
{
//妤煎眰鑿滃崟
- var floors = new SelectFloor();
+ var floors = new Category.SelectFloorForm();
AddChidren(floors);
floors.changeFloor = false;
floors.CurFloorId = curFloorId;
@@ -236,7 +239,7 @@
private void InitRoomCardControl(int XX, int YY)
{
//妗屽竷鎺т欢
- var frameBack = new FrameLayoutControl();
+ var frameBack = new FrameLayoutStatuControl();
frameBack.X = XX;
frameBack.Y = YY;
frameBack.Width = this.GetPictrueRealSize(495);
--
Gitblit v1.8.0