diff --git a/README.md b/README.md index 7b7aec1..bdb3f54 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ docker run -d \ cdcddcdc/m7s-jt1078:latest ``` -2. 增加对讲功能 +2. 增加对讲功能 [参考配置](./example/jt1078/docker_intercom_config.yaml) ``` docker run -d \ -v /home/m7s-jt1078/go-jt808.online.crt:/app/go-jt808.online.crt \ diff --git a/example/jt1078/docker_intercom_config.yaml b/example/jt1078/docker_intercom_config.yaml new file mode 100644 index 0000000..68796a9 --- /dev/null +++ b/example/jt1078/docker_intercom_config.yaml @@ -0,0 +1,51 @@ +global: + publish: + publish_timeout: 30s # 将无数据超时改为30秒 + http: + listen_addr: ":10001" + listen_addr_tls: ":10003" # 用于HTTPS方式访问API的端口配置 + cert_file: "go-jt808.online.crt" + key_file: "go-jt808.online.key" + tcp: + listen_addr: ":10002" + +mp4: + enable: true + +webrtc: + enable: true + port: tcp:10053 + +jt1078: + enable: true + + intercom: + enable: true # 是否启用 用于双向对讲 + jt1078webrtc: + port: 10010 # 对讲默认udp端口 + ip: "101.35.2.3" # 外网ip 用于SDP协商修改 + audio_ports: [10020, 10050] # 音频端口范围 [min,max] + on_join_url: "http://127.0.0.1:10001/api/v1/jt808/event/join-audio" # 设备连接到音频端口的回调 + on_leave_url: "http://127.0.0.1:10001/api/v1/jt808/event/leave-audio" # 设备断开了音频端口的回调 + overtime_second: 60 # 多久没有下发对讲语言的数据 就关闭这个链接 + + realtime: # 实时视频 + addr: '0.0.0.0:10051' + on_join_url: "http://127.0.0.1:10001/api/v1/jt808/event/real-time-join" + on_leave_url: "http://127.0.0.1:10001/api/v1/jt808/event/real-time-leave" + prefix: "live/jt1078" # 默认自定义前缀-手机号-通道 如：live/jt1078-295696659617-1 + overtime_second: 0 # 无人订阅的情况 多久就关闭这个链接（小于等于0则不启用 默认0 推荐还是使用9102指令去触发关闭) + + playback: # 回放视频 + addr: '0.0.0.0:10052' + on_join_url: "http://127.0.0.1:10001/api/v1/jt808/play-back-join" + on_leave_url: "http://127.0.0.1:10001/api/v1/jt808/play-back-leave" + prefix: "live/jt1079" # 默认自定义前缀-手机号-通道 如：live/jt1079-295696659617-1 + overtime_second: 0 # 无人订阅的情况 多久就关闭这个链接（小于等于0则不启用 默认0 推荐还是使用9102指令去触发关闭) + + simulations: + # jt1078文件 默认循环发送 + - name: ./data.txt + addr: 127.0.0.1:10051 # 模拟实时 + - name: ./audio_data.txt + addr: 127.0.0.1:10052 # 模拟回放 diff --git a/example/jt1078/docker_video_config.yaml b/example/jt1078/docker_video_config.yaml index 2a8eef1..bd3dda8 100644 --- a/example/jt1078/docker_video_config.yaml +++ b/example/jt1078/docker_video_config.yaml @@ -9,6 +9,13 @@ global: tcp: listen_addr: ":10002" +mp4: + enable: true + +webrtc: + enable: true + port: tcp:10053 + jt1078: enable: true @@ -42,10 +49,3 @@ jt1078: addr: 127.0.0.1:10051 # 模拟实时 - name: ./audio_data.txt addr: 127.0.0.1:10052 # 模拟回放 - -mp4: - enable: true - -webrtc: - enable: true - port: tcp:10053 \ No newline at end of file diff --git a/example/jt1078/go.mod b/example/jt1078/go.mod index b32b4ac..0d75223 100644 --- a/example/jt1078/go.mod +++ b/example/jt1078/go.mod @@ -3,7 +3,7 @@ module jt1078 go 1.23.8 require ( - github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 + github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1 m7s.live/v5 v5.0.3 ) @@ -18,7 +18,6 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/deepch/vdk v0.0.27 // indirect github.com/go-ole/go-ole v1.3.0 // indirect - github.com/go-resty/resty/v2 v2.16.5 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/gobwas/httphead v0.1.0 // indirect diff --git a/example/jt1078/go.sum b/example/jt1078/go.sum index 056a8e9..723b465 100644 --- a/example/jt1078/go.sum +++ b/example/jt1078/go.sum @@ -18,8 +18,8 @@ github.com/cilium/ebpf v0.15.0 h1:7NxJhNiBT3NG8pZJ3c+yfrVdHY8ScgKD27sScgjLMMk= github.com/cilium/ebpf v0.15.0/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso= github.com/cuteLittleDevil/go-jt808/protocol v1.16.0 h1:svWxOTAfKLchDp/5kwwVVhoFprLM98QJUgmYCs5ixj8= github.com/cuteLittleDevil/go-jt808/protocol v1.16.0/go.mod h1:5wF2o2JCjVVj/oAqkwvCzgu23UYMrnDO+PkhiS0/egs= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 h1:XMn2u2qlC0EmrKv+5ILymCBeTs0Oh/tI/9fSlpOxLvU= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0/go.mod h1:U0rfzfNXGUl+3+/jM0/vsBvbNI/F7m5xGKmyl6YnKx0= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1 h1:/nxU2iPfq9CeTC8oh6eC4vuDgBhjz/oCHbSPrrFKQQ0= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1/go.mod h1:Q69DAQIdUULhT5B3AEQN5Bqp2Nbk5Wok+OMS1GtakEo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -33,8 +33,6 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= -github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= -github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=