From 7ec1fc5b695afe7c621f664357c5728d1982470d Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 28 Mar 2023 11:10:57 +0800 Subject: [PATCH] update --- README.md | 9 ++++++++- env/app.sh | 1 + env/browser.sh | 3 +++ env/rootfs/root/Desktop/entry.desktop | 1 + env/rootfs/usr/share/applications/entry.desktop | 8 ++++++++ env/startup.sh | 1 - sh/boardinit.sh | 7 +++++++ 工程对接.md | 11 +++++++++++ 8 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 env/browser.sh create mode 120000 env/rootfs/root/Desktop/entry.desktop create mode 100755 env/rootfs/usr/share/applications/entry.desktop create mode 100644 工程对接.md diff --git a/README.md b/README.md index ba15b32..c42a5d6 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,14 @@ # 板子环境初始化 ./sh/boardinit.sh --deviceId --ftpserver 47.92.195.73 --fixmac true --ip # demo -./sh/boardinit.sh --deviceId intelligent_light_pole01 --ftpserver 47.92.195.73 --fixmac true --ip 192.168.1.192 +./sh/boardinit.sh \ +--deviceId intelligent_light_pole01 \ +--ftpserver 47.92.195.73 \ +--fixmac true \ +--ip 192.168.1.191 \ +--startup_url https://shjyy.becloud.net.cn/WaterWorks/#/?id=855 \ +--aiui_auth_id ac30105366ea460f9ff08ddac0c4f712 + # 初始化环境 ./sh/iflytool.sh envsetup diff --git a/env/app.sh b/env/app.sh index 8a542e5..7a2d548 100644 --- a/env/app.sh +++ b/env/app.sh @@ -1,4 +1,5 @@ #!/bin/bash cd /app source /etc/device_info.env +killall app.out ./app.out --device_id ${DEVICE_ID} --aiui_auth_id ${AIUI_AUTH_ID} \ No newline at end of file diff --git a/env/browser.sh b/env/browser.sh new file mode 100644 index 0000000..6495b21 --- /dev/null +++ b/env/browser.sh @@ -0,0 +1,3 @@ +#!/bin/bash +source /etc/device_info.env +firefox --kiosk ${STARTUP_DEFAULT_URL} & \ No newline at end of file diff --git a/env/rootfs/root/Desktop/entry.desktop b/env/rootfs/root/Desktop/entry.desktop new file mode 120000 index 0000000..4f12adf --- /dev/null +++ b/env/rootfs/root/Desktop/entry.desktop @@ -0,0 +1 @@ +../..//usr/share/applications/entry.desktop \ No newline at end of file diff --git a/env/rootfs/usr/share/applications/entry.desktop b/env/rootfs/usr/share/applications/entry.desktop new file mode 100755 index 0000000..3e0d3eb --- /dev/null +++ b/env/rootfs/usr/share/applications/entry.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=entry +Icon=chromium-browser +Exec=/app/browser.sh +Terminal=false +X-MultipleArgs=false +Categories=Network;WebBrowser; \ No newline at end of file diff --git a/env/startup.sh b/env/startup.sh index c1df478..4e6b739 100755 --- a/env/startup.sh +++ b/env/startup.sh @@ -1,5 +1,4 @@ #！/bin/bash cd /app -firefox --kiosk www.baidu.com ./app.sh ./app_monitor.sh & diff --git a/sh/boardinit.sh b/sh/boardinit.sh index 62d04bc..6ab4794 100755 --- a/sh/boardinit.sh +++ b/sh/boardinit.sh @@ -45,6 +45,7 @@ function generate_device_info() { echo "DEVICE_ID=${DEVICE_ID}" >/etc/device_info.env echo "FRP_SERVER_ADDR=${FTP_SERVER_ADDR}" >>/etc/device_info.env echo "AIUI_AUTH_ID=${AIUI_AUTH_ID}" >>/etc/device_info.env + echo "STARTUP_DEFAULT_URL=${STARTUP_DEFAULT_URL}" >>/etc/device_info.env echo "+++++++++ create /etc/device_info.env +++++++++" cat /etc/device_info.env @@ -100,6 +101,7 @@ DEVICE_ID="" FTP_SERVER_ADDR="" AIUI_AUTH_ID="" FIX_MAC="" +STARTUP_DEFAULT_URL="" PARAMETERS=$@ EXEC_IN_BOARD=false @@ -136,6 +138,11 @@ for i in "$@"; do IP=$1 shift ;; + --startup_url) + shift + STARTUP_DEFAULT_URL=$1 + shift + ;; *) # unknown option ;; diff --git a/工程对接.md b/工程对接.md new file mode 100644 index 0000000..a47e4df --- /dev/null +++ b/工程对接.md @@ -0,0 +1,11 @@ +河长牌、厂长牌线上地址 + http://www.hangzhoubewg.com/RiverCardYHT/rivercard.html + +河长牌终端屏幕展示软件地址 + 河长牌：两个网址不一样，两个都用 + https://shjyy.becloud.net.cn/RiverCardHGG/rivercard.html + https://shjyy.becloud.net.cn/RiverCardYHT/rivercard.html?url=1 + + 厂长牌： + https://shjyy.becloud.net.cn/WaterWorks/#/?id=855 + \ No newline at end of file