From 2d7a6dfec2ef3424c07f3964d95fff1a553058ce Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Nov 2019 10:20:41 +0800 Subject: [PATCH] update Former-commit-id: c3da1a287ccd66cd887cf4f4df55d9554a35f51e --- .../IoTCenter/Controllers/AppController.cs | 27 ++++++++++++++----- .../Assets/StreamingAssets/wwwroot/js/node.js | 2 +- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs index ab29143b..f6495c5f 100644 --- a/projects/IoTCenter/Controllers/AppController.cs +++ b/projects/IoTCenter/Controllers/AppController.cs @@ -328,13 +328,26 @@ namespace IoTCenter.Controllers } } - private string GetColor(object key) - { - var randomGen = new Random(); - var names = (KnownColor[])Enum.GetValues(typeof(KnownColor)); - var randomColorName = names[randomGen.Next(names.Length)]; - var randomColor = Color.FromKnownColor(randomColorName); - return randomColor.Name; + private string GetColor(string key) + { + //var randomGen = new Random(); + //var names = (KnownColor[])Enum.GetValues(typeof(KnownColor)); + //var randomColorName = names[randomGen.Next(names.Length)]; + //var randomColor = Color.FromKnownColor(randomColorName); + //return randomColor.Name; + if (key == "Humidity") + { + return Color.FromKnownColor(KnownColor.Green).Name; + } + else if (key == "Electricity") + { + return Color.FromKnownColor(KnownColor.Red).Name; + } + else if (key == "Light") + { + return Color.FromKnownColor(KnownColor.Orange).Name; + } + return Color.FromKnownColor(KnownColor.Blue).Name; } /************************************************************/ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js index f9fd2633..49111fc0 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js @@ -24,7 +24,7 @@ function UpdateChart(deviceNumber) { var data = response.data; UpdateChartInternal(canvas, device.DisplayName, data); console.log('折线图更新成功'); - toastr.success('折线图更新成功'); + toastr.info('折线图更新成功'); }) .catch(function (error) { console.log(error);