From 6ac7ce8f15e5deeb45e48679b970b4d8311ed086 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期日, 10 五月 2020 22:33:57 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/swwheihei/wvp.git

---
 README.md |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b24f59e..59cda84 100644
--- a/README.md
+++ b/README.md
@@ -7,20 +7,26 @@
 涓昏搴旂敤鍦↖PC绛夎澶囨病鏈夊浐瀹欼P鍦板潃锛屼絾闇�瑕佸湪浜掕仈缃戜腑瑙傜湅鐨勫満鏅��  
 瑕佹眰IPC璁惧鍙互璁块棶浜掕仈缃戯紝鏈変簯鏈嶅姟鍣ㄧ敤浜庨儴缃叉湰鏈嶅姟銆�
 
-# 鐩墠鐗堟湰鏆傚彧鏀寔锛�
+# 鏀寔鐗规�э細
 1銆佽棰戦瑙�  
 2銆佷簯鍙版帶鍒讹紙鏂瑰悜鎺у埗銆佺缉鏀炬帶鍒讹級  
 3銆佽棰戣澶囦俊鎭悓姝�  
 4銆佺鍦ㄧ嚎鐩戞帶  
 5銆佸綍鍍忔煡璇紙鍩轰簬NVR\DVR锛�  
 
-# 鍚庣画閫愭鏀寔锛�
-1銆佸畨鍏ㄨ璇�  
-2銆佸綍鍍忓洖鏀撅紙鍩轰簬NVR\DVR锛�  
-3銆佽闊冲璁�  
-4銆佷笂绾х骇鑱�  
-5銆侀泦缇ら儴缃�  
+# 2020璺嚎鍥撅細
+5鏈堜腑鏃�-褰曞儚鍥炴斁锛堝熀浜嶯VR\DVR锛夈�佽澶囪璇侊紙鍩轰簬瀵嗙爜锛�  
+5鏈堜笅鏃�-璁惧鎶ヨ  
+6鏈堜笂鏃�-娴佸獟浣撹璇侊紙ZLM鎺ㄦ祦銆佸彇娴侊級  
+6鏈堜笅鏃�-璇煶瀵硅銆丄ndroid Deme\iOS Demo  
+7鏈堜笅鏃�-璁惧璁よ瘉锛堝熀浜庢暟瀛楄瘉涔︼級銆侀泦缇ら儴缃�  
+8鏈堜笅鏃�-浜戠褰曞儚涓庡洖鏀�  
+9鏈堜笅鏃�-Onvif鍗忚鏀寔  
+10鏈堜笅鏃�-GB28181-2011鐗堣澶囬�傞厤  
+12鏈堝簳-涓婄骇绾ц仈銆佹椂闂村悓姝ャ�佸叾浠栧浗鏍囪兘鍔�  
 
-涓氬姟闆嗘垚鏁版嵁璇锋眰娴佺▼鍙傝�僿iki璇存槑
+# 椤圭洰閮ㄧ讲
+鍙傝�僿iki璇存槑
 
-椤圭洰閮ㄧ讲鏂囨。鍙傝�僿iki璇存槑
+# 浣跨敤甯姪
+鍙傝�僿iki璇存槑

--
Gitblit v1.8.0