From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
index 83e6910..eaec985 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 寮曞鐣岄潰鐨勫叡閫氱晫闈�
/// </summary>
- public class GuideCommonForm : FrameLayout
+ public class GuideCommonForm : FrameLayoutBase
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -37,7 +37,7 @@
/// </summary>
public virtual void ShowFrom()
{
- Phone.MainPage.ListRoomViewFrom.Instance.CanClick = false;
+ Phone.MainPage.LeftListRoomViewFrom.Instance.CanClick = false;
UserView.UserPage.Instance.AddChidren(this);
this.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -46,7 +46,7 @@
var btnHouseIcon = new IconViewControl(69);
btnHouseIcon.UnSelectedImagePath = "Item/Floor.png";
btnHouseIcon.Y = Application.GetRealHeight(86);
- btnHouseIcon.X = ControlCommonResourse.XXLeft;
+ btnHouseIcon.X = HdlControlResourse.XXLeft;
this.AddChidren(btnHouseIcon);
//娑堟伅鍥炬爣
var btnMsg = new IconViewControl(69);
@@ -57,7 +57,7 @@
//浣忓畢鍚嶅瓧
this.btnHouse = new NormalViewControl(300, 95, true);
btnHouse.TextSize = 24;
- btnHouse.X = ControlCommonResourse.XXLeft;
+ btnHouse.X = HdlControlResourse.XXLeft;
btnHouse.Y = Application.GetRealHeight(161);
btnHouse.TextID = R.MyInternationalizationString.uMyResidence;
this.AddChidren(btnHouse);
@@ -233,7 +233,7 @@
//搴曢儴鑿滃崟
var frameMenu = new FrameLayout();
- frameMenu.Height = ControlCommonResourse.BottomFrameHeight;
+ frameMenu.Height = HdlControlResourse.BottomFrameHeight;
frameMenu.Gravity = Gravity.BottomCenter;
this.AddChidren(frameMenu);
//绾�
@@ -243,8 +243,8 @@
//涓婚〉
var btnMenuHome = new IconViewControl(10, false);
btnMenuHome.X = Application.GetRealWidth(109);
- btnMenuHome.Width = Application.GetMinRealAverage(138);
- btnMenuHome.Height = Application.GetMinRealAverage(98);
+ btnMenuHome.Width = this.GetPictrueRealSize(138);
+ btnMenuHome.Height = this.GetPictrueRealSize(98);
btnMenuHome.UnSelectedImagePath = "Navigation/HomeSelected.png";
frameMenu.AddChidren(btnMenuHome);
var btnMenuHomeName = new NormalViewControl(btnMenuHome.Width, Application.GetRealHeight(40), false);
@@ -259,8 +259,8 @@
//鍒嗙被
var btnFenlei = new IconViewControl(10, false);
btnFenlei.X = Application.GetRealWidth(469);
- btnFenlei.Width = Application.GetMinRealAverage(138);
- btnFenlei.Height = Application.GetMinRealAverage(98);
+ btnFenlei.Width = this.GetPictrueRealSize(138);
+ btnFenlei.Height = this.GetPictrueRealSize(98);
btnFenlei.UnSelectedImagePath = "Navigation/Category.png";
frameMenu.AddChidren(btnFenlei);
var btnFenleiName = new NormalViewControl(btnFenlei.Width, Application.GetRealHeight(40), false);
@@ -275,8 +275,8 @@
//鎴戠殑
var btnMy = new IconViewControl(10, false);
btnMy.X = Application.GetRealWidth(832);
- btnMy.Width = Application.GetMinRealAverage(138);
- btnMy.Height = Application.GetMinRealAverage(98);
+ btnMy.Width = this.GetPictrueRealSize(138);
+ btnMy.Height = this.GetPictrueRealSize(98);
btnMy.UnSelectedImagePath = "Navigation/Setting.png";
frameMenu.AddChidren(btnMy);
var btnMyName = new NormalViewControl(btnMy.Width, Application.GetRealHeight(40), false);
--
Gitblit v1.8.0