From 8fcc3bd198606e0400eca5383572fb97ecdada85 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 10 一月 2023 15:51:37 +0800
Subject: [PATCH] 备份

---
 SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs |  231 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 157 insertions(+), 74 deletions(-)

diff --git a/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs b/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
index ed97bf6..bdaaecd 100644
--- a/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
+++ b/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
@@ -90,7 +90,6 @@
                 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 ();
@@ -146,7 +145,6 @@
                             ShowGateWayView ();
                         });
 
-                        CommonPage.LocalPhoneFindDevice = false;
                         #endregion
                     } catch (Exception ex) {
                         Console.WriteLine (ex.ToString ());
@@ -209,7 +207,6 @@
             Button rightButton1 = new Button () {
                 X = Application.GetRealWidth (480),
                 Width = Application.GetRealWidth (150),
-                Height = Application.GetRealHeight (40),
                 Gravity = Gravity.CenterVertical,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = SkinStyle.Current.TextColor1,
@@ -219,87 +216,173 @@
             };
             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;
                                 });
-                            }
-                        }
-                    } catch (Exception ex) {
-                        Console.WriteLine ("涓�绔彛杩滅▼ip淇℃伅杞瘧澶辫触.");
-                    }
-                } else {
-                    Application.RunOnMainThread (() => {
-                        rightButton1.Text = text_UnknownVersion;
-                        rightButton1.TextColor = 0xFF00FF00;
-                    });
-                }
-            }) { IsBackground = true }.Start ();
-        }
+                                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