Fixed an issue where the setMode command for Air Purifier VOC,Table VOC,PM2.5,Table PM2.5 was not functioning properly.

Author: hsakoh

_build_on_haos/config.yaml

@@ -1,6 +1,6 @@
 name: "SwitchBot-Mqtt"
 description: "Integrate SwitchBot Devices into Home Assistant via MQTT"
-version: "1.0.33"
+version: "1.0.34"
 slug: "switchbot_mqtt"
 url: "https://github.com/hsakoh/switchbot-mqtt"
 ports:

_compile_self/config.yaml

@@ -1,6 +1,6 @@
 name: "SwitchBot-Mqtt"
 description: "Integrate SwitchBot Devices into Home Assistant via MQTT"
-version: "1.0.33"
+version: "1.0.34"
 slug: "switchbot_mqtt"
 url: "https://github.com/hsakoh/switchbot-mqtt"
 ports:

src/SwitchBotMqttApp/Components/Pages/Modal/CommandTestModal.razor

@@ -1,4 +1,4 @@
-@using SwitchBotMqttApp.Logics;
+@using SwitchBotMqttApp.Logics;
 @using SwitchBotMqttApp.Models.DeviceConfiguration;
 @using SwitchBotMqttApp.Models.DeviceDefinitions;
 @using SwitchBotMqttApp.Models.Enums;
@@ -84,13 +84,13 @@
                             <div class="col-2">@param.def.ParameterType</div>
                             <div class="col-2">
                                 @if (param.def.ParameterType == ParameterType.Range
-                              || param.def.ParameterType == ParameterType.SelectOrRange)
+                               || param.def.ParameterType == ParameterType.SelectOrRange)
                                 {
 
                                     <div>@param.def.RangeMin - @param.def.RangeMax</div>
                                 }
                                 @if (param.def.ParameterType == ParameterType.Select
-                              || param.def.ParameterType == ParameterType.SelectOrRange)
+                               || param.def.ParameterType == ParameterType.SelectOrRange)
                                 {
                                     for (int i = 0; i < param.def.GetOptions()!.Length; i++)
                                     {
@@ -225,7 +225,19 @@
                     }
                     else
                     {
-                        json[paramDef.Name] = JsonValue.Create<string>(commandParam.value);
+                        if ((Device.DeviceType == DeviceType.AirPurifierPM25
+                        || Device.DeviceType == DeviceType.AirPurifierTablePM25
+                        || Device.DeviceType == DeviceType.AirPurifierVOC
+                        || Device.DeviceType == DeviceType.AirPurifierTableVOC)
+                        && CommandConf.Command == "setMode"
+                        && CommandParams[0].def.ParameterType == ParameterType.Select)
+                        {
+                            json[paramDef.Name] = JsonValue.Create<int>(int.Parse((string)commandParam.value));
+                        }
+                        else
+                        {
+                            json[paramDef.Name] = JsonValue.Create<string>(commandParam.value);
+                        }
                     }
                 });
                 Response = await SwitchBotApiClient.SendDeviceControlCommandAsync(Device, CommandConf, jsonRoot, CancellationToken.None);

src/SwitchBotMqttApp/Services/MqttCoreService.cs

@@ -1,4 +1,4 @@
-using HomeAssistantAddOn.Mqtt;
+using HomeAssistantAddOn.Mqtt;
 using Microsoft.AspNetCore;
 using Microsoft.Extensions.Options;
 using SwitchBotMqttApp.Configurations;
@@ -442,7 +442,19 @@ private async Task ReceiveCommandAsync(string payloadRaw, DeviceBase device)
                         }
                         else
                         {
-                            json[paramDef.Name] = JsonValue.Create<string>((string)payloadDict[paramDef.Name]);
+                            if ((device.DeviceType == DeviceType.AirPurifierPM25
+                            || device.DeviceType == DeviceType.AirPurifierTablePM25
+                            || device.DeviceType == DeviceType.AirPurifierVOC
+                            || device.DeviceType == DeviceType.AirPurifierTableVOC)
+                            && commandDef.Command == "setMode"
+                            && paramDef.ParameterType == ParameterType.Select)
+                            {
+                                json[paramDef.Name] = JsonValue.Create<int>(int.Parse((string)payloadDict[paramDef.Name]));
+                            }
+                            else
+                            {
+                                json[paramDef.Name] = JsonValue.Create<string>((string)payloadDict[paramDef.Name]);
+                            }
                         }
                     });
                     await switchBotApiClient.SendDeviceControlCommandAsync(device, commandConf, jsonRoot, CancellationToken.None);