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 | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
index 009eccd..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;
@@ -164,9 +167,9 @@
listRoom.Insert(0, HdlRoomLogic.Current.GetLoveRoom());
//X杞�
- int XX = Application.GetRealWidth(43);
+ int XX = this.GetPictrueRealSize(43);
//Y杞�
- int YY = Application.GetRealWidth(58);
+ int YY = this.GetPictrueRealSize(58);
//鎴块棿璁℃暟
int roomCount = 0;
foreach (var room in listRoom)
@@ -181,11 +184,11 @@
//鍔犵紦瀛�
this.dicCardControl[room.Id] = contr;
//姣忎袱涓噸缃甔杞�
- XX = roomCount % 2 == 0 ? Application.GetRealWidth(43) : contr.Right + Application.GetRealWidth(3);
+ XX = roomCount % 2 == 0 ? this.GetPictrueRealSize(43) : contr.Right + this.GetPictrueRealSize(3);
//姣忎袱涓疮鍔燳杞�
if (roomCount >= 2 && roomCount % 2 == 0)
{
- YY = contr.Bottom + Application.GetRealHeight(14);
+ YY = contr.Bottom + this.GetPictrueRealSize(14);
}
contr.ButtonClickEvent += (sender, e) =>
{
@@ -236,11 +239,11 @@
private void InitRoomCardControl(int XX, int YY)
{
//妗屽竷鎺т欢
- var frameBack = new FrameLayoutControl();
+ var frameBack = new FrameLayoutStatuControl();
frameBack.X = XX;
frameBack.Y = YY;
- frameBack.Width = Application.GetRealWidth(495);
- frameBack.Height = Application.GetRealHeight(354);
+ frameBack.Width = this.GetPictrueRealSize(495);
+ frameBack.Height = this.GetPictrueRealSize(354);
listView.frameTable.AddChidren(frameBack);
//搴曢儴闃村奖鏁堟灉
@@ -249,23 +252,23 @@
frameBack.AddChidren(btnShadow, ChidrenBindMode.NotBind);
//鑳屾櫙鎺т欢
- var picBackGroud = new NormalViewControl(467, 311, true);
+ var picBackGroud = new NormalViewControl(this.GetPictrueRealSize(467), this.GetPictrueRealSize(311), false);
picBackGroud.Gravity = Gravity.CenterHorizontal;
- picBackGroud.Radius = (uint)Application.GetRealHeight(29);
+ picBackGroud.Radius = (uint)this.GetPictrueRealSize(29);
picBackGroud.BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor3;
frameBack.AddChidren(picBackGroud, ChidrenBindMode.BindEventOnly);
//鏈垎閰嶅浘鏍�
var btnIcon = new PicViewControl(92, 72);
- btnIcon.X = Application.GetRealWidth(129);
- btnIcon.Y = Application.GetRealHeight(141);
+ btnIcon.X = this.GetPictrueRealSize(129);
+ btnIcon.Y = this.GetPictrueRealSize(141);
btnIcon.UnSelectedImagePath = "Room/NoNameRoom.png";
frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
//鏈垎閰�
var btnName = new NormalViewControl(141, 84, true);
- btnName.X = Application.GetRealWidth(244);
- btnName.Y = Application.GetRealHeight(131);
+ btnName.X = this.GetPictrueRealSize(244);
+ btnName.Y = this.GetPictrueRealSize(131);
btnName.IsBold = true;
btnName.TextColor = UserCenterColor.Current.White;
btnName.TextID = R.MyInternationalizationString.Unallocated;
--
Gitblit v1.8.0