From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/Common/HDLCommon.cs | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs index 24e612e..8f2739d 100644 --- a/HDL_ON/Common/HDLCommon.cs +++ b/HDL_ON/Common/HDLCommon.cs @@ -258,7 +258,7 @@ { try { - MainPage.Log($"鎺ユ敹鍒版帹閫�.\r\n{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}"); + //Console.WriteLine($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}"); //Extras涓虹┖涓嶅鐞� if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return; @@ -357,6 +357,9 @@ //钀ょ煶鐚溂 eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙� + eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString(); + eSVideoInfo.spk = json["spk"].ToString(); + eSVideoInfo.HomeId = jpushMessageInfo.HomeId; if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString())) { @@ -686,7 +689,7 @@ if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0 { MainPage.InternetStatus = 0; - DAL.Mqtt.MqttClient.InitState(); + //DAL.Mqtt.MqttClient.DisConnectRemote();//.InitState(); } else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1 { -- Gitblit v1.8.0