From c167c53eb2649ff5dc71b3c28677abc57f790aed Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 27 Sep 2019 13:23:24 +0800
Subject: [PATCH] update

Former-commit-id: f6fe7c63ab18a10daeee3cfc79c3f3604254f858
---
 .../DeviceServices/FBee/FBeeService.cs        |   2 +-
 .../DeviceServices/Onvif/OnvifService.cs      |   2 +-
 projects/IoT/IoTNode/data.db-shm              | Bin 32768 -> 0 bytes
 projects/IoT/IoTNode/data.db-wal              | Bin 4152 -> 0 bytes
 projects/IoTCenter/Services/PageHub.cs        |   1 +
 projects/IoTCenter/wwwroot/node.html          | 116 +++++++++---------
 projects/IoTCenter/wwwroot/node.tangshan.html |  24 ++--
 publish/src/linux-arm/publish/install.sh      |   1 +
 8 files changed, 76 insertions(+), 70 deletions(-)
 delete mode 100644 projects/IoT/IoTNode/data.db-shm
 delete mode 100644 projects/IoT/IoTNode/data.db-wal

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<EditDataModel>();
                                 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 536db090e9902dfbebc378750a1e997d5cec9d38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI)u?fOJ6b9h9K_JcH1{SHZL{>->NMUD_Dxlj~T1qBx0J~r>=o*^C5X8<-<on@q
z_a4U;-vBRM^CV{Rsx+SUSogN9veV(X--UA6_UGGbQ*`S~6TW;uel_RumU%c`mY)MX
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7epn#xZW96o2oNAZfB*pk1PBly
vK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5;&{}Oltbc-jj

diff --git a/projects/IoT/IoTNode/data.db-wal b/projects/IoT/IoTNode/data.db-wal
deleted file mode 100644
index fdaf9e0d0d2655bda80b213f4180628c63b040ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4152
zcmeHJ+l!QC7$3{Sdf13U*3HZyqKkOP_wc-@y^;5bH(d&KQ_jvorCqnywXh)5)eDIb
zBPua4RLUeMOu-f{>JJFIs6QZ@+3lkLAgbq^ouS<s2Zl(x$XWI@@9y_~zvp*&e)`z@
z6D9KVwo>WAQt`U@`nEkkzIOflNB?}|#-;N=?83Jm!O!Qr??1Qa<<_;U-#t7!y05fl
z?L(z4yGMV2;E&DEZhB?o+ap&te7pXqb-%4!iwE~!_a^W^n!xD3HTUf;jfJr=z5`*8
zY=3IURx+}8uasE{o`7gznt+HvEccW+s*?&j%BZ1In?87mQ)UUZgsaD?o?vu>i?ZZK
zN@@De?F2UyLY1Ya)Ka~8`)u>nmy7{xaKrXj=IXCjjxx*3OqsGMbE+j%O5+E>?5xkp
zXP+~rR8p0M5;}TFo@6Z)0i!)}#yAqR5Zr5TZK75iZBq_JhZON|R3J_xC>A1((Xs?W
z9G}^;wU|Ju#CGEdHa>x4C?=4Z@Y-fdwD6XIlA3rGDB)Jg6oV5$T_3{b3FtC4nhRxG
zH$QEC^-Xi(<6mxl)H->gdG1OVE#VDSv7B;BO^r!Py9aai>6hxWmANCc^<Kn0IvT(l
zWWq`U7CCVaIB|;WL<RF!n4u6iHg^y|-9|jtL99VD>+q^dNk_oZNKDF!#GH)`MkyBK
z0K~Gag|>MA#f6K_%kLFf7v5b7w_zvi()7cvOjTy5dx2)W5syp}>9Qw4Es8H%K};4|
z2aoboFdWcLcLpkqV45ppR17GK%t*l(2`r#IXo!rmfj~KcMhPs=U-<R>*ZsU!!8T-d
zNT60G&!Xo<ONaWTK@ulqA_;%>HbVqpLjgUoaTU<*9Y!6?KA99q6dGOZIC=y`B3^oC
zw4l!TGyo`+H8WNTvCQbw?a!KL&aPsV)~XdlS+9VrGl%A8XQp~N4PZoy&XGhNC7>M;
zPq`yTP>~GJ3Ug&BsI`#})F<2G9q&L5ndu}V29Y;7N?{$b2$Dp_F<?B`EcOS|vRx6X
z7M5$?I=8Sif4g<&o#w(PZ9hr@MAlK)HCm%oHHxp@gTph`7wdDqFp)^@eDs7uC=!QB
zVmwBNu#&l8RYF>af;qXN19N8^W|z?zJUC#S2q^`D>@>O}D1z5T8B3nMmIE1;f(s+r
z(iihfr>`v@|Gb+yNJ8E61_erCl3^ru52{CI=PCye^@4PUc}WvT!w3u_h5oU4XQC3u
zBs0NF;f4a)SiefP-5^rQxSWd7VYFe;36!m{f$&5V^(vt~?Ld&gnZa~uo;uyUwa~is
zX6wdVD`i_TRc<Ex{W*1T|A9U>lf=wR+7Lm}q<{m$2Qg?@6@m>>QlEwkq8HY6fR3+X
zQ{pzI27?H-pHQ?}5-*TaL5q1RU`Y)YEk+prFI&9&e)HxBUB(D*Rtbt#hon-2(;<Q*
zE=eGetVi1jhw_S9L!jB?o*ZV2*4Ez9mKx&+m9I%G9FK8^TT~*I=+wxtUtlH-+9`lN
zKv7{$pDnR15T$js&z5*_cWrs%u{CX&V`1kr7(656yT*33>ylR)LXv0!gBu0#C+{F)
z#8HKtF}OT%qlhx&5*XD36fMdiq{SB0I(xD?f2Mi)I_8<Jp)gpj#u=OB6-H$Ots~%f
zq^nw)#s=|sk&<EpJx$x!pW4s30I7N{jXTeJ>@)-wg#cvE!~j?X;JnDJSW-jf77pdZ
z<u=vrlgn+&C$AjG$WSI40$fF6jn5=T8K8*%90qM7QC1Qwowh6bA_jARU*w_})#{FT
z{MdaR^19D<SG%r&qU&nRDlXNEXa6s|?y>vtIDvnIoj&>62_cFJ-~u*S9#>3Y0DJAW
SkKOk0QP!8ltC{@gZT~Oqc}n{L

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 @@
     </div>
 </div>
 <div class="row" v-if="ViewModel">
-    <div class="col-md-6" v-if="HasCameras()">
+    <div class="col-md-6" v-if="HasDevices('摄像头')">
         <div class="row">
             <div class="box box-solid">
                 <select class="form-control" id="camera" @change="CameraSelected">
@@ -139,7 +139,7 @@
             </div>
         </div>
     </div>
-    <div class="col-md-6 control">
+    <div class="col-md-6 control" v-if="HasDevices('一路开关')">
         <div class="box box-solid">
             <div class="box-header with-border">
                 <h3 class="box-title"><img src="/images/switch2.png" style="height:18px;margin-right:10px;" />一路开关</h3>
@@ -164,7 +164,7 @@
             </div>
         </div>
     </div>
-    <div class="col-md-6 control">
+    <div class="col-md-6 control" v-if="HasDevices('三路开关')">
         <div class="box box-solid">
             <div class="box-header with-border">
                 <h3 class="box-title"><img src="/images/switch2.png" style="height:18px;margin-right:10px;" />三路开关</h3>
@@ -193,7 +193,7 @@
             </div>
         </div>
     </div>
-    <div class="col-md-6 control">
+    <div class="col-md-6 control" v-if="HasDevices('插座')">
         <div class="box box-solid">
             <div class="box-header with-border">
                 <h3 class="box-title"><img src="/images/switch2.png" style="height:18px;margin-right:10px;" />插座</h3>
@@ -211,6 +211,8 @@
                         </div>
                         <div class="row" style="text-align:center;">
                             {{device.DisplayName||device.Name}}
+                            <br />
+                            {{GetDataValue(device.Number,'电量')}} 度
                         </div>
                         <br />
                     </div>
@@ -220,49 +222,47 @@
     </div>
     <template v-for="device in GetDevices('调色灯')">
         <div class="col-md-6 control">
-            <div class="row">
-                <div class="box box-solid btns">
-                    <div class="box-header with-border">
-                        <h3 class="box-title"><img src="/images/light2.png" style="height:18px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
-                        <div class="box-tools pull-right">
-                            <img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/ColorLight/Off')" src="/images/on.png" />
-                            <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/ColorLight/On')" src="/images/off.png" />
-                        </div>
+            <div class="box box-solid btns">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><img src="/images/light2.png" style="height:18px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                    <div class="box-tools pull-right">
+                        <img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/ColorLight/Off')" src="/images/on.png" />
+                        <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/ColorLight/On')" src="/images/off.png" />
                     </div>
-                    <div class="box-body">
-                        <form method="get" action="/App/Exec">
-                            <input type="hidden" name="Number" :value="device.Number" />
-                            <input type="hidden" name="Method" value="/ColorLight/SetBrightness" />
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <span class="label1">亮度</span>
-                                </div>
-                                <div class="col-md-10">
-                                    <input @change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="255" name="Brightness" :value="GetDataValue(device.Number,'亮度')" />
-                                </div>
+                </div>
+                <div class="box-body">
+                    <form method="get" action="/App/Exec">
+                        <input type="hidden" name="Number" :value="device.Number" />
+                        <input type="hidden" name="Method" value="/ColorLight/SetBrightness" />
+                        <div class="row">
+                            <div class="col-md-2">
+                                <span class="label1">亮度</span>
+                            </div>
+                            <div class="col-md-10">
+                                <input @change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="255" name="Brightness" :value="GetDataValue(device.Number,'亮度')" />
+                            </div>
+                        </div>
+                    </form>
+                    <form method="get" action="/App/Exec">
+                        <input type="hidden" name="Number" :value="device.Number" />
+                        <input type="hidden" name="Method" value="/ColorLight/SetColor" />
+                        <div class="row">
+                            <div class="col-md-2">
+                                <span class="label1">色调</span>
                             </div>
-                        </form>
-                        <form method="get" action="/App/Exec">
-                            <input type="hidden" name="Number" :value="device.Number" />
-                            <input type="hidden" name="Method" value="/ColorLight/SetColor" />
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <span class="label1">色调</span>
-                                </div>
-                                <div class="col-md-10">
-                                    <input @change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" :value="GetDataValue(device.Number,'色调')" />
-                                </div>
+                            <div class="col-md-10">
+                                <input @change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" :value="GetDataValue(device.Number,'色调')" />
                             </div>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <span class="label1">饱和度</span>
-                                </div>
-                                <div class="col-md-10">
-                                    <input @change="AjaxSubmit($event,device.Number,'饱和度')" type="range" min="0" step="1" max="255" name="Saturation" :value="GetDataValue(device.Number,'饱和度')" />
-                                </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-2">
+                                <span class="label1">饱和度</span>
                             </div>
-                        </form>
-                    </div>
+                            <div class="col-md-10">
+                                <input @change="AjaxSubmit($event,device.Number,'饱和度')" type="range" min="0" step="1" max="255" name="Saturation" :value="GetDataValue(device.Number,'饱和度')" />
+                            </div>
+                        </div>
+                    </form>
                 </div>
             </div>
         </div>
@@ -273,7 +273,7 @@
                 <div class="box-header with-border">
                     <h3 class="box-title"><img src="/images/control.png" style="height:18px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
                 </div>
-                <div class="row" style="background-color:#fff;border:1px solid #eee;border-radius:5px;text-align:center;padding:10px 0;margin:10px 0">
+                <div class="box-body">
                     <form class="device KeyCodeType1 ir" method="get" action="/App/Exec">
                         <input type="hidden" name="Number" :value="device.Number" />
                         <input type="hidden" name="Method" value="/Ir/Send" />
@@ -403,18 +403,20 @@
         });
         connection.on("UpdateDevice", (message) => {
             var newDevice = JSON.parse(message);
-            var update = false;
-            for (var i = 0; i < vm.ViewModel.Devices.length; i++) {
-                if (vm.ViewModel.Devices[i].Number == newDevice.Number) {
-                    update = true;
-                    break;
+            if (newDevice.NodeId === vm.ViewModel.Id) {
+                var update = false;
+                for (var i = 0; i < vm.ViewModel.Devices.length; i++) {
+                    if (vm.ViewModel.Devices[i].Number == newDevice.Number) {
+                        update = true;
+                        break;
+                    }
+                }
+                if (update) {
+                    vm.ViewModel.Devices.splice(i, 1, newDevice);
+                }
+                else {
+                    vm.ViewModel.Devices.push(newDevice);
                 }
-            }
-            if (update) {
-                vm.ViewModel.Devices.splice(i, 1, newDevice);
-            }
-            else {
-                vm.ViewModel.Devices.push(newDevice);
             }
         });
 
@@ -632,10 +634,10 @@
                 }
                 return null;
             },
-            HasCameras() {
+            HasDevices(name) {
                 return Enumerable
                     .from(vm.ViewModel.Devices)
-                    .any(function (o) { return o.Name === '摄像头' });
+                    .any(function (o) { return o.Name === name });
             },
             GetCameras() {
                 return Enumerable
diff --git a/projects/IoTCenter/wwwroot/node.tangshan.html b/projects/IoTCenter/wwwroot/node.tangshan.html
index 3f5ecd6c..56309328 100644
--- a/projects/IoTCenter/wwwroot/node.tangshan.html
+++ b/projects/IoTCenter/wwwroot/node.tangshan.html
@@ -479,18 +479,20 @@
         });
         connection.on("UpdateDevice", (message) => {
             var newDevice = JSON.parse(message);
-            var update = false;
-            for (var i = 0; i < vm.ViewModel.Devices.length; i++) {
-                if (vm.ViewModel.Devices[i].Number == newDevice.Number) {
-                    update = true;
-                    break;
+            if (newDevice.NodeId === vm.ViewModel.Id) {
+                var update = false;
+                for (var i = 0; i < vm.ViewModel.Devices.length; i++) {
+                    if (vm.ViewModel.Devices[i].Number == newDevice.Number) {
+                        update = true;
+                        break;
+                    }
+                }
+                if (update) {
+                    vm.ViewModel.Devices.splice(i, 1, newDevice);
+                }
+                else {
+                    vm.ViewModel.Devices.push(newDevice);
                 }
-            }
-            if (update) {
-                vm.ViewModel.Devices.splice(i, 1, newDevice);
-            }
-            else {
-                vm.ViewModel.Devices.push(newDevice);
             }
         });
 
diff --git a/publish/src/linux-arm/publish/install.sh b/publish/src/linux-arm/publish/install.sh
index 7b868c7f..042a1188 100644
--- a/publish/src/linux-arm/publish/install.sh
+++ b/publish/src/linux-arm/publish/install.sh
@@ -12,6 +12,7 @@ sudo dpkg -i ~/publish/files/python-meld3_1.0.2-2_all.deb
 sudo dpkg -i ~/publish/files/supervisor_3.3.5-1_all.deb
 sudo dpkg -i ~/publish/files/fonts-wqy-zenhei_0.9.45-7_all.deb
 sudo dpkg -i ~/publish/files/n2n_2.5.0-170_armhf.deb
+sudo apt install libgdiplus
 #http://packages.ntop.org/
 sudo dpkg -i ~/publish/files/n2n_2.5.0-170_armhf.deb
 mkdir -p ~/dotnet