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/SystemMiddle.cs | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs b/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
index 8f0061c..ed97bf6 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>
@@ -52,7 +52,7 @@
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 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,7 +86,6 @@
AddChidren (AddSystemEquipmentButton);
AddSystemEquipmentButton.MouseUpEventHandler += (sender, e) => {
VerticalScrolViewMiddle.RemoveAll ();
- CommonPage.FindGateway = true;
MainPage.Loading.Start ();
System.Threading.Tasks.Task.Run (() => {
try {
@@ -95,7 +94,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) {
@@ -120,19 +118,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,7 +140,6 @@
readCount = 2;
}
}
- CommonPage.FindGateway = false;
Application.RunOnMainThread (() => {
@@ -209,7 +208,7 @@
Button rightButton1 = new Button () {
X = Application.GetRealWidth (480),
- Width = Application.GetRealWidth (100),
+ Width = Application.GetRealWidth (150),
Height = Application.GetRealHeight (40),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterLeft,
--
Gitblit v1.8.0