From 1877d455d7a8fbb0d05d75ed5a341b8e3579acbd Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 02 四月 2026 16:23:47 +0800
Subject: [PATCH] 新服务器
---
SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs | 266 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 173 insertions(+), 93 deletions(-)
diff --git a/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs b/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
index 7dd6974..bc4a2b3 100644
--- a/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
+++ b/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
@@ -24,7 +24,7 @@
/// 鏈煡鐗堟湰
/// 鏃犻渶鍗囩骇 2022-12-08 14:23:07
/// </summary>
- string text_UnknownVersion = "鏃犻渶鍗囩骇";
+ string text_UnknownVersion = "鍏朵粬鐗堟湰";
/// <summary>
/// 璇诲彇澶辫触
/// </summary>
@@ -32,7 +32,7 @@
string text_reading = "璇诲彇涓�";
- string text_search = "鎼滅储缃戝叧璁惧";
+ string text_search = "鎼滅储骞堕厤缃�";
/// <summary>
/// 涓棿鐣岄潰
@@ -52,9 +52,9 @@
text_Upgraded = "Upgraded";
text_Upgrading = "Upgrading";
text_UpgradeFailed = "Upgrade failed";
- text_UnknownVersion = "No upgrade required";
+ text_UnknownVersion = "Other version";
text_readFailure = "Read failure";
- text_search = "Search Gateway";
+ text_search = "Search and configure";
text_reading = "Reading";
}
@@ -76,7 +76,7 @@
/// 搴曢儴
/// </summary>
Button AddSystemEquipmentButton = new Button () {
- Y = Application.GetRealHeight (846 + 80),
+ Y = Application.GetRealHeight (846 + 80 ),
Height = Application.GetRealHeight (90),
Text = text_search,
TextAlignment = TextAlignment.Center,
@@ -86,16 +86,13 @@
AddChidren (AddSystemEquipmentButton);
AddSystemEquipmentButton.MouseUpEventHandler += (sender, e) => {
VerticalScrolViewMiddle.RemoveAll ();
- CommonPage.FindGateway = true;
MainPage.Loading.Start ();
System.Threading.Tasks.Task.Run (() => {
try {
#region 鎼滅储璁惧
- CommonPage.LocalPhoneFindDevice = true;
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) {
@@ -120,19 +117,21 @@
Control control = new Control ();
control.Send (new Target () {
IPEndPoint = CommonPage.EndPoint,
- Command = Command.ReadGateway,
+ Command = Command.ReadRemark,
+ //Command = Command.ReadGateway,
SubnetID = 0xFF,
DeviceID = 0xFF,
- AddData = ms.ToArray ()
+ AddData = new byte [] { },
}, SendCount.Zero, false);
- control.Send (new Target () {
- IPEndPoint = new System.Net.IPEndPoint (new Net.NetWiFi ().BroadcastIpAddress, 6000),
- Command = Command.ReadGateway,
- SubnetID = 0xFF,
- DeviceID = 0xFF,
- AddData = ms.ToArray ()
- }, SendCount.Zero, false);
+ //control.Send (new Target () {
+ // IPEndPoint = new System.Net.IPEndPoint (new Net.NetWiFi ().BroadcastIpAddress, 6000),
+ // Command = Command.ReadRemark,
+ // //Command = Command.ReadGateway,
+ // SubnetID = 0xFF,
+ // DeviceID = 0xFF,
+ // AddData = ms.ToArray ()
+ //}, SendCount.Zero, false);
System.Threading.Thread.Sleep (800);
//濡傛灉鏁伴噺涓嶇浉绛夛紝灏遍噸缃鏁�
@@ -140,14 +139,12 @@
readCount = 2;
}
}
- CommonPage.FindGateway = false;
Application.RunOnMainThread (() => {
ShowGateWayView ();
});
- CommonPage.LocalPhoneFindDevice = false;
#endregion
} catch (Exception ex) {
Console.WriteLine (ex.ToString ());
@@ -209,8 +206,7 @@
Button rightButton1 = new Button () {
X = Application.GetRealWidth (480),
- Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (40),
+ Width = Application.GetRealWidth (150),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
@@ -220,88 +216,172 @@
};
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 == "35.156.34.111" || serverIP2 == "35.156.34.111") {//鏃ф湇鍔″櫒
Application.RunOnMainThread (() => {
- Application.RunOnMainThread (() => {
- rightButton1.Text = text_UpgradeFailed;
- rightButton1.TextColor = 0x99ff0000;
- });
+ rightButton1.Text = text_Upgraded;
+ rightButton1.TextColor = 0xFF00FF00;
});
+ } else if (serverIP1 == "157.175.231.123" || serverIP2 == "157.175.231.123") {
+ Application.RunOnMainThread (() => {
+ rightButton1.Text = text_Upgrading;
+ rightButton1.TextColor = 0xFF0000FF;
+ });
+ if (serverIP1 == "157.175.231.123" ) {//鏃ф湇鍔″櫒
+ serverIP1 = "35.156.34.111";
+ serverIP1Point = "9999";
+
+ serverIPBytes [0] = 35;
+ serverIPBytes [1] = 156;
+ serverIPBytes [2] = 34;
+ serverIPBytes [3] = 111;
+ serverIPBytes [4] = Convert.ToByte (9999 / 256);
+ serverIPBytes [5] = Convert.ToByte (9999 % 256);
+
+ }
+ if (serverIP2 == "157.175.231.123") {//鏃ф湇鍔″櫒
+ serverIP2 = "35.156.34.111";
+ serverIP2Point = "9999";
+
+ serverIPBytes [0] = 35;
+ serverIPBytes [1] = 156;
+ serverIPBytes [2] = 34;
+ serverIPBytes [3] = 111;
+ 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;
+ });
+ });
+ }
} else {
Application.RunOnMainThread (() => {
- Application.RunOnMainThread (() => {
- rightButton1.Text = text_Upgraded;
- rightButton1.TextColor = 0xFF00FF00;
- });
+ rightButton1.Text = text_UnknownVersion;
+ rightButton1.TextColor = 0xFF00FF00;
});
}
- }
- } catch (Exception ex) {
- Console.WriteLine ("涓�绔彛杩滅▼ip淇℃伅杞瘧澶辫触.");
- }
- } else {
- Application.RunOnMainThread (() => {
- rightButton1.Text = text_UnknownVersion;
- rightButton1.TextColor = 0xFF00FF00;
- });
- }
- }) { IsBackground = true }.Start ();
- }
+ } 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 (() => {
+ // 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淇℃伅杞瘧澶辫触.");
+ // }
+ // } else {
+ // Application.RunOnMainThread (() => {
+ // rightButton1.Text = text_readFailure;
+ // rightButton1.TextColor = 0x99ff0000;
+ // });
+ // }
+ // }) { IsBackground = true }.Start ();
+ //}
+ }
+
}
--
Gitblit v1.8.0