fix:精简工程

2026-04-01 15:03:20 +08:00
parent a7a67296e3
commit 6551f227be
37 changed files with 4063 additions and 586172 deletions
--- a/bash/camera_manager.sh
+++ b/bash/camera_manager.sh
@@ -0,0 +1,137 @@
+#!/bin/bash
+
+# 配置区
+APP_NAME="lj360_camera"
+WORK_DIR="/home/ztl/LJ360"
+PYTHON_SCRIPT="web.py"
+USER="ztl"  # 替换为实际用户名（当前是 root，但建议用普通用户）
+
+SYSTEMD_SERVICE_FILE="/etc/systemd/system/${APP_NAME}.service"
+SCRIPT_PATH="$WORK_DIR/camera_manager.sh"
+
+# 日志文件（保活日志）
+LOG_FILE="$WORK_DIR/${APP_NAME}_keepalive.log"
+
+# 启动主程序（带保活循环）
+start_app() {
+    cd "$WORK_DIR" || exit 1
+    echo "$(date): 启动 $APP_NAME 应用..." >> "$LOG_FILE"
+    while true; do
+        if python3 "$PYTHON_SCRIPT"; then
+            echo "$(date): 程序正常退出，即将重启..." >> "$LOG_FILE"
+        else
+            echo "$(date): 程序异常退出（代码 $?），5秒后重启..." >> "$LOG_FILE"
+        fi
+        sleep 5
+    done
+}
+
+# 创建 systemd 服务文件
+create_systemd_service() {
+    cat > "$SYSTEMD_SERVICE_FILE" <<EOF
+[Unit]
+Description=LJ360 Four-Camera BirdView System
+After=multi-user.target
+
+[Service]
+Type=simple
+User=$USER
+WorkingDirectory=$WORK_DIR
+ExecStart=/bin/bash $SCRIPT_PATH run
+Restart=always
+RestartSec=5
+
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+    chmod 644 "$SYSTEMD_SERVICE_FILE"
+    systemctl daemon-reload
+    echo "✅ systemd 服务已创建: $APP_NAME"
+}
+
+# 启用开机自启
+enable_autostart() {
+    create_systemd_service
+    systemctl enable "$APP_NAME".service
+    systemctl start "$APP_NAME".service
+    echo "✅ 已启用开机自启，并启动服务"
+}
+
+# 禁用开机自启
+disable_autostart() {
+    systemctl stop "$APP_NAME".service 2>/dev/null
+    systemctl disable "$APP_NAME".service 2>/dev/null
+    rm -f "$SYSTEMD_SERVICE_FILE"
+    systemctl daemon-reload
+    echo "✅ 已禁用开机自启，并移除服务"
+}
+
+# 显示状态
+show_status() {
+    if systemctl is-active --quiet "$APP_NAME".service; then
+        echo "🟢 服务正在运行（开机自启已启用）"
+        systemctl status "$APP_NAME".service --no-pager
+    elif [ -f "$SYSTEMD_SERVICE_FILE" ]; then
+        echo "🟠 服务已安装但未运行"
+    else
+        echo "🔴 服务未安装（开机自启已关闭）"
+    fi
+}
+
+# 主菜单
+show_menu() {
+    echo "========================================"
+    echo "   LJ360 摄像头系统管理工具"
+    echo "========================================"
+    show_status
+    echo ""
+    echo "请选择操作："
+    echo "  1) 启用开机自启并启动服务"
+    echo "  2) 禁用开机自启并停止服务"
+    echo "  3) 仅手动运行一次（不保活）"
+    echo "  4) 查看日志"
+    echo "  0) 退出"
+    echo -n "请输入编号 (0-4): "
+}
+
+# 处理命令行参数（用于 systemd 调用）
+if [ "$1" = "run" ]; then
+    start_app
+    exit 0
+fi
+
+# 交互式主程序
+while true; do
+    show_menu
+    read -r choice
+
+    case $choice in
+        1)
+            enable_autostart
+            ;;
+        2)
+            disable_autostart
+            ;;
+        3)
+            echo "🚀 手动运行一次（Ctrl+C 可退出）..."
+            cd "$WORK_DIR" && python3 "$PYTHON_SCRIPT"
+            ;;
+        4)
+            echo "📄 最近日志（最后 20 行）："
+            tail -n 20 "$LOG_FILE"
+            echo -n "按回车返回菜单..."
+            read -r
+            ;;
+        0)
+            echo "退出。"
+            exit 0
+            ;;
+        *)
+            echo "❌ 无效选项，请输入 0-4"
+            sleep 1
+            ;;
+    esac
+    echo ""
+done
--- a/bash/close_shell.sh
+++ b/bash/close_shell.sh
@@ -0,0 +1,14 @@
+#查找进场pid
+pname=$1
+pid=`ps -ef|grep ${pname}|grep -v "grep"|awk '{print $2}'`
+echo $pid
+#pid转换数组
+pids=($pid)
+#循环kill
+for pid in ${pids[@]}
+do
+    echo kill${pid}
+    kill -9 $pid
+    echo kill${pid}success
+    sleep 1
+done
--- a/bash/test_cameras.sh
+++ b/bash/test_cameras.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+sudo gst-launch-1.0 \
+    glvideomixer name=mix \
+        sink_0::xpos=0 sink_0::ypos=0 sink_0::width=960 sink_0::height=540 \
+        sink_1::xpos=960 sink_1::ypos=0 sink_1::width=960 sink_1::height=540 \
+        sink_2::xpos=0 sink_2::ypos=540 sink_2::width=960 sink_2::height=540 \
+        sink_3::xpos=960 sink_3::ypos=540 sink_3::width=960 sink_3::height=540 ! \
+    fpsdisplaysink video-sink=glimagesink sync=false \
+    v4l2src device=/dev/video0 ! video/x-raw,format=NV12,width=1280,height=720 ! glupload ! mix.sink_0 \
+    v4l2src device=/dev/video1 ! video/x-raw,format=NV12,width=1280,height=720 ! glupload ! mix.sink_1 \
+    v4l2src device=/dev/video2 ! video/x-raw,format=NV12,width=1280,height=720 ! glupload ! mix.sink_2 \
+    v4l2src device=/dev/video3 ! video/x-raw,format=NV12,width=1280,height=720 ! glupload ! mix.sink_3
--- a/bash/video_tool.sh
+++ b/bash/video_tool.sh
@@ -13,13 +13,35 @@ PYTHON_SCRIPT="web.py"
 USER="ztl"

 SYSTEMD_SERVICE_FILE="/etc/systemd/system/${APP_NAME}.service"
-SCRIPT_PATH="$WORK_DIR/camera_manager.sh"
+SCRIPT_PATH="$WORK_DIR/bash/camera_manager.sh"

-# 日志文件（保活日志）
+# 日志文件
 LOG_FILE="$WORK_DIR/${APP_NAME}_keepalive.log"
+# logrotate 配置文件路径
+LOGROTATE_CONF="/etc/logrotate.d/${APP_NAME}"

-# 启动主程序（带保活循环）
+# 1. 配置 logrotate (限制日志大小为 10K)
+setup_logrotate() {
+    cat > "$LOGROTATE_CONF" <<EOF
+$LOG_FILE {
+    size 10k
+    rotate 3
+    compress
+    delaycompress
+    missingok
+    notifempty
+    copytruncate
+    create 644 $USER $USER
+}
+EOF
+    echo "✅ 日志轮替规则已配置 (限制 10k)"
+}
+
+# 2. 启动主程序（带保活循环）
 start_app() {
+    # 确保 logrotate 配置存在
+    setup_logrotate
+    
    cd "$WORK_DIR" || exit 1
    echo "$(date): 启动 $APP_NAME 应用..." >> "$LOG_FILE"
    while true; do
@@ -28,11 +50,16 @@ start_app() {
        else
            echo "$(date): 程序异常退出（代码 $?），5秒后重启..." >> "$LOG_FILE"
        fi
+        
+        # 强制运行 logrotate 检查大小
+        # 注意：虽然 logrotate 通常由 cron 每天运行，但这里手动调用以确保实时性
+        logrotate -f "$LOGROTATE_CONF" 2>/dev/null
+        
        sleep 5
    done
 }

-# 创建 systemd 服务文件
+# 3. 创建 systemd 服务文件
 create_systemd_service() {
    cat > "$SYSTEMD_SERVICE_FILE" <<EOF
 [Unit]
@@ -61,7 +88,7 @@ EOF
    echo "✅ systemd 服务已创建: $APP_NAME"
 }

-# 启用开机自启
+# 4. 启用开机自启
 enable_autostart() {
    # 确保 ztl 用户有串口和摄像头权限
    usermod -aG dialout ztl 2>/dev/null
@@ -77,16 +104,17 @@ enable_autostart() {
    echo "✅ 已启用开机自启，并以 ztl 用户启动服务"
 }

-# 禁用开机自启
+# 5. 禁用开机自启
 disable_autostart() {
    systemctl stop "$APP_NAME".service 2>/dev/null
    systemctl disable "$APP_NAME".service 2>/dev/null
    rm -f "$SYSTEMD_SERVICE_FILE"
+    rm -f "$LOGROTATE_CONF" # 同时删除 logrotate 配置
    systemctl daemon-reload
    echo "✅ 已禁用开机自启，并移除服务"
 }

-# 显示状态
+# 6. 显示状态
 show_status() {
    if systemctl is-active --quiet "$APP_NAME".service; then
        echo "🟢 服务正在运行（开机自启已启用）"
@@ -98,7 +126,7 @@ show_status() {
    fi
 }

-# 主菜单
+# 7. 主菜单
 show_menu() {
    echo "========================================"
    echo "   LJ360 摄像头系统管理工具"
@@ -152,4 +180,4 @@ while true; do
            ;;
    esac
    echo ""
-done
+done