diff --git a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs index c675f8cb..ff898a68 100644 --- a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs +++ b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs @@ -1307,7 +1307,7 @@ namespace IoT.Shared.DeviceServices.FBee tempBytes.Add(0x00); var electricity = BitConverter.ToInt64(tempBytes.ToArray()) / 1000f; - var data1 = device.CreateData(Keys.Electricity, electricity, DeviceDataType.Float, "电量", "kw/h"); + var data1 = device.CreateData(Keys.Electricity, electricity, DeviceDataType.Float, "电量", "kWh"); device.AddorUpdateData(data1); var dto1 = data1.To(); dto1.DeviceNumber = device.Number; diff --git a/projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs b/projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs index 625097fd..c4705827 100644 --- a/projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs +++ b/projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs @@ -399,7 +399,7 @@ namespace IoT.Shared.DeviceServices.Onvif process.Exited += (s, e) => { var _process = s as Process; - Console.WriteLine($"list:{_list.Count},exit:{_process.ExitCode},args:{arguments}"); + Console.WriteLine($"ffmpeg processes list:{_list.Count},exit:{_process.ExitCode},args:{arguments}"); if (_process != null) { Thread.Sleep(10 * 1000); diff --git a/projects/IoT/IoTNode/data.db-shm b/projects/IoT/IoTNode/data.db-shm deleted file mode 100644 index 536db090..00000000 Binary files a/projects/IoT/IoTNode/data.db-shm and /dev/null differ diff --git a/projects/IoT/IoTNode/data.db-wal b/projects/IoT/IoTNode/data.db-wal deleted file mode 100644 index fdaf9e0d..00000000 Binary files a/projects/IoT/IoTNode/data.db-wal and /dev/null differ diff --git a/projects/IoTCenter/Services/PageHub.cs b/projects/IoTCenter/Services/PageHub.cs index 999ed8cc..f26c9fa1 100644 --- a/projects/IoTCenter/Services/PageHub.cs +++ b/projects/IoTCenter/Services/PageHub.cs @@ -28,6 +28,7 @@ namespace IoTCenter.Services public override void ClientToServer(string method, string message, string connectionId) { + Console.WriteLine($"iot center> receive message from {connectionId}"); if (method == Methods.HealthCheckResponse) { using (var scope = this._applicationService.CreateScope()) diff --git a/projects/IoTCenter/wwwroot/node.html b/projects/IoTCenter/wwwroot/node.html index b545db93..e0536282 100644 --- a/projects/IoTCenter/wwwroot/node.html +++ b/projects/IoTCenter/wwwroot/node.html @@ -4,7 +4,7 @@
-
+