From fc97febe1da97a9cadb12fc32f247b34eb0d5e7c Mon Sep 17 00:00:00 2001 From: xiaoxie <hotcoffie@163.com> Date: 星期四, 21 四月 2022 13:46:16 +0800 Subject: [PATCH] 全局布局调整补充：之前路由把两个播放器界面也加入全局样式，现在移出到一级路由 --- README.md | 161 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 134 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 5223cf9..aec9555 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,143 @@ -# wvp -WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勭綉缁滆棰戝钩鍙帮紝璐熻矗瀹炵幇鏍稿績淇′护涓庤澶囩鐞嗗悗鍙伴儴鍒嗭紝鏀寔NAT绌块�忥紝鏀寔娴峰悍銆佸ぇ鍗庛�佸畤瑙嗙瓑鍝佺墝鐨処PC銆丯VR銆丏VR鎺ュ叆銆� 娴佸獟浣撴湇鍔″熀浜嶼LMediaKit-https://github.com/xiongziliang/ZLMediaKit 鍓嶇灞曠ず鍩轰簬MediaServerUI-https://gitee.com/kkkkk5G/MediaServerUI/tree/gb28181/ + +# 寮�绠卞嵆鐢ㄧ殑鐨�28181鍗忚瑙嗛骞冲彴 + +[](https://travis-ci.org/xia-chu/ZLMediaKit) +[](https://github.com/xia-chu/ZLMediaKit/blob/master/LICENSE) +[](https://en.cppreference.com/) +[](https://github.com/xia-chu/ZLMediaKit) +[](https://github.com/xia-chu/ZLMediaKit/pulls) + + +WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勫紑绠卞嵆鐢ㄧ殑缃戠粶瑙嗛骞冲彴锛岃礋璐ｅ疄鐜版牳蹇冧俊浠や笌璁惧绠＄悊鍚庡彴閮ㄥ垎锛屾敮鎸丯AT绌块�忥紝鏀寔娴峰悍銆佸ぇ鍗庛�佸畤瑙嗙瓑鍝佺墝鐨処PC銆丯VR鎺ュ叆銆傛敮鎸佸浗鏍囩骇鑱旓紝鏀寔灏嗕笉甯﹀浗鏍囧姛鑳界殑鎽勫儚鏈�/鐩存挱娴�/鐩存挱鎺ㄦ祦杞彂鍒板叾浠栧浗鏍囧钩鍙般�� + +娴佸獟浣撴湇鍔″熀浜嶡澶忔 ZLMediaKit [https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit) +鎾斁鍣ㄤ娇鐢ˊdexter jessibuca [https://github.com/langhuihui/jessibuca/tree/v3](https://github.com/langhuihui/jessibuca/tree/v3) +鍓嶇椤甸潰鍩轰簬@Kyle MediaServerUI [https://gitee.com/kkkkk5G/MediaServerUI](https://gitee.com/kkkkk5G/MediaServerUI) 杩涜淇敼. # 搴旂敤鍦烘櫙锛� -涓昏搴旂敤鍦↖PC绛夎澶囨病鏈夊浐瀹欼P鍦板潃锛屼絾闇�瑕佸湪浜掕仈缃戜腑瑙傜湅鐨勫満鏅�� -瑕佹眰IPC璁惧鍙互璁块棶浜掕仈缃戯紝鏈変簯鏈嶅姟鍣ㄧ敤浜庨儴缃叉湰鏈嶅姟銆� -棰勮7鏈堝彲浠ヨ揪鍒板晢鐢ㄧ骇鍒殑鏂囨。鎬� +鏀寔娴忚鍣ㄦ棤鎻掍欢鎾斁鎽勫儚澶磋棰戙�� +鏀寔鎽勫儚鏈恒�佸钩鍙般�丯VR绛夎澶囨帴鍏ャ�� +鏀寔鍥芥爣绾ц仈銆� +鏀寔rtsp/rtmp绛夎棰戞祦杞彂鍒板浗鏍囧钩鍙般�� +鏀寔rtsp/rtmp绛夋帹娴佽浆鍙戝埌鍥芥爣骞冲彴銆� -# 鏀寔鐗规�э細 -1銆佽棰戦瑙� -2銆佷簯鍙版帶鍒讹紙鏂瑰悜銆佺缉鏀炬帶鍒讹級 -3銆佽棰戣澶囦俊鎭悓姝� -4銆佺鍦ㄧ嚎鐩戞帶 -5銆佸綍鍍忔煡璇笌鍥炴斁锛堝熀浜嶯VR\DVR锛屾殏涓嶆敮鎸佸揩杩涖�乻eek鎿嶄綔锛� -6銆佹棤浜鸿鐪嬭嚜鍔ㄦ柇娴� +# 椤圭洰鐩爣 +鏃ㄥ湪鎵撻�犱竴涓槗閰嶇疆,鏄撲娇鐢�,渚夸簬缁存姢鐨�28181鍥芥爣淇′护绯荤粺, 渚濇墭浼樼鐨勫紑婧愭祦濯掍綋鏈嶅姟妗嗘灦ZLMediaKit, 瀹炵幇涓�涓畬鏁存槗鐢℅B28181骞冲彴. -# 2020璺嚎鍥撅細 -5鏈堜腑鏃�-褰曞儚鍥炴斁锛堝熀浜嶯VR\DVR锛夈�佽澶囪璇侊紙鍩轰簬瀵嗙爜锛� -5鏈堜笅鏃�-璁惧鎶ヨ -6鏈堜笂鏃�-娴佸獟浣撹璇侊紙ZLM鎺ㄦ祦銆佸彇娴侊級 -6鏈堜笅鏃�-璇煶瀵硅銆丄ndroid Deme\iOS Demo -7鏈堜笅鏃�-璁惧璁よ瘉锛堝熀浜庢暟瀛楄瘉涔︼級銆侀泦缇ら儴缃� -8鏈堜笅鏃�-浜戠褰曞儚涓庡洖鏀� -9鏈堜笅鏃�-Onvif鍗忚鏀寔 -10鏈堜笅鏃�-GB28181-2011鐗堣澶囬�傞厤 -12鏈堝簳-涓婄骇绾ц仈銆佹椂闂村悓姝ャ�佸叾浠栧浗鏍囪兘鍔� +# 閮ㄧ讲鏂囨。 +[https://github.com/648540858/wvp-GB28181-pro/wiki](https://github.com/648540858/wvp-GB28181-pro/wiki) -# 椤圭洰閮ㄧ讲 -鍙傝�僿iki璇存槑 +# gitee鍚屾浠撳簱 +https://gitee.com/pan648540858/wvp-GB28181-pro.git + +# 鎴浘 + + + + + + + + +# 1.0 鍩虹鐗规�� +1. 瑙嗛棰勮; +2. 浜戝彴鎺у埗锛堟柟鍚戙�佺缉鏀炬帶鍒讹級; +3. 瑙嗛璁惧淇℃伅鍚屾; +4. 绂诲湪绾跨洃鎺�; +5. 褰曞儚鏌ヨ涓庡洖鏀撅紙鍩轰簬NVR\DVR锛屾殏涓嶆敮鎸佸揩杩涖�乻eek鎿嶄綔锛�; +6. 鏃犱汉瑙傜湅鑷姩鏂祦; +7. 鏀寔UDP鍜孴CP涓ょ鍥芥爣淇′护浼犺緭妯″紡; +8. 闆嗘垚web鐣岄潰, 涓嶉渶瑕佸崟鐙儴缃插墠绔湇鍔�, 鐩存帴鍒╃敤wvp鍐呯疆鏂囦欢鏈嶅姟閮ㄧ讲, 闅弚vp涓�璧烽儴缃�; +9. 鏀寔骞冲彴鎺ュ叆, 閽堝澶у钩鍙板ぇ閲忚澶囩殑鎯呭喌杩涜浼樺寲; +10. 鏀寔妫�绱�,閫氶亾绛涢��; +11. 鏀寔鑷姩閰嶇疆ZLM濯掍綋鏈嶅姟, 鍑忓皯鍥犻厤缃棶棰樻墍鍑虹幇鐨勯棶棰�; +12. 鏀寔鍚敤udp澶氱鍙ｆā寮�, 鎻愰珮udp妯″紡涓嬪獟浣撲紶杈撴�ц兘; +13. 鏀寔閫氶亾鏄惁鍚湁闊抽鐨勮缃�; +14. 鏀寔閫氶亾瀛愮洰褰曟煡璇�; +15. 鏀寔udp/tcp鍥芥爣娴佷紶杈撴ā寮�; +16. 鏀寔鐩存帴杈撳嚭RTSP銆丷TMP銆丠TTP-FLV銆乄ebsocket-FLV銆丠LS澶氱鍗忚娴佸湴鍧� +17. 鏀寔鍥芥爣缃戠粶鏍℃椂 +18. 鏀寔鍏綉閮ㄧ讲, 鏀寔wvp涓巣lm鍒嗗紑閮ㄧ讲 +19. 鏀寔鎾斁h265, g.711鏍煎紡鐨勬祦(闇�瑕佸皢closeWaitRTPInfo璁句负false) +20. 鎶ヨ淇℃伅澶勭悊锛屾敮鎸佸悜鍓嶇鎺ㄩ�佹姤璀︿俊鎭� + +# 1.0 鏂版敮鎸佺壒鎬� +1. 闆嗘垚web鐣岄潰, 涓嶉渶瑕佸崟鐙儴缃插墠绔湇鍔�, 鐩存帴鍒╃敤wvp鍐呯疆鏂囦欢鏈嶅姟閮ㄧ讲, 闅弚vp涓�璧烽儴缃�; +2. 鏀寔骞冲彴鎺ュ叆, 閽堝澶у钩鍙板ぇ閲忚澶囩殑鎯呭喌杩涜浼樺寲; +3. 鏀寔妫�绱�,閫氶亾绛涢��; +4. 鏀寔鑷姩閰嶇疆ZLM濯掍綋鏈嶅姟, 鍑忓皯鍥犻厤缃棶棰樻墍鍑虹幇鐨勯棶棰�; +5. 鏀寔鍚敤udp澶氱鍙ｆā寮�, 鎻愰珮udp妯″紡涓嬪獟浣撲紶杈撴�ц兘; +6. 鏀寔閫氶亾鏄惁鍚湁闊抽鐨勮缃�; +7. 鏀寔閫氶亾瀛愮洰褰曟煡璇�; +8. 鏀寔udp/tcp鍥芥爣娴佷紶杈撴ā寮�; +9. 鏀寔鐩存帴杈撳嚭RTSP銆丷TMP銆丠TTP-FLV銆乄ebsocket-FLV銆丠LS澶氱鍗忚娴佸湴鍧� +10. 鏀寔鍥芥爣缃戠粶鏍℃椂 +11. 鏀寔鍏綉閮ㄧ讲, 鏀寔wvp涓巣lm鍒嗗紑閮ㄧ讲 +12. 鏀寔鎾斁h265, g.711鏍煎紡鐨勬祦 +13. 鏀寔鍥哄畾娴佸湴鍧�鍜岃嚜鍔ㄧ偣鎾紝鍚屾椂鏀寔鏈偣鎾椂鐩存帴鎾斁娴佸湴鍧�锛屼唬鐮佽嚜鍔ㄥ彂璧风偣鎾�. ( [鏌ョ湅WIKI](https://github.com/648540858/wvp-GB28181-pro/wiki/%E5%A6%82%E4%BD%95%E4%BD%BF%E7%94%A8%E5%9B%BA%E5%AE%9A%E6%92%AD%E6%94%BE%E5%9C%B0%E5%9D%80%E4%B8%8E%E8%87%AA%E5%8A%A8%E7%82%B9%E6%92%AD)锛� +14. 鎶ヨ淇℃伅澶勭悊锛屾敮鎸佸悜鍓嶇鎺ㄩ�佹姤璀︿俊鎭� +15. 鏀寔璁㈤槄涓庨�氱煡鏂规硶 + - [X] 绉诲姩浣嶇疆璁㈤槄 + - [X] 绉诲姩浣嶇疆閫氱煡澶勭悊 + - [X] 鎶ヨ浜嬩欢璁㈤槄 + - [X] 鎶ヨ浜嬩欢閫氱煡澶勭悊 + - [X] 璁惧鐩綍璁㈤槄 + - [X] 璁惧鐩綍閫氱煡澶勭悊 +16. 绉诲姩浣嶇疆鏌ヨ鍜屾樉绀猴紝鍙�氳繃閰嶇疆鏂囦欢璁剧疆绉诲姩浣嶇疆鍘嗗彶鏄惁瀛樺偍 + +# 2.0 鏀寔鐗规�� +- [X] 鍥芥爣閫氶亾鍚戜笂绾ц仈 + - [X] WEB娣诲姞涓婄骇骞冲彴 + - [X] 娉ㄥ唽 + - [X] 蹇冭烦淇濇椿 + - [X] 閫氶亾閫夋嫨 + - [X] 閫氶亾鎺ㄩ�� + - [X] 鐐规挱 + - [X] 浜戝彴鎺у埗 + - [X] 骞冲彴鐘舵�佹煡璇� + - [X] 骞冲彴淇℃伅鏌ヨ + - [X] 骞冲彴杩滅▼鍚姩 + - [X] 姣忎釜绾ц仈骞冲彴鍙嚜瀹氫箟鐨勮櫄鎷熺洰褰� + - [X] 鐩綍璁㈤槄涓庨�氱煡 + - [X] 褰曞儚鏌ョ湅涓庢挱鏀� + - [X] GPS璁㈤槄涓庨�氱煡锛堢洿鎾帹娴侊級 +- [X] 娣诲姞RTSP瑙嗛 +- [X] 娣诲姞鎺ュ彛閴存潈 +- [X] 娣诲姞RTMP瑙嗛 +- [X] 浜戠褰曞儚锛堥渶瑕侀儴缃插崟鐙湇鍔￠厤鍚堜娇鐢級 +- [X] 澶氭祦濯掍綋鑺傜偣锛岃嚜鍔ㄩ�夋嫨璐熻浇鏈�浣庣殑鑺傜偣浣跨敤銆� +- [X] 鏀寔浣跨敤mysql浣滀负鏁版嵁搴擄紝榛樿sqlite3,寮�绠卞嵆鐢ㄣ�� +- [X] WEB绔敮鎸佹挱鏀綡264涓嶩265锛岄煶棰戞敮鎸丟.711A/G.711U/AAC,瑕嗙洊鍥芥爣甯哥敤缂栫爜鏍煎紡銆� + +# docker蹇�熶綋楠� +鐩墠浣滆�呯殑docker-compose鍥犱负鏃堕棿鏈夐檺缁存姢涓嶅強鏃讹紝杩欓噷鎻愪緵绗笁鏂规彁渚涚殑渚涘ぇ瀹朵娇鐢紝缁存姢涓嶆槗锛屽ぇ瀹惰寰楃粰杩欎綅灏忎紮浼寸偣涓猻tar銆� +https://github.com/SaltFish001/wvp_pro_compose +[https://github.com/SaltFish001/wvp_pro_compose](https://github.com/SaltFish001/wvp_pro_compose) +杩欐槸浣滆�呯淮鎶ょ殑涓�涓暅鍍忥紝鍙兘瀛樺湪涓嶅強鏃剁殑闂銆� +```shell +docker pull 648540858/wvp_pro + +docker run --env WVP_IP="浣犵殑IP" -it -p 18080:18080 -p 30000-30500:30000-30500/udp -p 30000-30500:30000-30500/tcp -p 80:80 -p 5060:5060 -p 5060:5060/udp 648540858/wvp_pro +``` +docker浣跨敤璇︽儏鏌ョ湅锛歔https://hub.docker.com/r/648540858/wvp_pro](https://hub.docker.com/r/648540858/wvp_pro) + +# gitee鍚屾浠撳簱 +https://gitee.com/pan648540858/wvp-GB28181-pro.git # 浣跨敤甯姪 -鍙傝�僿iki璇存槑 +QQ缇�: 901799015, ZLM浣跨敤鏂囨。[https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit) +QQ绉佷俊涓�鑸笉鍥�, 绮惧姏鏈夐檺.娆㈣繋澶у鍦ㄧ兢閲岃璁�.瑙夊緱椤圭洰瀵逛綘鏈夊府鍔╋紝娆㈣繋star鍜屾彁浜r銆� + # 鑷磋阿 -鎰熻阿浣滆�匸澶忔](https://github.com/xiongziliang) 鎻愪緵杩欎箞妫掔殑寮�婧愭祦濯掍綋鏈嶅姟妗嗘灦 -鎰熻阿浣滆�匸kkkkk5G](https://gitee.com/kkkkk5G) 鎻愪緵杩欎箞妫掔殑鍓嶇UI +鎰熻阿浣滆�匸澶忔](https://github.com/xia-chu) 鎻愪緵杩欎箞妫掔殑寮�婧愭祦濯掍綋鏈嶅姟妗嗘灦,骞跺湪寮�鍙戣繃绋嬩腑缁欎簣鏀寔涓庡府鍔┿�� +鎰熻阿浣滆�匸dexter langhuihui](https://github.com/langhuihui) 寮�婧愯繖涔堝ソ鐢ㄧ殑WEB鎾斁鍣ㄣ�� +鎰熻阿浣滆�匸Kyle](https://gitee.com/kkkkk5G) 寮�婧愪簡濂界敤鐨勫墠绔〉闈� +鎰熻阿鍚勪綅澶т浆鐨勮禐鍔╀互鍙婂椤圭洰鐨勬寚姝ｄ笌甯姪銆傚寘鎷絾涓嶉檺浜庝唬鐮佽础鐚�侀棶棰樺弽棣堛�佽祫閲戞崘璧犵瓑鍚勭鏂瑰紡鐨勬敮鎸侊紒浠ヤ笅鎺掑悕涓嶅垎鍏堝悗锛� +[lawrencehj](https://github.com/lawrencehj) [Smallwhitepig](https://github.com/Smallwhitepig) [swwhaha](https://github.com/swwheihei) +[hotcoffie](https://github.com/hotcoffie) [xiaomu](https://github.com/nikmu) [TristingChen](https://github.com/TristingChen) +[chenparty](https://github.com/chenparty) [Hotleave](https://github.com/hotleave) [ydwxb](https://github.com/ydwxb) +[ydpd](https://github.com/ydpd) [szy833](https://github.com/szy833) [ydwxb](https://github.com/ydwxb) [Albertzhu666](https://github.com/Albertzhu666) + +ps: 鍒氬鍔犱簡杩欎釜鍚嶅崟锛岃偗瀹氶仐婕忎簡涓�浜涘ぇ浣紝娆㈣繋澶т浆鑱旂郴鎴戞坊鍔犮�� + -- Gitblit v1.8.0