update

README.md

@@ -10,7 +10,14 @@
 # 板子环境初始化
 ./sh/boardinit.sh --deviceId <deviceId> --ftpserver 47.92.195.73 --fixmac true --ip <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 

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}

env/browser.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+source /etc/device_info.env
+firefox --kiosk ${STARTUP_DEFAULT_URL} &

env/rootfs/root/Desktop/entry.desktop

@@ -0,0 +1 @@
+../..//usr/share/applications/entry.desktop

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;

env/startup.sh

@@ -1,5 +1,4 @@
 #！/bin/bash
 cd /app
-firefox --kiosk www.baidu.com
 ./app.sh
 ./app_monitor.sh &

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
         ;;

工程对接.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
+