diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj index a0cc2d58..c2942cb9 100644 --- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj +++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj @@ -7,6 +7,10 @@ true + + + + @@ -167,6 +171,13 @@ + + + $(DefaultXamlRuntime) + MSBuild:Compile + + + diff --git a/BPASmartClient.IoT/DataVClient.cs b/BPASmartClient.IoT/DataVClient.cs index a2354915..b2d6c6b9 100644 --- a/BPASmartClient.IoT/DataVClient.cs +++ b/BPASmartClient.IoT/DataVClient.cs @@ -159,6 +159,7 @@ namespace BPASmartClient.IoT if (DeviceDataV.InitializeNo(ProductKey, DeviceName, DeviceSecret, ref message)) { MessageLog.GetInstance.Show($"客户端:【{ClientId}】,设备名称{DeviceName}阿里云连接成功"); + DeviceDataV.DataVMessageAction += DevIOTActionHandler; UpDataFile(); } else diff --git a/BPASmartClient.IoT/Model/DataVReport.cs b/BPASmartClient.IoT/Model/DataVReport.cs index 560343b7..5fdbb077 100644 --- a/BPASmartClient.IoT/Model/DataVReport.cs +++ b/BPASmartClient.IoT/Model/DataVReport.cs @@ -75,6 +75,9 @@ namespace BPASmartDatavDeviceClient.IoT return false; } IOT_Subscribe(BroadcastTopic);//订阅广播主题 + IOT_Subscribe(FileUpLoadReplyTopic); + IOT_Subscribe(FileUpLoadSendReplyTopic); + IOT_Subscribe(CancelFileUpLoadSendTopic); if (!DatavDeviceClient.IsConnected) message += $"客户端:【】,设备名称{deviceTable.devicename}阿里云连接失败.不能上报业务信息"; return DatavDeviceClient.IsConnected; }