From a61775710f8c4466db5bfce58af58f886d58edf3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 14 十二月 2022 10:04:06 +0800
Subject: [PATCH] 备份
---
SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs b/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs
index 2e60e93..75324e4 100644
--- a/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs
+++ b/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs
@@ -7,14 +7,14 @@
public class RemoteOnePort : FrameLayout
{
#region 鏂囨湰
- string text_Title = "杩滅▼杩炴帴";
- string text_userName = "缁勫悕";
+ string text_Title = "杩滅▼";
+ string text_userName = "鐢ㄦ埛鍚�";
string text_projectName ="宸ョ▼鍚�";
string text_password = "瀵嗙爜";
string text_entry_userName_tip = "璇疯緭鍏ョ粍鍚嶃��";
string text_entry_projectName_tip = "璇疯緭鍏ュ伐绋嬪悕銆�";
string text_entry_password_tip = "璇疯緭鍏ュ瘑鐮併��";
- string text_link = "杩炴帴涓�绔彛";
+ string text_link = "杩炴帴骞堕厤缃�";
string text_back = "鍚庨��";
string text_reading = "璇诲彇涓�";
/// <summary>
@@ -32,7 +32,7 @@
/// <summary>
/// 鏈煡鐗堟湰
/// </summary>
- string text_UnknownVersion = "鏈煡鐗堟湰";
+ string text_UnknownVersion = "鍏朵粬鐗堟湰";
/// <summary>
/// 璇诲彇澶辫触
/// </summary>
@@ -40,6 +40,12 @@
string txt_breakLink = "鏂紑杩炴帴";
string txt_connectionSucceeded = "杩炴帴鎴愬姛";
+
+
+
+ string userName = "";
+ string projectName = "";
+ string password = "";
#endregion
@@ -57,12 +63,16 @@
base.RemoveFromParent ();
}
- public RemoteOnePort ()
+ public RemoteOnePort (string userNameOut, string projectNameOut)
{
+ userName = userNameOut;
+ projectName = projectNameOut;
+ CommonPage.IsRemote = false;
+
if(Language.CurrentLanguage!= "Chinese") {
text_Title = "Remote connection";
- text_userName = "Group name";
- text_projectName = "project name";
+ text_userName = "User name";
+ text_projectName = "Project name";
text_password = "Password";
text_entry_userName_tip = "Please enter the group name.";
text_entry_projectName_tip = "Please enter the project name.";
@@ -70,10 +80,10 @@
text_Upgraded = "Upgraded";
text_Upgrading = "Upgrading";
text_UpgradeFailed = "Upgrade failed";
- text_UnknownVersion = "Unknown version";
+ text_UnknownVersion = "Other version";
text_readFailure = "Read failure";
text_back = "Back";
- text_link = "Link";
+ text_link = "Connect and configure";
text_reading = "Reading";
txt_breakLink = "Break link";
txt_connectionSucceeded = "Connection succeeded";
@@ -128,9 +138,6 @@
void initContentView ()
{
var remoteClient = new SystemRemote ();
- string userName = "";
- string projectName = "";
- string password = "";
contentView = new VerticalScrolViewLayout () {
Y = Application.GetRealHeight (126),
@@ -161,15 +168,17 @@
btnUserNameTitle.Width = btnUserNameTitle.GetTextWidth () + Application.GetRealWidth (30);
userNameView.AddChidren (btnUserNameTitle);
- var tvUserName = new EditText () {
+ var tvUserName = new Button () {
Width = Application.GetRealWidth (400),
X = btnUserNameTitle.Right,
TextColor = SkinStyle.Current.TextColor1,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = userName,
};
userNameView.AddChidren (tvUserName);
var btnLine = new Button () {
- Height = Application.GetRealHeight (1),
+ Height = Application.GetRealHeight (2),
BackgroundColor = SkinStyle.Current.LineColor,
};
infoView.AddChidren (btnLine);
@@ -192,15 +201,17 @@
btnProjuectNameTitle.Width = btnProjuectNameTitle.GetTextWidth () + Application.GetRealWidth (30);
projectNameView.AddChidren (btnProjuectNameTitle);
- var tvProjectName = new EditText () {
+ var tvProjectName = new Button () {
Width = Application.GetRealWidth (400),
X = btnProjuectNameTitle.Right,
TextColor = SkinStyle.Current.TextColor1,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = projectName,
};
projectNameView.AddChidren (tvProjectName);
var btnLine1 = new Button () {
- Height = Application.GetRealHeight (1),
+ Height = Application.GetRealHeight (2),
BackgroundColor = SkinStyle.Current.LineColor,
};
infoView.AddChidren (btnLine1);
@@ -226,11 +237,12 @@
Width = Application.GetRealWidth (400),
X = btnPasswordTitle.Right,
TextColor = SkinStyle.Current.TextColor1,
+ Foucs = true,
};
passwrodView.AddChidren (tvPassword);
var btnLine2 = new Button () {
- Height = Application.GetRealHeight (1),
+ Height = Application.GetRealHeight (2),
BackgroundColor = SkinStyle.Current.LineColor,
};
infoView.AddChidren (btnLine2);
@@ -259,9 +271,9 @@
contentView.AddChidren (btnOption);
#if DEBUG
- userName = tvUserName.Text = "www";
- projectName = tvProjectName.Text = "www";
- password = tvPassword.Text = "wwwwww";
+ //userName = tvUserName.Text = "gs";
+ //projectName = tvProjectName.Text = "gs";
+ password = tvPassword.Text = "666666";
#endif
@@ -310,7 +322,6 @@
CommonPage.RandomHigh = (byte)new Random ().Next (255);
CommonPage.RandomLow = (byte)new Random ().Next (255);
CommonPage.GateWayList.Clear ();
- CommonPage.FindGateway = true;
//濡傛灉涓ゆ閮芥病鏈夋暟鎹弽棣堬紝灏变笉璇诲彇
int readCount = 2;
while (0 < readCount) {
@@ -348,7 +359,6 @@
readCount = 2;
}
}
- CommonPage.FindGateway = false;
Application.RunOnMainThread (() => {
@@ -368,10 +378,9 @@
} else {
CommonPage.IsRemote = false;
Application.RunOnMainThread (() => {
- MainPage.Loading.Hide ();
- infoView.AddChidren (rightButton1);
rightButton1.Text = linkResult;
rightButton1.TextColor = 0x99ff0000;
+ MainPage.Loading.Hide ();
});
}
}) { IsBackground = true }.Start ();
@@ -503,6 +512,8 @@
serverIPBytes [5 + 6] = Convert.ToByte (9999 % 256);
}
+
+
var mobytes = Control.ControlBytesSendHasReturn (Command.SetGateWayModelInternetInfo, common.SubnetID, common.DeviceID, serverIPBytes);
if (mobytes == null || mobytes [0] == 0xF5) {
Application.RunOnMainThread (() => {
@@ -531,9 +542,5 @@
}
}) { IsBackground = true }.Start ();
}
-
-
-
-
}
}
--
Gitblit v1.8.0