From f759dc1e6f49c53733eafda82207c85af18f9931 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 28 五月 2020 15:46:54 +0800
Subject: [PATCH] 2020-05-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index 7bb41b3..0f13170 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -59,8 +59,7 @@
//body鍗犲畬鏁翠釜灞忓箷,闄や簡搴曢儴鑿滃崟
bodyFrameLayout.Y = 0;
- bodyFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight + ControlCommonResourse.TopFrameHeight
- + ControlCommonResourse.BodyFrameHeight - ControlCommonResourse.BottomFrameHeight;
+ bodyFrameLayout.Height = this.Height;
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BlackBackGround;
//鍒濆鍖栦腑閮ㄦ帶浠�
@@ -132,9 +131,9 @@
{
//鐢ㄦ埛澶村儚
this.btnUserIcon = new ImageView();
- btnUserIcon.Height = Application.GetMinRealAverage(280);
- btnUserIcon.Width = Application.GetMinRealAverage(280);
- btnUserIcon.Radius = (uint)Application.GetMinRealAverage(280) / 2;
+ btnUserIcon.Height = this.GetPictrueRealSize(280);
+ btnUserIcon.Width = this.GetPictrueRealSize(280);
+ btnUserIcon.Radius = (uint)this.GetPictrueRealSize(280) / 2;
btnUserIcon.X = Application.GetRealWidth(121);
if (Common.Config.Instance.Home.IsVirtually == false)
{
@@ -285,15 +284,16 @@
frame.ButtonClickEvent += (sender, e) =>
{
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
+ //鎷ユ湁缃戝叧,鎴栬�呮槸铏氭嫙浣忓畢,鍒欒繘鍏ヨ澶囧垪琛ㄧ晫闈�
if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == false
|| Common.Config.Instance.Home.IsVirtually == true)
{
- //铏氭嫙浣忓畢鍥哄畾杩涘叆杩欎釜鐣岄潰
var form = new Device.DeviceListMainForm();
form.AddForm();
}
else
{
+ //娌℃湁缃戝叧,鍒欒繘鍏ョ綉鍏冲垪琛ㄧ晫闈�
var form = new GatewayManage.GatewayListForm();
form.AddForm();
}
--
Gitblit v1.8.0