From 9ebd6edb9beddf1a6881b2ca924ed43bf5cedfbe Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 30 十二月 2022 11:24:03 +0800
Subject: [PATCH] 1
---
SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs | 233 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 160 insertions(+), 73 deletions(-)
diff --git a/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs b/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs
index 75324e4..fd8fd62 100644
--- a/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs
+++ b/SmartHome/UI/SimpleControl/Phone/System/RemoteOnePort.cs
@@ -318,7 +318,6 @@
try {
#region 鎼滅储璁惧
- CommonPage.LocalPhoneFindDevice = true;
CommonPage.RandomHigh = (byte)new Random ().Next (255);
CommonPage.RandomLow = (byte)new Random ().Next (255);
CommonPage.GateWayList.Clear ();
@@ -346,7 +345,7 @@
Control control = new Control ();
control.Send (new Target () {
IPEndPoint = CommonPage.EndPoint,
- Command = Command.ReadGateway,
+ Command = Command.ReadRemark,
SubnetID = 0xFF,
DeviceID = 0xFF,
AddData = ms.ToArray ()
@@ -365,7 +364,6 @@
ShowGateWayView ();
});
- CommonPage.LocalPhoneFindDevice = false;
#endregion
} catch (Exception ex) {
Console.WriteLine (ex.ToString ());
@@ -450,7 +448,6 @@
Button rightButton1 = new Button () {
X = Application.GetRealWidth (480),
Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (40),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
@@ -460,87 +457,177 @@
};
wirelessView.AddChidren (rightButton1);
- new System.Threading.Thread (() => {
- var serverIPBytes = Control.ControlBytesSendHasReturn (Command.ReadGatewayServerIP, common.SubnetID, common.DeviceID, new byte [] { });
- if (serverIPBytes != null) {
- try {
- string serverIP1 = serverIPBytes [0].ToString () + "." + serverIPBytes [1].ToString () + "." +
- serverIPBytes [2].ToString () + "." + serverIPBytes [3].ToString ();
- string serverIP1Point = ((serverIPBytes [4] * 256) + serverIPBytes [5]).ToString ();
- string serverIP2 = serverIPBytes [6].ToString () + "." + serverIPBytes [7].ToString () + "." +
- serverIPBytes [8].ToString () + "." + serverIPBytes [9].ToString ();
- string serverIP2Point = ((serverIPBytes [10] * 256) + serverIPBytes [11]).ToString ();
- if (serverIP1 == "118.31.3.103" || serverIP2 == "118.31.3.103") {
- Application.RunOnMainThread (() => {
- rightButton1.Text = text_Upgraded;
- rightButton1.TextColor = 0xFF00FF00;
- return;
- });
- } else if (serverIP1 != "115.29.251.24" && serverIP2 != "115.29.251.24") {
- Application.RunOnMainThread (() => {
- rightButton1.Text = text_UnknownVersion;
- rightButton1.TextColor = 0xFF00FF00;
- return;
- });
- } else {
- Application.RunOnMainThread (() => {
- rightButton1.Text = text_Upgrading;
- rightButton1.TextColor = 0xFF0000FF;
- });
- if (serverIP1 == "115.29.251.24") {
- serverIP1 = "118.31.3.103";
- serverIP1Point = "9999";
+ if (Language.CurrentLanguage != "Chinese") {
+ //淇敼鍥藉鏈嶅姟鍣�
+ new System.Threading.Thread (() => {
+ var serverIPBytes = Control.ControlBytesSendHasReturn (Command.ReadGatewayServerIP, common.SubnetID, common.DeviceID, new byte [] { });
+ if (serverIPBytes != null) {
+ try {
+ string serverIP1 = serverIPBytes [0].ToString () + "." + serverIPBytes [1].ToString () + "." +
+ serverIPBytes [2].ToString () + "." + serverIPBytes [3].ToString ();
+ string serverIP1Point = ((serverIPBytes [4] * 256) + serverIPBytes [5]).ToString ();
+ string serverIP2 = serverIPBytes [6].ToString () + "." + serverIPBytes [7].ToString () + "." +
+ serverIPBytes [8].ToString () + "." + serverIPBytes [9].ToString ();
+ string serverIP2Point = ((serverIPBytes [10] * 256) + serverIPBytes [11]).ToString ();
- serverIPBytes [0] = 118;
- serverIPBytes [1] = 31;
- serverIPBytes [2] = 3;
- serverIPBytes [3] = 103;
- serverIPBytes [4] = Convert.ToByte (9999 / 256);
- serverIPBytes [5] = Convert.ToByte (9999 % 256);
-
- }
- if (serverIP2 == "115.29.251.24") {
- serverIP2 = "118.31.3.103";
- serverIP2Point = "9999";
-
- serverIPBytes [0 + 6] = 118;
- serverIPBytes [1 + 6] = 31;
- serverIPBytes [2 + 6] = 3;
- serverIPBytes [3 + 6] = 103;
- serverIPBytes [4 + 6] = Convert.ToByte (9999 / 256);
- serverIPBytes [5 + 6] = Convert.ToByte (9999 % 256);
-
- }
-
-
- var mobytes = Control.ControlBytesSendHasReturn (Command.SetGateWayModelInternetInfo, common.SubnetID, common.DeviceID, serverIPBytes);
- if (mobytes == null || mobytes [0] == 0xF5) {
+ if (serverIP1 == "157.175.231.123" || serverIP2 == "157.175.231.123") {//宸存灄鏈嶅姟鍣�
Application.RunOnMainThread (() => {
+ rightButton1.Text = text_Upgraded;
+ rightButton1.TextColor = 0xFF00FF00;
+ });
+ }
+ else if (serverIP1 == "115.29.251.24" || serverIP2 == "115.29.251.24"//鏃ф湇鍔″櫒
+ || serverIP1 == "118.31.3.103" || serverIP2 == "118.31.3.103") {//鏂板浗鍐呮湇鍔″櫒
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_Upgrading;
+ rightButton1.TextColor = 0xFF0000FF;
+ });
+ if (serverIP1 == "115.29.251.24" || serverIP1 == "118.31.3.103") {//鏃ф湇鍔″櫒//鏂板浗鍐呮湇鍔″櫒
+ serverIP1 = "157.175.231.123";//宸存灄鏈嶅姟鍣�
+ serverIP1Point = "9999";
+
+ serverIPBytes [0] = 157;
+ serverIPBytes [1] = 175;
+ serverIPBytes [2] = 231;
+ serverIPBytes [3] = 123;
+ serverIPBytes [4] = Convert.ToByte (9999 / 256);
+ serverIPBytes [5] = Convert.ToByte (9999 % 256);
+
+ }
+ if (serverIP2 == "115.29.251.24" || serverIP2 == "118.31.3.103") {//鏃ф湇鍔″櫒//鏂板浗鍐呮湇鍔″櫒
+ serverIP2 = "157.175.231.123";//宸存灄鏈嶅姟鍣�
+ serverIP2Point = "9999";
+
+ serverIPBytes [0 + 6] = 157;
+ serverIPBytes [1 + 6] = 175;
+ serverIPBytes [2 + 6] = 231;
+ serverIPBytes [3 + 6] = 123;
+ serverIPBytes [4 + 6] = Convert.ToByte (9999 / 256);
+ 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 (() => {
- rightButton1.Text = text_UpgradeFailed;
- rightButton1.TextColor = 0x99ff0000;
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_UpgradeFailed;
+ rightButton1.TextColor = 0x99ff0000;
+ });
});
+ } else {
+ Application.RunOnMainThread (() => {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_Upgraded;
+ rightButton1.TextColor = 0xFF00FF00;
+ });
+ });
+ }
+ }
+ else {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_UnknownVersion;
+ rightButton1.TextColor = 0xFF00FF00;
+ });
+ }
+
+
+ } catch (Exception ex) {
+ Console.WriteLine ("涓�绔彛杩滅▼ip淇℃伅杞瘧澶辫触.");
+ }
+ } else {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_readFailure;
+ rightButton1.TextColor = 0x99ff0000;
+ });
+ }
+ }) { IsBackground = true }.Start ();
+ } else {
+ //淇敼鍥藉唴鏈嶅姟鍣�
+ new System.Threading.Thread (() => {
+ var serverIPBytes = Control.ControlBytesSendHasReturn (Command.ReadGatewayServerIP, common.SubnetID, common.DeviceID, new byte [] { });
+ if (serverIPBytes != null) {
+ try {
+ string serverIP1 = serverIPBytes [0].ToString () + "." + serverIPBytes [1].ToString () + "." +
+ serverIPBytes [2].ToString () + "." + serverIPBytes [3].ToString ();
+ string serverIP1Point = ((serverIPBytes [4] * 256) + serverIPBytes [5]).ToString ();
+ string serverIP2 = serverIPBytes [6].ToString () + "." + serverIPBytes [7].ToString () + "." +
+ serverIPBytes [8].ToString () + "." + serverIPBytes [9].ToString ();
+ string serverIP2Point = ((serverIPBytes [10] * 256) + serverIPBytes [11]).ToString ();
+
+ if (serverIP1 == "118.31.3.103" || serverIP2 == "118.31.3.103") {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_Upgraded;
+ rightButton1.TextColor = 0xFF00FF00;
+ return;
+ });
+ } else if (serverIP1 != "115.29.251.24" && serverIP2 != "115.29.251.24") {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_UnknownVersion;
+ rightButton1.TextColor = 0xFF00FF00;
+ return;
});
} else {
Application.RunOnMainThread (() => {
- Application.RunOnMainThread (() => {
- rightButton1.Text = text_Upgraded;
- rightButton1.TextColor = 0xFF00FF00;
- });
+ rightButton1.Text = text_Upgrading;
+ rightButton1.TextColor = 0xFF0000FF;
});
+ if (serverIP1 == "115.29.251.24") {
+ serverIP1 = "118.31.3.103";
+ serverIP1Point = "9999";
+
+ serverIPBytes [0] = 118;
+ serverIPBytes [1] = 31;
+ serverIPBytes [2] = 3;
+ serverIPBytes [3] = 103;
+ serverIPBytes [4] = Convert.ToByte (9999 / 256);
+ serverIPBytes [5] = Convert.ToByte (9999 % 256);
+
+ }
+ if (serverIP2 == "115.29.251.24") {
+ serverIP2 = "118.31.3.103";
+ serverIP2Point = "9999";
+
+ serverIPBytes [0 + 6] = 118;
+ serverIPBytes [1 + 6] = 31;
+ serverIPBytes [2 + 6] = 3;
+ serverIPBytes [3 + 6] = 103;
+ serverIPBytes [4 + 6] = Convert.ToByte (9999 / 256);
+ 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 (() => {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_UpgradeFailed;
+ rightButton1.TextColor = 0x99ff0000;
+ });
+ });
+ } else {
+ Application.RunOnMainThread (() => {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_Upgraded;
+ rightButton1.TextColor = 0xFF00FF00;
+ });
+ });
+ }
}
+ } catch (Exception ex) {
+ Console.WriteLine ("涓�绔彛杩滅▼ip淇℃伅杞瘧澶辫触.");
}
- } catch (Exception ex) {
- Console.WriteLine ("涓�绔彛杩滅▼ip淇℃伅杞瘧澶辫触.");
+ } else {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_UnknownVersion;
+ rightButton1.TextColor = 0xFF00FF00;
+ });
}
- } else {
- Application.RunOnMainThread (() => {
- rightButton1.Text = text_UnknownVersion;
- rightButton1.TextColor = 0xFF00FF00;
- });
- }
- }) { IsBackground = true }.Start ();
+ }) { IsBackground = true }.Start ();
+ }
}
}
}
--
Gitblit v1.8.0