From 8cb7fa79561c5b5db249f3079ac0169317758369 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 15 Nov 2019 08:31:21 +0800 Subject: [PATCH] update Former-commit-id: 608705b93b1beff453767d3617d7d220a1ec8f14 --- .../Assets/StreamingAssets/wwwroot/js/device.js.meta | 7 +++++++ .../Assets/StreamingAssets/wwwroot/js/index.js.meta | 7 +++++++ projects/IoTNode/DeviceServices/FBee/FBeeService.cs | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js.meta create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/js/index.js.meta diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js.meta new file mode 100644 index 00000000..90b52628 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 67dc2e25bddfc0447a9507ea87edd44b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/index.js.meta b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/index.js.meta new file mode 100644 index 00000000..61458df5 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/index.js.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d4b6bd5e5f5428e40b481b5cc2b84a7a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs index a8b7a284..76552f63 100644 --- a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs +++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs @@ -1373,11 +1373,11 @@ namespace IoTNode.DeviceServices.FBee { if (key == Keys.Temperature) { - return value < 16 ? "低" : (value > 28 ? "高" : "适中"); ; + return value < 16 ? "低" : (value > 28 ? "高" : "适中"); } - else if (key == Keys.PM25) + else if (key == Keys.Humidity) { - return value < 30 ? "低" : (value > 80 ? "高" : "适中"); ; + return value < 30 ? "低" : (value > 80 ? "高" : "适中"); } return null; }