From f500e14c0a994487070380c50c85e0929cbc8e63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 05 一月 2021 10:48:04 +0800
Subject: [PATCH] 2021-01-05 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
index 2ea3980..29ae106 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
@@ -76,7 +76,7 @@
ms.WriteByte (common.SubnetID);
ms.WriteByte (common.DeviceID);
}
- Console.WriteLine ("鎼滅储缃戝叧锛屾悳绱㈠湴鍧�鏄�:" + CommonPage.EndPoint.ToString () + " " + CommonPage.GateWayList.Count);
+ Utlis.WriteLine ("鎼滅储缃戝叧锛屾悳绱㈠湴鍧�鏄�:" + CommonPage.EndPoint.ToString () + " " + CommonPage.GateWayList.Count);
Control control = new Control ();
control.Send (new Target () {
IPEndPoint = CommonPage.EndPoint,
@@ -128,7 +128,7 @@
ShowGateWayView ();
});
} catch (Exception ex) {
- Console.WriteLine (ex.ToString ());
+ Utlis.WriteLine (ex.ToString ());
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -163,7 +163,11 @@
continue;
}
// buspro涓婁紶鐨勬暟鎹�
- if (commGateway.obj1 == 1 && (str [1].ToString () == DeviceType.OnePortWirelessFR.ToString () || str [1].ToString () == DeviceType.SuperWireless.ToString () || str [1].ToString () == DeviceType.OnePortBus.ToString ())) {
+ if (commGateway.obj1 == 1
+ && (str [1].ToString () == DeviceType.OnePortWirelessFR.ToString ()
+ || str [1].ToString () == DeviceType.OnePortMqttFR.ToString ()
+ || str [1].ToString () == DeviceType.SuperWireless.ToString ()
+ || str [1].ToString () == DeviceType.OnePortBus.ToString ())) {
if (firstInitOfflintOnePortBus) {
FrameLayout OnePortWirelessFRFrameLayout = new FrameLayout () {
Height = Application.GetRealHeight (98),
@@ -202,8 +206,16 @@
VerticalScrolViewMiddle.AddChidren (wirelessView);
AddWirelessGateway (commGateway, null, wirelessView);
- } else if (str [1].ToString () == DeviceType.OnePortWirelessFR.ToString () || str [1].ToString () == DeviceType.SuperWireless.ToString ()) {
- var onePortWirelessFR = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (one);
+ } else if (str [1].ToString () == DeviceType.OnePortWirelessFR.ToString ()
+ || str [1].ToString () == DeviceType.OnePortMqttFR.ToString ()
+ || str [1].ToString () == DeviceType.SuperWireless.ToString ()) {
+ OnePortWirelessFR onePortWirelessFR;
+ if(str [1].ToString () == DeviceType.OnePortMqttFR.ToString ()) {
+ onePortWirelessFR = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (one);
+ } else {
+ onePortWirelessFR = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (one);
+ }
+
if (onePortWirelessFR == null) {
continue;
}
@@ -405,7 +417,7 @@
}
InitBottomButton ();
} catch (Exception ex) {
- Console.WriteLine (ex.ToString ());
+ Utlis.WriteLine (ex.ToString ());
}
}
@@ -515,6 +527,7 @@
var gateWayList = gateWayListZ.FindAll ((obj) => {
return obj.Split ('_') [1].ToString () == DeviceType.OnePortBus.ToString () ||
obj.Split ('_') [1].ToString () == DeviceType.RCU.ToString () ||
+ obj.Split ('_') [1].ToString () == DeviceType.OnePortMqttFR.ToString () ||
obj.Split ('_') [1].ToString () == DeviceType.OnePortWirelessFR.ToString ();
});
@@ -536,6 +549,7 @@
var tempStrings = gatewayFileName.Split ('_');
if (tempStrings [1].ToString () == DeviceType.OnePortBus.ToString () ||
tempStrings [1].ToString () == DeviceType.RCU.ToString () ||
+ tempStrings [1].ToString () == DeviceType.OnePortMqttFR.ToString () ||
tempStrings [1].ToString () == DeviceType.OnePortWirelessFR.ToString ()) {
var one = System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (gatewayFileName));
if (one.Length == 0) {
@@ -606,6 +620,11 @@
textButton1.Text = onePortWirelessFR.Name;
button1.SelectedImagePath = "Item/WirelessSelected.png";
button1.UnSelectedImagePath = "Item/Wireless.png";
+ } else if (tempStrings [1].ToString () == DeviceType.OnePortMqttFR.ToString ()) {
+ var onePortMqttFR = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (one);
+ textButton1.Text = onePortMqttFR.Name;
+ button1.SelectedImagePath = "Item/OnePortSelected.png";
+ button1.UnSelectedImagePath = "Item/OnePort.png";
} else if (tempStrings [1].ToString () == DeviceType.OnePortBus.ToString ()) {
var onePortBus = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortBus> (one);
textButton1.Text = onePortBus.Name;
--
Gitblit v1.8.0