From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs
index 4329325..6c358e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs
@@ -52,19 +52,19 @@
{
ssiD = ssiD.Substring(1, ssiD.Length - 2);
}
- var btnName = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uNameHadSpace), ssiD);
+ var btnName = new FrameCaptionViewControl("", ssiD);
frame.AddChidren(btnName);
btnName.InitControl();
btnName.AddBottomLine();
//瀵嗙爜
- var btnPsw = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uPasswordHadSpace), string.Empty);
+ var btnPsw = new FrameCaptionInputControl("", string.Empty);
btnPsw.Y = btnName.Bottom;
frame.AddChidren(btnPsw);
btnPsw.InitControl();
btnPsw.Height = btnPsw.Height;
btnPsw.txtInput.SecureTextEntry = true;
- btnPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputNetworkPassword);
+ btnPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);
btnMsg.X = btnPsw.txtInput.X;
@@ -85,7 +85,7 @@
if (btnPsw.Text == string.Empty)
{
//璇疯緭鍏ョ綉缁滃瘑鐮�
- btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputNetworkPassword);
+ btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
return;
}
--
Gitblit v1.8.0