From 93d624160f6c77b0080a03b69d7ab10f69e3240a Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 19 Nov 2019 12:22:54 +0800
Subject: [PATCH] update

Former-commit-id: 516b5244402aa19e84b16fe8d816b2ffff8e4fd8
---
 .../IoTCenter/Controllers/AppController.cs    |   4 +-
 projects/IoTCenter/Views/Home/Device.cshtml   |  36 +-
 projects/IoTCenter/Views/Home/Node.cshtml     |   2 +-
 .../StreamingAssets/wwwroot/js/device.js      | 679 ++----------------
 .../Assets/StreamingAssets/wwwroot/js/node.js | 175 +----
 .../Assets/StreamingAssets/wwwroot/js/page.js | 248 ++++++-
 6 files changed, 316 insertions(+), 828 deletions(-)

diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs
index f6495c5f..8c3a0689 100644
--- a/projects/IoTCenter/Controllers/AppController.cs
+++ b/projects/IoTCenter/Controllers/AppController.cs
@@ -13,6 +13,7 @@ using Microsoft.Extensions.Hosting;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using Vibrant.InfluxDB.Client;
@@ -292,7 +293,8 @@ namespace IoTCenter.Controllers
                     }
                     if (rows != null)
                     {
-                        labels = rows.Select(o => o.Timestamp.Value).Select(o => o.AddHours(hours).ToString("MM-dd HH:mm:ss")).ToList();
+                        var format = time.StartsWith("1") ? "H:mm" : (time.StartsWith("7") ? "ddd" : "MMM-d");
+                        labels = rows.Select(o => o.Timestamp.Value).Select(o => o.AddHours(hours).ToString(format, new CultureInfo("zh-CN"))).ToList();
                     }
                 }
                 var model = new
diff --git a/projects/IoTCenter/Views/Home/Device.cshtml b/projects/IoTCenter/Views/Home/Device.cshtml
index e1c18e2a..1d2ddc48 100644
--- a/projects/IoTCenter/Views/Home/Device.cshtml
+++ b/projects/IoTCenter/Views/Home/Device.cshtml
@@ -137,6 +137,24 @@
         }
     </style>
     <template v-if="model">
+        <!--折线图-->
+        <div class="row" v-if="HasChart()">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <h3 class="card-title">历史数据</h3>
+                        <ul role="tablist" class="nav nav-tabs card-tools">
+                            <li class="nav-item"><a href="#tab_11165f469-8f244804008d1500" data-toggle="tab" class="nav-link active" v-on:click="changeTime('1d')">24小时</a></li>
+                            <li class="nav-item"><a href="#tab_21165f469-8f244804008d1500" data-toggle="tab" class="nav-link" v-on:click="changeTime('7d')">7日</a></li>
+                            <li class="nav-item"><a href="#tab_31165f469-8f244804008d1500" data-toggle="tab" class="nav-link" v-on:click="changeTime('30d')">30日</a></li>
+                        </ul>
+                    </div>
+                    <div class="card-body">
+                        <canvas class="chart" style="width:60%;max-width:100%;" :id="model.Number"></canvas>
+                    </div>
+                </div>
+            </div>
+        </div>
         <div class="row">
             <!--命令-->
             <div class="col-md-12">
@@ -167,18 +185,7 @@
                 </div>
             </div>
         </div>
-        <div class="row" v-if="HasChart()">
-            <div class="col-md-12">
-                <div class="card">
-                    <div class="card-header">
-                        <h3 class="card-title">趋势</h3>
-                    </div>
-                    <div class="card-body">
-                        <canvas class="chart" :id="model.Number"></canvas>
-                    </div>
-                </div>
-            </div>
-        </div>
+
         <template v-if="model.Product.Apis.length>0">
             <!--接口-->
             <template v-if="model.Name!=='调色灯'">
@@ -261,9 +268,6 @@
     </template>
 </div>
 @section scripts{
+    <script src="/js/page.js"></script>
     <script src="/js/device.js"></script>
-    <script>
-        var debug = true;
-        loadData();
-    </script>
 }
\ No newline at end of file
diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index f8ae9fda..0102b5ea 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -709,7 +709,7 @@
                         </div>
                     </div>
                     <div class="card-body">
-                        <canvas class="chart" :id="device.Number"></canvas>
+                        <canvas class="chart" style="width:60%;max-width:100%;" :id="device.Number"></canvas>
                     </div>
                 </div>
             </div>
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js
index 322bb07c..be057db4 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js
@@ -1,645 +1,54 @@
-/*var*/
-var isApp = location.href.indexOf('http') !== 0;
-var server = isApp ? localStorage.getItem('server') : null;
-var iotCenter = isApp ? server + '/IoTCenter' : '';
-var dataUrl = iotCenter + '/App/GetDevice?number=' + new URI().search(true).number;
-var token = isApp ? localStorage.getItem('token') : null;
-var wsUrl = iotCenter + '/hub?group=page';
-var connectionId;
-const connection = new signalR.HubConnectionBuilder()
-    .withUrl(wsUrl)
-    .build();
-var app;
-var vm;
-//
-var livePlayer;
-var timer;
-var decodedFrames;
-var muted = true;
-var volume = 0.5;
-//
-if (isApp) {
-    Framework7.use(Framework7Vue);
-}
-toastr.options.timeOut = 500;
-toastr.options.positionClass = "toast-top-center";
-/*fun*/
-function alert(message,title) {
-    if (isApp) {
-        title = title || '消息';
-        app.dialog.alert(message, title);
-    }
-    else {
-        alert(message);
-    }
-}
-function hideLoading(message) {
-    toastr.success(message||'请求成功');
-    $('.overlay').hide();
-}
-function loadData() {
-    var formData = new FormData();
-    formData.append('number', new URI().search(true).number);
-    if (isApp) {
-        formData.append('token', token);
-    }
-    axios.post(dataUrl, formData)
-        .then(function (response) {
-            console.log(response);
-            data = response.data;
-            if (data.Template) {
-                loadTemplate();
-            }
-            else {
-                init();
-            }
-        })
-        .catch(function (error) {
-            toastr.error('数据加载失败！');
-        })
-        .then(hideLoading);
-}
-function loadTemplate() {
-    var url = iotCenter + '/App/GetTemplate?template=' + data.Template;
-    axios.post(url, { crossDomain: true })
-        .then(function (response) {
-            var html = response.data;
-            $('#template').html(html);
-            init();
-        })
-        .catch(function (error) {
-            alert(error)
-        });
-}
-function UpdateCamera() {
-    var number = $('#camera').val();
-    var video = document.getElementById("liveVideo");
-    if (number) {
-        if (flvjs.isSupported) {
-            console.log('flv support');
-            playFlv(video);
-        }
-        else {
-            playHls(video);
-        }
-    }
-}
-function UpdateChart(deviceNumber) {
-    $('canvas.chart').each(function () {
-        var canvas = this;
-        var number = canvas.id;
-        if (vm.HasChart()) {
-            var device = vm.model;
-            var time = time || '30d';
-            var url = iotCenter + '/App/GetChartData?time=' + time + '+&number=' + number;
-            axios.post(url, { crossDomain: true })
-                .then(function (response) {
-                    var data = response.data;
-                    UpdateChartInternal(canvas, device.DisplayName,data);
-                })
-                .catch(function (error) {
-                    console.log(error);
-                    toastr.error(error)
-                });
-        }
+isDebug = true;
+useSignalR = true;
+dataUrl = iotCenter + '/App/GetDevice?number=' + new URI().search(true).number;
+data = function data() {
+    return {
+        f7params: f7params,
+        server: localStorage.getItem('server'),
+        token: localStorage.getItem('token'),
+        model: null
+    };
+}
+loadDataSuccess = function () {
+    Vue.nextTick(function () {
+        UpdateCamera();
+        UpdateChart();
     });
 }
-function UpdateChartInternal(canvas, title, data) {
-    var chart;
-    Chart.helpers.each(Chart.instances, function (instance) {
-        if (instance.chart.canvas.id === canvas.id) {
-            chart = instance;
-        }
-    })
-    if (chart) {
-        chart.data = data;
-        chart.update();
-    }
-    else {
-        var ctx = canvas.getContext('2d');
-        var options = {
-            responsive: true,
-            legend: {
-                position: 'bottom',
-            },
-            title: {
-                display: false,
-                text: title
-            },
-            animation: {
-                duration: 0
-            }
-        };
-        var chart = new Chart(ctx, {
-            type: 'line',
-            data: data,
-            options: options
-        });
-    }
-}
-function playHls(videoElement) {
-    var number = $('#camera').val();
-    var device = Enumerable.from(vm.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault();
-    var url = Enumerable.from(device.Data).where(o => o.Name === '子码流hls').firstOrDefault().Value;
-    var hasPtz = Enumerable.from(device.Data).where(o => o.Name === '缩放支持').firstOrDefault();
-    if (hasPtz && hasPtz.Value === '是') {
-        $('#ptz').show();
-    }
-    else {
-        $('#ptz').hide();
-    }
-    video.src = url;
+methods = {
+    HasChart() {
+        var o = this.model;
+        return o.Name === '温湿度传感器' || o.Name === 'PM2.5感应器' || o.Name === '光强检测器' || o.Name === '智能插座';
+    },
+    GetDatas() {
+        return Enumerable.from(this.model.Data).orderBy('o=>o.Key').toArray();
+    },
+    GetDevice(nameOrNumber) {
+        return this.model;
+    },
 
-}
-function playFlv(videoElement) {
-    var number = $('#camera').val();
-    if (number) {
-        var device = Enumerable.from(vm.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault();
-        var url = Enumerable.from(device.Data).where(o => o.Name === '子码流flv').firstOrDefault().Value;
-        var hasPtz = Enumerable.from(device.Data).where(o => o.Name === '缩放支持').firstOrDefault();
-        if (hasPtz && hasPtz.Value === '是') {
-            $('#ptz').show();
-        }
-        else {
-            $('#ptz').hide();
-        }
-        closePlayer(livePlayer);
-        try {
-            livePlayer = flvjs.createPlayer({
-                type: 'flv',
-                url: url,
-                isLive: true,
-                cors: true
-            }, {
-                enableWorker: true,
-                enableStashBuffer: false,
-                stashInitialSize: 1,
-                fixAudioTimestampGap: false
-            });
-            livePlayer.attachMediaElement(videoElement);
-            livePlayer.load();
-            livePlayer.volume = volume;
-            livePlayer.muted = muted;
-            timer = setInterval(function () {
-                console.log('.');
-                if (livePlayer.statisticsInfo.speed == 0) {
-                    console.log('reload1');
-                    clearInterval(timer);
-                    playFlv(videoElement);
-                }
-                else if (decodedFrames && livePlayer.statisticsInfo.decodedFrames <= decodedFrames) {
-                    console.log('reload2');
-                    clearInterval(timer);
-                    playFlv(videoElement);
-                }
-                else if (livePlayer.buffered.end(0) - livePlayer.currentTime > 1) {
-                    console.log('reset currentTime');
-                    livePlayer.currentTime = livePlayer.buffered.end(0) - 0.001;
-                }
-                decodedFrames = livePlayer.statisticsInfo.decodedFrames;
-            }, 10 * 1000);
-        } catch (e) {
-            console.log(e);
-        }
-    }
-}
-function closePlayer(livePlayer) {
-    if (timer) {
-        clearInterval(timer);
-    }
-    if (livePlayer != null) {
-        try {
-            livePlayer.pause();
-        } catch (e) {
-            console.error(e);
-        }
-        livePlayer.unload();
-        livePlayer.detachMediaElement();
-        try {
-            livePlayer.destroy();
-        } catch (e) {
-            console.error(e);
-        }
-        livePlayer = null;
-    }
-}
-function ajax(url, data, type) {
-    url = iotCenter + url
-    console.log(url);
-    type = type || 'get';
-    $('.overlay').show();
-    $.ajax({
-        type: type,
-        url: url,
-        data: data,
-        success: AjaxCallBack
-    }).fail(function (result) {
-        toastr.error('请求发送失败！');
-        console.log(result);
-    }).always(function () {
-        $('.overlay').hide();
-    });
-}
-function AjaxCallBack(response) {
-    var result = response;
-    if (result.code === 0) {
-        if (result.type === 0) {
-            if (result.format === 1) {
-                console.log('format/1/base64 jpeg image');
-                $('#callback .page-content').html('<img class="shot" src="' + result.data + '">');
-            }
-            else {
-                console.log('format/0/json object');
-                $('#callback .page-content').html(result.data);
-            }
-            app.popup.open('#callback');
-        }
-    }
-}
-function updateItem(list, item) {
-    var update = false;
-    for (var i = 0; i < list.length; i++) {
-        if (list[i].Id == item.Id) {
-            update = true;
-            break;
-        }
-    }
-    if (update) {
-        list.splice(i, 1, item);
-    }
-    else {
-        list.push(item);
-    }
-}
-function deleteItem(list, item) {
-    for (var i = 0; i < list.length; i++) {
-        if (list[i].Id == item.Id) {
-            list.splice(i, 1);
-            break;
-        }
-    }
-}
-/*event*/
-$(document).on('change', '#camera', function (e) {
-    UpdateCamera()
-});
-$(document).on('mousedown touchstart', 'img.camera.ajax', function (e) {
-    var number = $('#camera').val();
-    var cmd = $(this).attr('data-cmd');
-    ajax('/App/ExecApi', { token:token,connectionId: connectionId, number: number, method: '/Onvif/'+cmd }, 'post');
-    return false;
-});
-$(document).on('mouseup touchend', 'img.camera.ajax', function (e) {
-    var number = $('#camera').val();
-    var cmd = $(this).attr('data-cmd');
-    if (cmd!=='Stop') {
-        setTimeout(function () {
-            ajax('/App/ExecApi', { token: token, connectionId: connectionId, number: number, method: '/Onvif/Stop' }, 'post');
-        }, 500);
-    }
-    return false;
-});
-/*ws*/
-function connect() {
-    if (debug) {
-        console.log('start connect to server:' + Date());
-    }
-    if (connection.state === signalR.HubConnectionState.Disconnected) {
-        connection.start().then(function () {
-            toastr.success('客户端与服务器连接成功！');
-        }).catch(function (err) {
-            toastr.error('客户端与服务器连接失败！');
-            setTimeout(connect, 15 * 1000);
-        });
-    }
-}
-connection.on('Connected', function (id) {
-    connectionId = id;
-});
-connection.onclose(function (err) {
-    setTimeout(connect, 15 * 1000);
-});
-connection.on("ServerToClient", function (method, json, to,from) {
+};
+function onMessage(method, json, to, from) {
+    debug(method + ':' + json);
+    var item = JSON.parse(json);
     console.log(method + ':' + json);
-    onMessage(method, json,to, from);
-});
-function onMessage(method, json,to, from) {
     var item = JSON.parse(json);
-    if (method === 'ExecApiRsponse') {
-        console.log(json);
-        toastr.success('操作调用成功');
-    }
-    else if (method === 'ExecSceneRsponse') {
-        console.log(json);
-        toastr.success('场景调用成功');
+    if (method == 'DeviceEntityInserted' ||
+        method == 'DeviceEntityUpdated' ||
+        method == 'DeviceEntityDeleted') {
+        loadData();
     }
-    else {
-        if(method == 'DataEntityInserted' || method == 'DataEntityUpdated') {
-            var device = vm.model.Id===item.DeviceId? vm.model:null;
-            if (device) {
-                updateItem(device.Data, item);
-                toastr.info(device.DisplayName + '更新');
-                if ($('canvas#' + device.Number).length) {
-                    UpdateChart(device.Number);
-                }
+    else if (method == 'DataEntityInserted' ||
+        method == 'DataEntityUpdated' ||
+        method == 'DataEntityDeleted') {
+        var device = vm.model.Id == item.DeviceId ? vm.model : null;
+        if (device) {
+            updateItem(device.Data, item);
+            toastr.info(device.DisplayName + '更新');
+            if ($('canvas#' + device.Number).length) {
+                UpdateChart(device.Number);
             }
         }
-        else if (method == 'CommandEntityInserted' || method == 'CommandEntityUpdated') {
-            updateItem(model.Commands, item);
-            toastr.info(item.Name + '更新');
-        }
-        else if (method == 'CommandEntityDeleted') {
-            deleteItem(model.Commands, item);
-            toastr.info(item.Name+'删除');
-        }
     }
-    
 }
-/*vue*/
-function init() {
-    $('#template style').each(function (i, n) {
-        $('head').append(n);
-    });
-    vm = new Vue({
-        el: '#app',
-        data() {
-            return {
-                f7params: {
-                    routes: [],
-                    name: 'My App',
-                    id: 'com.myapp.test',
-                    theme: 'ios',
-                },
-                model: data
-            };
-        },
-        mounted() {
-            if (isApp) {
-                if (!server) {
-                    location.href = "config.html";
-                }
-                if (!token) {
-                    location.href = "login.html";
-                }
-                this.$f7ready((f7) => {
-                    app = this.$f7;
-                });
-            }
-            connect();
-            this.$nextTick(function () {
-                UpdateCamera();
-                UpdateChart();
-            });
-        },
-        methods: {
-            HasChart() {
-                var o = this.model;
-                return o.Name === '温湿度传感器' || o.Name === 'PM2.5感应器' || o.Name === '光强检测器' || o.Name === '智能插座';
-            },
-            GetDatas() {
-                return Enumerable.from(this.model.Data).orderBy('o=>o.Key').toArray();
-            },
-            GetDataValue(name) {
-                var data = Enumerable.from(this.model.Data)
-                    .where(function (o) { return o.Name == name })
-                    .firstOrDefault();
-                if (data != null) {
-                    return data.Value;
-                }
-                return null;
-            },
-            HasDevices(name) {
-                return Enumerable
-                    .from(this.model.Devices)
-                    .any(function (o) { return o.Name === name });
-            },
-            GetDevices(name) {
-                return Enumerable.from(this.model.Devices)
-                    .where(function (o) { return o.Name == name; })
-                    .toArray();
-            },
-            GetDevice(nameOrNumber) {
-                return Enumerable.from(this.model.Devices)
-                    .where(function (o) { return o.Name === nameOrNumber || o.Number === nameOrNumber; })
-                    .firstOrDefault();
-            },
-            GetChartDevices() {
-                return Enumerable.from(this.model.Data)
-                    .where(function (o) { return o.Name === '温湿度传感器' || o.Name === 'PM2.5感应器' || o.Name === '光强检测器' || o.Name === '智能插座'; })
-                    .orderBy('o=>o.ProductId')
-                    .toArray();
-            },
-            GetDataValueByKey(key) {
-                var data = Enumerable.from(this.model.Data)
-                    .where(function (o) { return o.Key.toLowerCase() === key; })
-                    .firstOrDefault();
-                if (data != null) {
-                    return data.Value;
-                }
-                return null;
-            },
-            GetDeviceDataValue(number, name, attr) {
-                var device = Enumerable.from(this.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault();
-                var data = Enumerable.from(device.Data).where(o => o.Name === name).firstOrDefault();
-                if (data != null) {
-                    return data[attr];
-                }
-                return null;
-            },
-            CameraSelected() {
-                console.log('camera selected:' + new Date());
-                UpdateCamera();
-            },
-            VolumeChange(e) {
-                muted = e.target.muted;
-                volume = e.target.volume;
-            },
-            CallApi(number, method, query) {
-                ajax('/App/ExecApi', { token: token, connectionId: connectionId, number: number, method: method, query: query }, 'post');
-            },
-            GetScenes() {
-                return Enumerable.from(this.model.Scenes).orderBy('o=>o.DisplayOrder').toArray();
-            },
-            GetCommands() {
-                return Enumerable.from(this.model.Commands).orderBy('o=>o.DisplayOrder').toArray();
-            },
-            CallScene(id) {
-                ajax('/App/ExecScene', { token: token, connectionId: connectionId, id: id }, 'post');
-            },
-            CallCommand(id) {
-                ajax('/App/ExecCommand', { token: token, connectionId: connectionId, id: id }, 'post');
-            },
-            AjaxSubmit(event, deviceNumber, dataName) {
-                var device = Enumerable.from(vm.model.Devices)
-                    .where(function (o) { return o.Number === deviceNumber; })
-                    .firstOrDefault();
-                if (device != null) {
-                    var data = Enumerable.from(device.Data)
-                        .where(function (o) { return o.Name == dataName })
-                        .firstOrDefault();
-                    if (data != null) {
-                        data.Value = $(event.target).val();
-                    }
-                }
-                var form = $(event.target).parents('form');
-                var url = form.attr('action') + '?' + form.serialize();
-                Vue.nextTick(function () {
-                    ajax(url, null, 'get');
-                });
-            },
-            getCode1(code) {
-                var pattern = 0;
-                var direction = 0;
-                var wind = 0;
-                var power = 2;
-                var temperature = 1;
-                if (code > 480 + 2) {
-                    pattern = 480;
-                }
-                else if (code > 360 + 2) {
-                    pattern = 360;
-                }
-                else if (code > 240 + 2) {
-                    pattern = 240;
-                }
-                else if (code > 120 + 2) {
-                    pattern = 120;
-                }
-                else {
-                    pattern = 0;
-                }
-                code -= pattern;
-                if (code > 75 + 2) {
-                    direction = 75;
-                }
-                else if (code > 60 + 2) {
-                    direction = 60;
-                }
-                else {
-                    direction = 0;
-                }
-                code -= direction;
-                if (code > 45 + 2) {
-                    wind = 45;
-                }
-                else if (code > 30 + 2) {
-                    wind = 30;
-                }
-                else if (code > 15 + 2) {
-                    wind = 15;
-                }
-                else {
-                    wind = 0;
-                }
-                code -= wind;
-                if (code === 1) {
-                    power = 1;
-                }
-                else {
-                    power = 2;
-                    temperature = code - power;
-                }
-                return {
-                    pattern: pattern,
-                    direction: direction,
-                    wind: wind,
-                    power: power,
-                    temperature: temperature
-                };
-            },
-            SendCode1(event) {
-                console.log(event.target + ',' + event.type + ',' + event.target.checked);
-                var form = $(event.target).parents('form');
-                var url = form.attr('action') + '?' + form.serialize();
-                var code = form.find('#Code').val();
-                if (form.hasClass('type1')) {
-                    if (event.target.name == "power" && event.target.value == "1") {
-                        code = 1;
-                    }
-                    else {
-                        var list = {};
-                        list['power'] = form.find("[name = 'power']:checked").val();
-                        list['pattern'] = form.find("[name = 'pattern']:checked").val();
-                        list['direction'] = form.find("[name = 'direction']:checked").val();
-                        list['wind'] = form.find("[name = 'wind']:checked").val();
-                        list['temperature'] = form.find("[name = 'temperature']").val();
-                        list[event.target.name] = event.target.value;
-                        code = 0;
-                        for (var name in list) {
-                            code += parseInt(list[name]);
-                        }
-                    }
-                    url = new URI(url).setQuery('Code', code).toString();
-                }
-                form.find('#Code').val(code);
-                Vue.nextTick(function () {
-                    ajax(url, null, 'get');
-                });
-            },
-            getLightColor(h, s, v) {
-                return hsvToRgb(parseInt(h * 360 / 255), parseInt(s * 100 / 255), parseInt(v * 100 / 255));
-            }
-        }
-    });
-}
-function hsvToRgb(h, s, v) {
-    if (h == "") h = 0;
-    if (s == "") s = 0;
-    if (v == "") v = 0;
-    h = parseFloat(h);
-    s = parseFloat(s);
-    v = parseFloat(v);
-    if (h < 0) h = 0;
-    if (s < 0) s = 0;
-    if (v < 0) v = 0;
-    if (h >= 360) h = 359;
-    if (s > 100) s = 100;
-    if (v > 100) v = 100;
-    s /= 100.0;
-    v /= 100.0;
-    C = v * s;
-    hh = h / 60.0;
-    X = C * (1.0 - Math.abs((hh % 2) - 1.0));
-    r = g = b = 0;
-    if (hh >= 0 && hh < 1) {
-        r = C;
-        g = X;
-    }
-    else if (hh >= 1 && hh < 2) {
-        r = X;
-        g = C;
-    }
-    else if (hh >= 2 && hh < 3) {
-        g = C;
-        b = X;
-    }
-    else if (hh >= 3 && hh < 4) {
-        g = X;
-        b = C;
-    }
-    else if (hh >= 4 && hh < 5) {
-        r = X;
-        b = C;
-    }
-    else {
-        r = C;
-        b = X;
-    }
-    m = v - C;
-    r += m;
-    g += m;
-    b += m;
-    r *= 255.0;
-    g *= 255.0;
-    b *= 255.0;
-    r = Math.round(r);
-    g = Math.round(g);
-    b = Math.round(b);
-    hex = r * 65536 + g * 256 + b;
-    hex = hex.toString(16, 6);
-    len = hex.length;
-    if (len < 6)
-        for (i = 0; i < 6 - len; i++)
-            hex = '0' + hex;
-    return '#' + hex;
-}
\ No newline at end of file
+start();
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
index 49111fc0..bc5b56cd 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
@@ -1,177 +1,4 @@
-function UpdateCamera() {
-    var number = $('#camera').val();
-    var video = document.getElementById("liveVideo");
-    if (number) {
-        if (flvjs.isSupported) {
-            console.log('flv support');
-            playFlv(video);
-        }
-        else {
-            playHls(video);
-        }
-    }
-}
-function UpdateChart(deviceNumber) {
-    $('canvas.chart').each(function () {
-        var canvas = this;
-        var number = canvas.id;
-        if (!deviceNumber || deviceNumber === number) {
-            var device = vm.GetDevice(number);
-            var time = time || '1d';
-            var url = iotCenter + '/App/GetChartData?time=' + time + '+&number=' + number + "&token=" + token + "&connectionId=" + connectionId;
-            axios.post(url, { crossDomain: true })
-                .then(function (response) {
-                    var data = response.data;
-                    UpdateChartInternal(canvas, device.DisplayName, data);
-                    console.log('折线图更新成功');
-                    toastr.info('折线图更新成功');
-                })
-                .catch(function (error) {
-                    console.log(error);
-                    toastr.error(error)
-                });
-        }
-    });
-}
-function UpdateChartInternal(canvas, title, data) {
-    var chart;
-    Chart.helpers.each(Chart.instances, function (instance) {
-        if (instance.chart.canvas.id === canvas.id) {
-            chart = instance;
-        }
-    })
-    if (chart) {
-        chart.data = data;
-        chart.update();
-    }
-    else {
-        var ctx = canvas.getContext('2d');
-        var options = {
-            responsive: true,
-            legend: {
-                position: 'bottom',
-            },
-            title: {
-                display: false,
-                text: title
-            },
-            animation: {
-                duration: 0
-            }
-        };
-        var chart = new Chart(ctx, {
-            type: 'line',
-            data: data,
-            options: options
-        });
-    }
-}
-function playHls(videoElement) {
-    var number = $('#camera').val();
-    var device = Enumerable.from(vm.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault();
-    var url = Enumerable.from(device.Data).where(o => o.Name === '子码流hls').firstOrDefault().Value;
-    var hasPtz = Enumerable.from(device.Data).where(o => o.Name === '缩放支持').firstOrDefault();
-    if (hasPtz && hasPtz.Value === '是') {
-        $('#ptz').show();
-    }
-    else {
-        $('#ptz').hide();
-    }
-    video.src = url;
-
-}
-function playFlv(videoElement) {
-    var number = $('#camera').val();
-    if (number) {
-        var device = Enumerable.from(vm.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault();
-        var url = Enumerable.from(device.Data).where(o => o.Name === '子码流flv').firstOrDefault().Value;
-        var hasPtz = Enumerable.from(device.Data).where(o => o.Name === '缩放支持').firstOrDefault();
-        if (hasPtz && hasPtz.Value === '是') {
-            $('#ptz').show();
-        }
-        else {
-            $('#ptz').hide();
-        }
-        closePlayer(livePlayer);
-        try {
-            livePlayer = flvjs.createPlayer({
-                type: 'flv',
-                url: url,
-                isLive: true,
-                cors: true
-            }, {
-                enableWorker: true,
-                enableStashBuffer: false,
-                stashInitialSize: 1,
-                fixAudioTimestampGap: false
-            });
-            livePlayer.attachMediaElement(videoElement);
-            livePlayer.load();
-            livePlayer.volume = volume;
-            livePlayer.muted = muted;
-            timer = setInterval(function () {
-                console.log('.');
-                if (livePlayer.statisticsInfo.speed == 0) {
-                    console.log('reload1');
-                    clearInterval(timer);
-                    playFlv(videoElement);
-                }
-                else if (decodedFrames && livePlayer.statisticsInfo.decodedFrames <= decodedFrames) {
-                    console.log('reload2');
-                    clearInterval(timer);
-                    playFlv(videoElement);
-                }
-                else if (livePlayer.buffered.end(0) - livePlayer.currentTime > 1) {
-                    console.log('reset currentTime');
-                    livePlayer.currentTime = livePlayer.buffered.end(0) - 0.001;
-                }
-                decodedFrames = livePlayer.statisticsInfo.decodedFrames;
-            }, 10 * 1000);
-        } catch (e) {
-            console.log(e);
-        }
-    }
-}
-function closePlayer(livePlayer) {
-    if (timer) {
-        clearInterval(timer);
-    }
-    if (livePlayer != null) {
-        try {
-            livePlayer.pause();
-        } catch (e) {
-            console.error(e);
-        }
-        livePlayer.unload();
-        livePlayer.detachMediaElement();
-        try {
-            livePlayer.destroy();
-        } catch (e) {
-            console.error(e);
-        }
-        livePlayer = null;
-    }
-}
-$(document).on('change', '#camera', function (e) {
-    UpdateCamera()
-});
-$(document).on('mousedown touchstart', 'img.camera.ajax', function (e) {
-    var number = $('#camera').val();
-    var cmd = $(this).attr('data-cmd');
-    ajax('/App/ExecApi', { token: token, connectionId: connectionId, number: number, method: '/Onvif/' + cmd }, 'post');
-    return false;
-});
-$(document).on('mouseup touchend', 'img.camera.ajax', function (e) {
-    var number = $('#camera').val();
-    var cmd = $(this).attr('data-cmd');
-    if (cmd !== 'Stop') {
-        setTimeout(function () {
-            ajax('/App/ExecApi', { token: token, connectionId: connectionId, number: number, method: '/Onvif/Stop' }, 'post');
-        }, 500);
-    }
-    return false;
-});
-//
+//
 isDebug = true;
 useSignalR = true;
 templateUrl = iotCenter + '/App/GetTemplate?number=' + new URI().search(true).number;
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/page.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/page.js
index 4ec7d8fe..c9c08ce5 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/page.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/page.js
@@ -16,6 +16,7 @@ var vm;
 var app;
 //
 var livePlayer;
+var time = '1d';
 var timer;
 var decodedFrames;
 var muted = true;
@@ -340,4 +341,249 @@ function AjaxCallBack(response) {
             app.popup.open('#callback');
         }
     }
-}
\ No newline at end of file
+}
+//
+function hsvToRgb(h, s, v) {
+    if (h == "") h = 0;
+    if (s == "") s = 0;
+    if (v == "") v = 0;
+    h = parseFloat(h);
+    s = parseFloat(s);
+    v = parseFloat(v);
+    if (h < 0) h = 0;
+    if (s < 0) s = 0;
+    if (v < 0) v = 0;
+    if (h >= 360) h = 359;
+    if (s > 100) s = 100;
+    if (v > 100) v = 100;
+    s /= 100.0;
+    v /= 100.0;
+    C = v * s;
+    hh = h / 60.0;
+    X = C * (1.0 - Math.abs((hh % 2) - 1.0));
+    r = g = b = 0;
+    if (hh >= 0 && hh < 1) {
+        r = C;
+        g = X;
+    }
+    else if (hh >= 1 && hh < 2) {
+        r = X;
+        g = C;
+    }
+    else if (hh >= 2 && hh < 3) {
+        g = C;
+        b = X;
+    }
+    else if (hh >= 3 && hh < 4) {
+        g = X;
+        b = C;
+    }
+    else if (hh >= 4 && hh < 5) {
+        r = X;
+        b = C;
+    }
+    else {
+        r = C;
+        b = X;
+    }
+    m = v - C;
+    r += m;
+    g += m;
+    b += m;
+    r *= 255.0;
+    g *= 255.0;
+    b *= 255.0;
+    r = Math.round(r);
+    g = Math.round(g);
+    b = Math.round(b);
+    hex = r * 65536 + g * 256 + b;
+    hex = hex.toString(16, 6);
+    len = hex.length;
+    if (len < 6)
+        for (i = 0; i < 6 - len; i++)
+            hex = '0' + hex;
+    return '#' + hex;
+}
+//
+function changeTime(t) {
+    time = t;
+    UpdateChart();
+}
+function UpdateChart(deviceNumber) {
+    $('canvas.chart').each(function () {
+        var canvas = this;
+        var number = canvas.id;
+        if (!deviceNumber || deviceNumber === number) {
+            var device = vm.GetDevice(number);
+            var url = iotCenter + '/App/GetChartData?time=' + time + '&number=' + number + "&token=" + token + "&connectionId=" + connectionId;
+            axios.post(url, { crossDomain: true })
+                .then(function (response) {
+                    var data = response.data;
+                    UpdateChartInternal(canvas, device.DisplayName, data);
+                    console.log('折线图更新成功');
+                    toastr.info('折线图更新成功');
+                })
+                .catch(function (error) {
+                    console.log(error);
+                    toastr.error(error)
+                });
+        }
+    });
+}
+function UpdateChartInternal(canvas, title, data) {
+    var chart;
+    Chart.helpers.each(Chart.instances, function (instance) {
+        if (instance.chart.canvas.id === canvas.id) {
+            chart = instance;
+        }
+    })
+    if (chart) {
+        chart.data = data;
+        chart.update();
+    }
+    else {
+        var ctx = canvas.getContext('2d');
+        var options = {
+            responsive: true,
+            legend: {
+                position: 'bottom',
+            },
+            title: {
+                display: false,
+                text: title
+            },
+            animation: {
+                duration: 0
+            }
+        };
+        var chart = new Chart(ctx, {
+            type: 'line',
+            data: data,
+            options: options
+        });
+    }
+}
+//
+function UpdateCamera() {
+    var number = $('#camera').val();
+    var video = document.getElementById("liveVideo");
+    if (number && video) {
+        if (flvjs.isSupported) {
+            console.log('flv support');
+            playFlv(video);
+        }
+        else {
+            playHls(video);
+        }
+    }
+}
+function playHls(videoElement) {
+    var number = $('#camera').val();
+    var device = vm.model.Devices
+        ? Enumerable.from(vm.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault()
+        : vm.model;
+    if (device) {
+        var url = Enumerable.from(device.Data).where(o => o.Name === '子码流hls').firstOrDefault().Value;
+        var hasPtz = Enumerable.from(device.Data).where(o => o.Name === '缩放支持').firstOrDefault();
+        if (hasPtz && hasPtz.Value === '是') {
+            $('#ptz').show();
+        }
+        else {
+            $('#ptz').hide();
+        }
+        video.src = url;
+    }
+}
+function playFlv(videoElement) {
+    var number = $('#camera').val();
+    if (number) {
+        var device = vm.model.Devices
+            ? Enumerable.from(vm.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault()
+            : vm.model;
+        var url = Enumerable.from(device.Data).where(o => o.Name === '子码流flv').firstOrDefault().Value;
+        var hasPtz = Enumerable.from(device.Data).where(o => o.Name === '缩放支持').firstOrDefault();
+        if (hasPtz && hasPtz.Value === '是') {
+            $('#ptz').show();
+        }
+        else {
+            $('#ptz').hide();
+        }
+        closePlayer(livePlayer);
+        try {
+            livePlayer = flvjs.createPlayer({
+                type: 'flv',
+                url: url,
+                isLive: true,
+                cors: true
+            }, {
+                enableWorker: true,
+                enableStashBuffer: false,
+                stashInitialSize: 1,
+                fixAudioTimestampGap: false
+            });
+            livePlayer.attachMediaElement(videoElement);
+            livePlayer.load();
+            livePlayer.volume = volume;
+            livePlayer.muted = muted;
+            timer = setInterval(function () {
+                console.log('.');
+                if (livePlayer.statisticsInfo.speed == 0) {
+                    console.log('reload1');
+                    clearInterval(timer);
+                    playFlv(videoElement);
+                }
+                else if (decodedFrames && livePlayer.statisticsInfo.decodedFrames <= decodedFrames) {
+                    console.log('reload2');
+                    clearInterval(timer);
+                    playFlv(videoElement);
+                }
+                else if (livePlayer.buffered.end(0) - livePlayer.currentTime > 1) {
+                    console.log('reset currentTime');
+                    livePlayer.currentTime = livePlayer.buffered.end(0) - 0.001;
+                }
+                decodedFrames = livePlayer.statisticsInfo.decodedFrames;
+            }, 10 * 1000);
+        } catch (e) {
+            console.log(e);
+        }
+    }
+}
+function closePlayer(livePlayer) {
+    if (timer) {
+        clearInterval(timer);
+    }
+    if (livePlayer != null) {
+        try {
+            livePlayer.pause();
+        } catch (e) {
+            console.error(e);
+        }
+        livePlayer.unload();
+        livePlayer.detachMediaElement();
+        try {
+            livePlayer.destroy();
+        } catch (e) {
+            console.error(e);
+        }
+        livePlayer = null;
+    }
+}
+$(document).on('change', '#camera', function (e) {
+    UpdateCamera()
+});
+$(document).on('mousedown touchstart', 'img.camera.ajax', function (e) {
+    var number = $('#camera').val();
+    var cmd = $(this).attr('data-cmd');
+    ajax('/App/ExecApi', { token: token, connectionId: connectionId, number: number, method: '/Onvif/' + cmd }, 'post');
+    return false;
+});
+$(document).on('mouseup touchend', 'img.camera.ajax', function (e) {
+    var number = $('#camera').val();
+    var cmd = $(this).attr('data-cmd');
+    if (cmd !== 'Stop') {
+        setTimeout(function () {
+            ajax('/App/ExecApi', { token: token, connectionId: connectionId, number: number, method: '/Onvif/Stop' }, 'post');
+        }, 500);
+    }
+    return false;
+});
\ No newline at end of file