From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
index 83e6910..04abc3d 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 鈻� 鍙橀噺澹版槑___________________________
@@ -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