From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs b/ZigbeeApp20200414/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs
index ae4657c..319a7f6 100755
--- a/ZigbeeApp20200414/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs
+++ b/ZigbeeApp20200414/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs
@@ -38,8 +38,8 @@
/// </summary>
public ListRoomCardControl()
{
- this.Width = Application.GetRealWidth(495);
- this.Height = Application.GetRealHeight(354);
+ this.Width = HdlControlLogic.Current.GetPictrueRealSize(495);
+ this.Height = HdlControlLogic.Current.GetPictrueRealSize(354);
}
/// <summary>
@@ -58,8 +58,8 @@
//鎴块棿鍥剧墖
this.picRoom = new ImageView();
picRoom.Gravity = Gravity.CenterHorizontal;
- picRoom.Width = Application.GetRealWidth(467);
- picRoom.Height = Application.GetRealHeight(311);
+ picRoom.Width = HdlControlLogic.Current.GetPictrueRealSize(467);
+ picRoom.Height = HdlControlLogic.Current.GetPictrueRealSize(311);
picRoom.Radius = (uint)Application.GetRealHeight(29);
this.AddChidren(picRoom, ChidrenBindMode.NotBind);
@@ -70,30 +70,15 @@
frameBack.BackgroundColor = 0x33000000;
this.AddChidren(picRoom, ChidrenBindMode.BindEventOnly);
- ////鎴块棿鍚嶅瓧鐨勮儗鏅�
- //var btnRoomNameBackGroud = new NormalViewControl(Application.GetRealWidth(141), Application.GetRealHeight(84), false);
- //btnRoomNameBackGroud.X = Application.GetRealWidth(14);
- //btnRoomNameBackGroud.UnSelectedImagePath = "Room/RoomCardView_Name.png";
- //this.AddChidren(btnRoomNameBackGroud, ChidrenBindMode.BindEventOnly);
-
- ////鎴块棿鍚嶅瓧
- //this.btnRoomName = new NormalViewControl(btnRoomNameBackGroud.Width, btnRoomNameBackGroud.Height, false);
- //btnRoomName.X = Application.GetRealWidth(14);
- //btnRoomName.TextSize = 12;
- //btnRoomName.IsBold = true;
- //btnRoomName.TextAlignment = TextAlignment.Center;
- //btnRoomName.TextColor = UserCenterColor.Current.White;
- //this.AddChidren(btnRoomName, ChidrenBindMode.BindEventOnly);
-
//鎴块棿鍚嶅瓧鐨勮儗鏅�
- this.btnRoomNameBackGroud = new NormalViewControl(Application.GetRealWidth(141), Application.GetRealHeight(84), false);
- btnRoomNameBackGroud.X = Application.GetRealWidth(14);
+ this.btnRoomNameBackGroud = new NormalViewControl(HdlControlLogic.Current.GetPictrueRealSize(141), Application.GetRealHeight(84), false);
+ btnRoomNameBackGroud.X = HdlControlLogic.Current.GetPictrueRealSize(14);
btnRoomNameBackGroud.BackgroundColor = 0x80000000;
this.AddChidren(btnRoomNameBackGroud, ChidrenBindMode.BindEventOnly);
//鎴块棿鍚嶅瓧
this.btnRoomName = new NormalViewControl(50, Application.GetRealHeight(84), false);
- btnRoomName.X = Application.GetRealWidth(14);
+ btnRoomName.X = HdlControlLogic.Current.GetPictrueRealSize(14);
btnRoomName.TextSize = 12;
btnRoomName.IsBold = true;
btnRoomName.TextAlignment = TextAlignment.Center;
@@ -118,14 +103,14 @@
{
//鍒锋柊鍚嶅瓧
btnRoomName.Text = room.Name;
- int realWidth = btnRoomName.GetRealWidthByText() + Application.GetRealWidth(70);
- if (realWidth < Application.GetRealWidth(141))
+ int realWidth = btnRoomName.GetRealWidthByText() + HdlControlLogic.Current.GetPictrueRealSize(70);
+ if (realWidth < HdlControlLogic.Current.GetPictrueRealSize(141))
{
- realWidth = Application.GetRealWidth(141);
+ realWidth = HdlControlLogic.Current.GetPictrueRealSize(141);
}
- else if (realWidth > Application.GetRealWidth(420))
+ else if (realWidth > HdlControlLogic.Current.GetPictrueRealSize(420))
{
- realWidth = Application.GetRealWidth(420);
+ realWidth = HdlControlLogic.Current.GetPictrueRealSize(420);
}
btnRoomName.Width = realWidth;
btnRoomNameBackGroud.Width = realWidth;
--
Gitblit v1.8.0