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(); 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<-JJFIs6QZ@+3lkLAgbq^ouSWAQt`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^+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-*ZsU!!8T-d zNT60G&!XoHbVqpLjgUoaTU<*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_Faf;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_TRclf=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(;ylR)LXv0!gBu0#C+{F) z#8HKtF}OT%qlhx&5*XD36fMdiq{SB0I(xD?f2Mi)I_8@)-wg#cvE!~j?X;JnDJSW-jf77pdZ zvtIDvnIoj&>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 @@
-
+