From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewayDirection1Form.cs | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewayDirection1Form.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewayDirection1Form.cs
index ac15fb6..de57416 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewayDirection1Form.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewayDirection1Form.cs
@@ -34,31 +34,32 @@
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = this.GetPictrueRealSize(395);
- framePic.Height = this.GetPictrueRealSize(327);
+ framePic.Height = this.GetPictrueRealSize(223);
framePic.Gravity = Gravity.CenterHorizontal;
- framePic.Y = Application.GetRealHeight(363);
+ framePic.Y = Application.GetRealHeight(325);
framePic.BackgroundImagePath = "Gateway/MiniGatewayDirection.png";
bodyFrameLayout.AddChidren(framePic);
- //寮�鍏抽敭
- var btnSwitch = new NormalViewControl(this.GetPictrueRealSize(400), this.GetPictrueRealSize(45), false);
- btnSwitch.X = framePic.X + this.GetPictrueRealSize(60);
- btnSwitch.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnSwitch.TextSize = 10;
- btnSwitch.TextID = R.MyInternationalizationString.uSwitchButton;
- bodyFrameLayout.AddChidren(btnSwitch);
- btnSwitch.Y = framePic.Y - btnSwitch.Height;
+ //缃戝叧涓婄數閰嶇綉
+ var btnTitle = new NormalViewControl(300, 60, true);
+ btnTitle.TextID = R.MyInternationalizationString.uGatewayPowerDistributionNetwork;
+ btnTitle.X = Application.GetRealWidth(75);
+ btnTitle.Y = framePic.Bottom + Application.GetRealHeight(233);
+ btnTitle.IsBold = true;
+ btnTitle.TextSize = 14;
+ bodyFrameLayout.AddChidren(btnTitle);
- //鎻掔數鍚�,闀挎寜缃戝叧寮�鍏抽敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ //1.涓婄數,绯荤粺鍚姩(缁跨伅闂儊50绉�){0}2.閰嶇綉妯″紡(钃濊壊甯镐寒20绉�){0}3.缃戝叧寤虹珛WI-FI鐑偣鎴愬姛(钃濈伅5绉掑懆鏈熼棯鐑�){0}4.鐐瑰嚮涓嬩竴姝�
string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddMiniGatewayMsg1).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
- int yy = framePic.Bottom + Application.GetRealHeight(291);
+ int yy = btnTitle.Bottom + Application.GetRealHeight(23);
foreach (var msg in ArryMsg)
{
var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
btnMsg.Text = msg;
btnMsg.Y = yy;
- btnMsg.TextAlignment = TextAlignment.Center;
- btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnMsg.X = btnTitle.X;
+ btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnMsg.TextSize = 12;
bodyFrameLayout.AddChidren(btnMsg);
yy = btnMsg.Bottom;
}
--
Gitblit v1.8.0