From 9137222ece9b978eb97b5598f2eee6e070bcf9d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 二月 2020 15:22:16 +0800
Subject: [PATCH] 2020-02-28 更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
index 2ea3980..e9bb4a4 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemMiddle.cs
@@ -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;
}
@@ -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