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 |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs b/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs
index 6258a3b..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_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>
@@ -83,7 +83,7 @@
                 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";
@@ -178,7 +178,7 @@
             userNameView.AddChidren (tvUserName);
 
             var btnLine = new Button () {
-                Height = Application.GetRealHeight (1),
+                Height = Application.GetRealHeight (2),
                 BackgroundColor = SkinStyle.Current.LineColor,
             };
             infoView.AddChidren (btnLine);
@@ -211,7 +211,7 @@
             projectNameView.AddChidren (tvProjectName);
 
             var btnLine1 = new Button () {
-                Height = Application.GetRealHeight (1),
+                Height = Application.GetRealHeight (2),
                 BackgroundColor = SkinStyle.Current.LineColor,
             };
             infoView.AddChidren (btnLine1);
@@ -242,7 +242,7 @@
             passwrodView.AddChidren (tvPassword);
 
             var btnLine2 = new Button () {
-                Height = Application.GetRealHeight (1),
+                Height = Application.GetRealHeight (2),
                 BackgroundColor = SkinStyle.Current.LineColor,
             };
             infoView.AddChidren (btnLine2);
@@ -322,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) {
@@ -360,7 +359,6 @@
                                     readCount = 2;
                                 }
                             }
-                            CommonPage.FindGateway = false;
 
 
                             Application.RunOnMainThread (() => {
@@ -380,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 ();
@@ -517,9 +514,6 @@
                             }
 
 
-#if DEBUG
-                            return;
-#endif
                             var mobytes = Control.ControlBytesSendHasReturn (Command.SetGateWayModelInternetInfo, common.SubnetID, common.DeviceID, serverIPBytes);
                             if (mobytes == null || mobytes [0] == 0xF5) {
                                 Application.RunOnMainThread (() => {

--
Gitblit v1.8.0