From 9e09755ef054d6455e94ed4a68d60f231d8e944a Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期三, 13 一月 2021 17:56:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

---
 README.md |   71 +++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 80ce77a..ab0d0ca 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# wvp
+# wvp-2.0
+鍦�1.0鐨勫熀纭�涓婂疄鐜板浗鏍囩骇鑱�
+
 WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勭綉缁滆棰戝钩鍙帮紝璐熻矗瀹炵幇鏍稿績淇′护涓庤澶囩鐞嗗悗鍙伴儴鍒嗭紝鏀寔NAT绌块�忥紝鏀寔娴峰悍銆佸ぇ鍗庛�佸畤瑙嗙瓑鍝佺墝鐨処PC銆丯VR銆丏VR鎺ュ叆銆�   
 娴佸獟浣撴湇鍔″熀浜嶼LMediaKit-https://github.com/xiongziliang/ZLMediaKit
 鍓嶆椤甸潰鍩轰簬MediaServerUI杩涜淇敼.
@@ -8,46 +10,57 @@
 # 椤圭洰鐩爣
 鏃ㄥ湪鎵撻�犱竴涓槗閰嶇疆,鏄撲娇鐢�,渚夸簬缁存姢鐨�28181鍥芥爣淇′护绯荤粺, 渚濇墭浼樼鐨勫紑婧愭祦濯掍綋鏈嶅姟妗嗘灦ZLMediaKit, 瀹炵幇涓�涓畬鏁存槗鐢℅B28181骞冲彴. 
 
-# 鎴浘
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_1.png)
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_2.png)
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_20201012_151459.png)
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_20201012_152643.png)
-![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_20201012_151606.png)
+# gitee鍚屾浠撳簱
+https://gitee.com/18010473990/wvp-GB28181.git
 
-# 鍘熺増鐗规�э細
+
+# 1.0 鏀寔鐗规��  
 1. 瑙嗛棰勮;  
 2. 浜戝彴鎺у埗锛堟柟鍚戙�佺缉鏀炬帶鍒讹級;  
 3. 瑙嗛璁惧淇℃伅鍚屾;   
 4. 绂诲湪绾跨洃鎺�;  
 5. 褰曞儚鏌ヨ涓庡洖鏀撅紙鍩轰簬NVR\DVR锛屾殏涓嶆敮鎸佸揩杩涖�乻eek鎿嶄綔锛�;  
 6. 鏃犱汉瑙傜湅鑷姩鏂祦;    
-7. 鏀寔UDP鍜孴CP涓ょ鍥芥爣淇′护浼犺緭妯″紡;  
+7. 鏀寔UDP鍜孴CP涓ょ鍥芥爣淇′护浼犺緭妯″紡; 
+8. 闆嗘垚web鐣岄潰, 涓嶉渶瑕佸崟鐙儴缃插墠绔湇鍔�, 鐩存帴鍒╃敤wvp鍐呯疆鏂囦欢鏈嶅姟閮ㄧ讲, 闅弚vp涓�璧烽儴缃�;   
+9. 鏀寔骞冲彴鎺ュ叆, 閽堝澶у钩鍙板ぇ閲忚澶囩殑鎯呭喌杩涜浼樺寲;  
+10. 鏀寔妫�绱�,閫氶亾绛涢��;  
+11. 鏀寔鑷姩閰嶇疆ZLM濯掍綋鏈嶅姟, 鍑忓皯鍥犻厤缃棶棰樻墍鍑虹幇鐨勯棶棰�;  
+12. 鏀寔鍚敤udp澶氱鍙fā寮�, 鎻愰珮udp妯″紡涓嬪獟浣撲紶杈撴�ц兘;  
+13. 鏀寔閫氶亾鏄惁鍚湁闊抽鐨勮缃�;  
+14. 鏀寔閫氶亾瀛愮洰褰曟煡璇�;  
+15. 鏀寔udp/tcp鍥芥爣娴佷紶杈撴ā寮�;  
+16. 鏀寔鐩存帴杈撳嚭RTSP銆丷TMP銆丠TTP-FLV銆乄ebsocket-FLV銆丠LS澶氱鍗忚娴佸湴鍧�  
+17. 鏀寔鍥芥爣缃戠粶鏍℃椂  
+18. 鏀寔鍏綉閮ㄧ讲, 鏀寔wvp涓巣lm鍒嗗紑閮ㄧ讲   
+19. 鏀寔鎾斁h265, g.711鏍煎紡鐨勬祦(闇�瑕佸皢closeWaitRTPInfo璁句负false). 
 
-# 鏂版敮鎸佺壒鎬�  
-1. 闆嗘垚web鐣岄潰, 涓嶉渶瑕佸崟鐙儴缃插墠绔湇鍔�, 鐩存帴鍒╃敤wvp鍐呯疆鏂囦欢鏈嶅姟閮ㄧ讲, 闅弚vp涓�璧烽儴缃�;   
-2. 鏀寔骞冲彴鎺ュ叆, 閽堝澶у钩鍙板ぇ閲忚澶囩殑鎯呭喌杩涜浼樺寲;  
-3. 鏀寔妫�绱�,閫氶亾绛涢��;  
-4. 鏀寔鑷姩閰嶇疆ZLM濯掍綋鏈嶅姟, 鍑忓皯鍥犻厤缃棶棰樻墍鍑虹幇鐨勯棶棰�;  
-5. 鏀寔鍚敤udp澶氱鍙fā寮�, 鎻愰珮udp妯″紡涓嬪獟浣撲紶杈撴�ц兘;  
-6. 鏀寔閫氶亾鏄惁鍚湁闊抽鐨勮缃�;  
-7. 鏀寔閫氶亾瀛愮洰褰曟煡璇�;  
-8. 鏀寔udp/tcp鍥芥爣娴佷紶杈撴ā寮�;  
-9. 鏀寔鐩存帴杈撳嚭RTSP銆丷TMP銆丠TTP-FLV銆乄ebsocket-FLV銆丠LS澶氱鍗忚娴佸湴鍧�  
-10. 鏀寔鍥芥爣缃戠粶鏍℃椂  
-
-# 寰呭疄鐜帮細 
-涓婄骇绾ц仈  
-鎺ㄦ祦鍒楄〃  
-鎷夋祦鍒楄〃  
-web鐣岄潰绯荤粺璁剧疆
-浣跨敤mysql浣滀负鏁版嵁搴�  
+# 2.0 鏀寔鐗规�� 
+- [ ] 鍥芥爣閫氶亾鍚戜笂绾ц仈  
+    - [X] WEB娣诲姞涓婄骇骞冲彴
+    - [X] 娉ㄥ唽
+    - [X] 蹇冭烦淇濇椿
+    - [X] 閫氶亾閫夋嫨
+    - [ ] 閫氶亾鎺ㄩ��
+    - [ ] 鐐规挱
+    - [ ] 浜戝彴鎺у埗
+- [ ] 娣诲姞RTSP瑙嗛  
+- [ ] 娣诲姞ONVIF鎺㈡祴灞�鍩熺綉鍐呯殑璁惧  
+- [ ] 娣诲姞RTMP瑙嗛  
+- [ ] 娣诲姞绯荤粺閰嶇疆  
+- [ ] 娣诲姞鐢ㄦ埛绠$悊  
+ 
+ 
 
 # 椤圭洰閮ㄧ讲
-鍙傝��:[缂栬瘧杩愯](https://github.com/648540858/wvp-GB28181/wiki/%E7%BC%96%E8%AF%91%E8%BF%90%E8%A1%8C)
+鍙傝��:[WIKI](https://github.com/648540858/wvp-GB28181-pro/wiki)
+
+# gitee鍚屾浠撳簱
+https://gitee.com/18010473990/wvp-GB28181.git  
 
 # 浣跨敤甯姪
-QQ缇�: 901799015
+QQ缇�: 901799015, 542509000(ZLM澶х兢)  
+QQ绉佷俊涓�鑸笉鍥�, 绮惧姏鏈夐檺.娆㈣繋澶у鍦ㄧ兢閲岃璁�.
 
 # 鑷磋阿
 鎰熻阿浣滆�匸澶忔](https://github.com/xiongziliang) 鎻愪緵杩欎箞妫掔殑寮�婧愭祦濯掍綋鏈嶅姟妗嗘灦  

--
Gitblit v1.8.0