From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs
index 22ab884..1d753b5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs
@@ -33,7 +33,7 @@
btnimage.UnSelectedImagePath = "Gateway/WiredGatewayInstruct.png";
bodyFrameLayout.AddChidren(btnimage);
- //璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+ //璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}姝ｅ父杩炴帴鍒欑郴缁熸寚绀虹伅1绉掗棯鐑�
string[] strMsg = Language.StringByID(R.MyInternationalizationString.ConfirmLineConnectMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
btnMsg1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -43,7 +43,7 @@
bodyFrameLayout.AddChidren(btnMsg1);
if (strMsg.Length > 1)
{
- var btnMsg2= new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor3;
btnMsg2.TextAlignment = TextAlignment.Center;
btnMsg2.Text = strMsg[1];
@@ -60,12 +60,12 @@
btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("Gateway");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Wired");
};
bodyFrameLayout.AddChidren(btnHelp);
//搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
+ int lineWidth = btnHelp.GetRealWidthByText();
var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine.Gravity = Gravity.CenterHorizontal;
--
Gitblit v1.8.0