From f718d23a262a5a8e1241fdeaeb4153399f95e79d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 四月 2020 09:19:05 +0800
Subject: [PATCH] 20200421
---
HDL_ON/DAL/Net/MqttCommon.cs | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/DAL/Net/MqttCommon.cs b/HDL_ON/DAL/Net/MqttCommon.cs
index ec35953..5b097f1 100644
--- a/HDL_ON/DAL/Net/MqttCommon.cs
+++ b/HDL_ON/DAL/Net/MqttCommon.cs
@@ -2,14 +2,9 @@
using System;
using MQTTnet.Client;
using System.Threading.Tasks;
-using Shared;
using System.Text;
using System.Security.Cryptography;
-using System.IO;
-using HDL_ON.DAL;
-using HDL_ON.UI;
using MQTTnet;
-using HDL_ON.DAL.Server;
namespace HDL_ON.DAL.Net
{
@@ -58,7 +53,7 @@
/// <summary>
/// 鍚姩杩滅▼Mqtt
/// </summary>
- public static async System.Threading.Tasks.Task StartCloudMqtt()
+ public static async Task StartCloudMqtt()
{
/*
try
@@ -128,7 +123,7 @@
MainPage.Log("Remote mqtt get Region MAC : " + UserConfig.Instance.CurrentRegion.RegionID);
var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj3);
var revertObj3 = HttpServerRequest.RequestHttps("GatewayByRegionList", requestJson3, true);
- if (revertObj3.StateCode == "SUCCESS")
+ if (revertObj3.DB_ResidenceData.residenceData.residecenInfo
{
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GatewayRes>>(revertObj3.ResponseData.ToString());
var gatewayList = responseDataObj;
@@ -338,7 +333,7 @@
/// <param name="message">闄勫姞鏁版嵁鍖�</param>
/// <param name="optionType">鎿嶄綔绫诲瀷锛�0=缃戝叧鎺у埗锛�1=璁㈤槄缃戝叧鏁版嵁;2=璁㈤槄缃戝叧涓婄嚎鏁版嵁</param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task MqttRemoteSend(byte[] message, int optionType = 0)
+ public static async Task MqttRemoteSend(byte[] message, int optionType = 0)
{
try
{
@@ -350,7 +345,7 @@
{
return;
}
- var topicName = @"/" + MainPage.LoginUser.AccountString.ToLower() + @"/" + UserConfig.Instance.CurrentRegion.MAC.Replace(".", "") + @"/" + currentGuid;
+ var topicName = "";//@"/" + MainPage.LoginUser.AccountString.ToLower() + @"/" + currentGuid;//+ @"/" + UserConfig.Instance.CurrentRegion.MAC.Replace(".", "")
switch (optionType)
{
case 0:
--
Gitblit v1.8.0