wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
TangShanKaiPing
wanggang 6 years ago
parent b8eb9fd953
commit f07761eaf4
13 changed files with 82 additions and 56 deletions
Show Stats Download Patch File Download Diff File

3
projects/IoT/IoTServices/SingalDemo/OmxPlayer.cs
Unescape View File

@ -13,7 +13,8 @@ namespace SingalDemo
{ {
lock (lockObject) lock (lockObject)
{ {
var args = $"-o local --loop {file}"; var args = $"{Startup.Configuration["omx"]} {file}";
Console.WriteLine(args);
if (Player != null && !Player.HasExited && Player.StartInfo.Arguments == args) if (Player != null && !Player.HasExited && Player.StartInfo.Arguments == args)
{ {
Player.StandardInput.Write('p'); Player.StandardInput.Write('p');

2
projects/IoT/IoTServices/SingalDemo/Startup.cs
Unescape View File

@ -13,7 +13,7 @@ namespace SingalDemo
Configuration = configuration; Configuration = configuration;
} }
public IConfiguration Configuration { get; } public static IConfiguration Configuration { get; private set; }
public static IHostingEnvironment Env { get; private set; } public static IHostingEnvironment Env { get; private set; }
// This method gets called by the runtime. Use this method to add services to the container. // This method gets called by the runtime. Use this method to add services to the container.

3
projects/IoT/IoTServices/SingalDemo/appsettings.json
Unescape View File

@ -4,5 +4,6 @@
"Default": "Warning" "Default": "Warning"
} }
}, },
"AllowedHosts": "*" "AllowedHosts": "*",
"omx": "-o alsa --loop"
} }

24
publish/build32.cmd
Unescape View File

@ -0,0 +1,24 @@
@echo off
set startime=%time%
rd /q/s "./dist/"
echo d|xcopy "./src/linux-x64/publish" "./dist/linux-x64/publish" /s /e /y /f
echo d|xcopy "./src/linux-arm64/publish" "./dist/linux-arm64/publish" /s /e /y /f
dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-x64 -o ../../publish/dist/linux-x64/publish/apps/UserCenter
dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-x64 -o ../../publish/dist/linux-x64/publish/apps/IoTCenter
dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -r linux-arm -o ../../publish/dist/linux-arm64/publish/apps/UserCenter
dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -r linux-arm -o ../../publish/dist/linux-arm64/publish/apps/IoTCenter
dotnet publish ../projects/IoT/IoTNode/IoTNode.csproj -c Release -r linux-arm -o ../../../publish/dist/linux-arm64/publish/apps/IoTNode
dotnet publish ../projects/IoT/IoTServices/WinService/WinService.csproj -c Release -r win-x86 -o "../../../../publish/dist/win-x86/Program Files (x86)/WinService"
dotnet publish ../projects/IoT/IoTServices/APService/APService.csproj -c Release -r linux-arm -o ../../../../publish/dist/linux-arm64/publish/apps/APService
dotnet publish ../projects/IoT/IoTServices/ONVIFService/ONVIFService.csproj -c Release -r linux-x64 -o ../../../../publish/dist/linux-x64/publish/apps/ONVIFService
dotnet publish ../projects/IoT/IoTServices/ONVIFService/ONVIFService.csproj -c Release -r linux-arm -o ../../../../publish/dist/linux-arm64/publish/apps/ONVIFService
dotnet publish ../projects/IoT/IoTServices/SerialPortService/SerialPortService.csproj -c Release -r linux-arm -o ../../../../publish/dist/linux-arm64/publish/apps/SerialPortService
dotnet publish ../projects/IoT/IoTServices/LiChuangService/LiChuangService.csproj -c Release -r linux-arm -o ../../../../publish/dist/linux-arm64/publish/apps/LiChuangService
gradle build -p ../projects/IoT/IoTServices/NJWLService
set endtime=%time%
echo %startime% %endtime%

32
publish/src/linux-arm64/publish/install.sh
Unescape View File

@ -1,16 +1,16 @@
add-apt-repository ppa:openjdk-r/ppa sudo add-apt-repository ppa:openjdk-r/ppa
apt-get -y install openjdk-8-jdk sudo apt-get -y install openjdk-8-jdk
apt-get -y install supervisor sudo apt-get -y install supervisor
mkdir -p /root/publish/logs sudo mkdir -p /home/pi/publish/logs
mv /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk sudo mv /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk
mv /root/publish/supervisord.conf /etc/supervisor/supervisord.conf sudo mv /home/pi/publish/supervisord.conf /etc/supervisor/supervisord.conf
chmod 777 /root/publish/apps/IoTNode/IoTNode sudo chmod 777 /home/pi/publish/apps/IoTNode/IoTNode
chmod 777 /root/publish/apps/NJWLService/start.sh sudo chmod 777 /home/pi/publish/apps/NJWLService/start.sh
chmod 777 /root/publish/apps/NJWLService/NJWLService.jar sudo chmod 777 /home/pi/publish/apps/NJWLService/NJWLService.jar
chmod 777 /root/publish/apps/APService/APService sudo chmod 777 /home/pi/publish/apps/APService/APService
chmod 777 /root/publish/apps/ONVIFService/ONVIFService sudo chmod 777 /home/pi/publish/apps/ONVIFService/ONVIFService
chmod 777 /root/publish/apps/ONVIFService/wwwroot/ffmpeg-linux-arm64 sudo chmod 777 /home/pi/publish/apps/ONVIFService/wwwroot/ffmpeg-linux-arm64
chmod 777 /root/publish/apps/SerialPortService/SerialPortService sudo chmod 777 /home/pi/publish/apps/SerialPortService/SerialPortService
chmod 777 /root/publish/apps/LiChuangService/LiChuangService sudo chmod 777 /home/pi/publish/apps/LiChuangService/LiChuangService
chmod 777 /root/publish/apps/srs/objs/srs sudo chmod 777 /home/pi/publish/apps/srs/objs/srs
service supervisor restart sudo service supervisor restart

10
publish/src/linux-arm64/publish/supervisor/apservice.conf
Unescape View File

@ -1,8 +1,8 @@
[program:apservice] [program:apservice]
command=/root/publish/apps/APService/APService command=/home/pi/publish/apps/APService/APService
directory=/root/publish/apps/APService/ directory=/home/pi/publish/apps/APService/
autostart=true autostart=true
autorestart=true autorestart=true
user=root user=pi
stdout_logfile=/root/publish/logs/apservice.log stdout_logfile=/home/pi/publish/logs/apservice.log
stderr_logfile=/root/publish/logs/apservice.err stderr_logfile=/home/pi/publish/logs/apservice.err

10
publish/src/linux-arm64/publish/supervisor/iotnode.conf
Unescape View File

@ -1,8 +1,8 @@
[program:iotnode] [program:iotnode]
command=/root/publish/apps/IoTNode/IoTNode command=/home/pi/publish/apps/IoTNode/IoTNode
directory=/root/publish/apps/IoTNode/ directory=/home/pi/publish/apps/IoTNode/
autostart=true autostart=true
autorestart=true autorestart=true
user=root user=pi
stdout_logfile=/root/publish/logs/iotnode.log stdout_logfile=/home/pi/publish/logs/iotnode.log
stderr_logfile=/root/publish/logs/iotnode.err stderr_logfile=/home/pi/publish/logs/iotnode.err

10
publish/src/linux-arm64/publish/supervisor/lichuang.conf
Unescape View File

@ -1,8 +1,8 @@
[program:lichangservice] [program:lichangservice]
command=/root/publish/apps/LiChuangService/LiChuangService command=/home/pi/publish/apps/LiChuangService/LiChuangService
directory=/root/publish/apps/LiChuangService/ directory=/home/pi/publish/apps/LiChuangService/
autostart=true autostart=true
autorestart=true autorestart=true
user=root user=pi
stdout_logfile=/root/publish/logs/lichangservice.log stdout_logfile=/home/pi/publish/logs/lichangservice.log
stderr_logfile=/root/publish/logs/lichangservice.err stderr_logfile=/home/pi/publish/logs/lichangservice.err

10
publish/src/linux-arm64/publish/supervisor/njwlservice.conf
Unescape View File

@ -1,10 +1,10 @@
[program:njwlservice] [program:njwlservice]
directory=/root/publish/apps/NJWLService/ directory=/home/pi/publish/apps/NJWLService/
command=bash /root/publish/apps/NJWLService/start.sh command=bash /home/pi/publish/apps/NJWLService/start.sh
autostart=true autostart=true
autorestart=true autorestart=true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
user=root user=pi
stdout_logfile=/root/publish/logs/njwlservice.log stdout_logfile=/home/pi/publish/logs/njwlservice.log
stderr_logfile=/root/publish/logs/njwlservice.err stderr_logfile=/home/pi/publish/logs/njwlservice.err

10
publish/src/linux-arm64/publish/supervisor/onvifservice.conf
Unescape View File

@ -1,10 +1,10 @@
[program:onvifservice] [program:onvifservice]
command=/root/publish/apps/ONVIFService/ONVIFService command=/home/pi/publish/apps/ONVIFService/ONVIFService
directory=/root/publish/apps/ONVIFService/ directory=/home/pi/publish/apps/ONVIFService/
autostart=true autostart=true
autorestart=true autorestart=true
stopasgroup=true stopasgroup=true
killasgroup=true killasgroup=true
user=root user=pi
stdout_logfile=/root/publish/logs/onvifservice.log stdout_logfile=/home/pi/publish/logs/onvifservice.log
stderr_logfile=/root/publish/logs/onvifservice.err stderr_logfile=/home/pi/publish/logs/onvifservice.err

10
publish/src/linux-arm64/publish/supervisor/spservice.conf
Unescape View File

@ -1,8 +1,8 @@
[program:spservice] [program:spservice]
command=/root/publish/apps/SerialPortService/SerialPortService command=/home/pi/publish/apps/SerialPortService/SerialPortService
directory=/root/publish/apps/SerialPortService/ directory=/home/pi/publish/apps/SerialPortService/
autostart=true autostart=true
autorestart=true autorestart=true
user=root user=pi
stdout_logfile=/root/publish/logs/spservice.log stdout_logfile=/home/pi/publish/logs/spservice.log
stderr_logfile=/root/publish/logs/spservice.err stderr_logfile=/home/pi/publish/logs/spservice.err

10
publish/src/linux-arm64/publish/supervisor/srs.conf
Unescape View File

@ -1,8 +1,8 @@
[program:srs] [program:srs]
directory=/root/publish/apps/srs directory=/home/pi/publish/apps/srs
command=/root/publish/apps/srs/objs/srs -c /root/publish/apps/srs/conf/srs.conf command=/home/pi/publish/apps/srs/objs/srs -c /home/pi/publish/apps/srs/conf/srs.conf
autostart=true autostart=true
autorestart=true autorestart=true
user=root user=pi
stdout_logfile=/root/publish/logs/srs.log stdout_logfile=/home/pi/publish/logs/srs.log
stderr_logfile=/root/publish/logs/srs.err stderr_logfile=/home/pi/publish/logs/srs.err

2
publish/src/linux-arm64/publish/supervisord.conf
Unescape View File

@ -29,4 +29,4 @@ password=pwd
; include files themselves. ; include files themselves.
[include] [include]
files = /root/publish/supervisor/*.conf files = /home/pi/publish/supervisor/*.conf

Write Preview
Loading…
Cancel
Save