5.5.0

netease-kit · Aug 8, 2018 · d9162bc · d9162bc
1 parent d700e86
commit d9162bc
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 14 deletions.
diff --git a/webdemo/3rd/NIM_Web_Chatroom_v5.5.0.js b/webdemo/3rd/NIM_Web_Chatroom_v5.5.0.js
diff --git a/webdemo/3rd/NIM_Web_NIM_v5.5.0.js b/webdemo/3rd/NIM_Web_NIM_v5.5.0.js
diff --git a/webdemo/3rd/NIM_Web_Netcall_v5.5.0.js b/webdemo/3rd/NIM_Web_Netcall_v5.5.0.js
diff --git a/webdemo/3rd/NIM_Web_SDK_v5.5.0.js b/webdemo/3rd/NIM_Web_SDK_v5.5.0.js
diff --git a/webdemo/3rd/NIM_Web_WebRTC_v5.5.0.js b/webdemo/3rd/NIM_Web_WebRTC_v5.5.0.js
diff --git a/webdemo/3rd/NIM_Web_WhiteBoard_v5.5.0.js b/webdemo/3rd/NIM_Web_WhiteBoard_v5.5.0.js
diff --git a/webdemo/3rd/chrome/gapafbpmfemleaplicdhhcikajbogpkf_main.crx b/webdemo/3rd/chrome/gapafbpmfemleaplicdhhcikajbogpkf_main.crx
diff --git a/webdemo/im/chatroom/room.html b/webdemo/im/chatroom/room.html
@@ -95,7 +95,7 @@
 	<script src="./src/js/util.js"></script>
 	<script src="./src/js/title.js"></script>
 	<script src="../../3rd/jquery-1.11.3.min.js"></script>
-	<script src="../../3rd/NIM_Web_SDK_v5.4.0.js"></script>
+	<script src="../../3rd/NIM_Web_SDK_v5.5.0.js"></script>
 	<!-- <script src="../../3rd/NIM_Web_SDK.js"></script> -->
 
 	<script src="./src/js/emoji.js"></script>

diff --git a/webdemo/im/js/link.js b/webdemo/im/js/link.js
@@ -76,6 +76,11 @@ var SDKBridge = function(ctr, data) {
     // 监听订阅事件列表
     onpushevents: onPushEvents.bind(this)
   });
+  this.nim.on('wbNotifyHangup', onwbNotifyHangup)
+  function onwbNotifyHangup() {
+    console.log('未接听挂断')
+    window.yunXin.WB.hangup()
+  }
   function onConnect() {
     $('errorNetwork').addClass('hide');
     this.teamMemberDone = false;

diff --git a/webdemo/im/js/util.js b/webdemo/im/js/util.js
@@ -192,12 +192,6 @@ function buildSessionMsg(msg) {
 function getMessage(msg) {
     var str = ''
     var url = msg.file ? _$escape(msg.file.url) : ''
-    if (url) {
-        url = nim.viewImageSync({
-            url: url
-        })
-        console.log('new url', url)
-    }
     var sentStr = (msg.flow === 'in') ? "收到" : "发送";
     switch (msg.type) {
         case 'text':
@@ -212,12 +206,17 @@ function getMessage(msg) {
             if (msg.status === -1) {
                 str = '<p>[' + msg.message.message + ']</p>';
             } else {
+                if (url) {
+                    url = nim.viewImageSync({
+                        url: url
+                    })
+                }
                 // msg.file.url = _$escape(msg.file.url);
                 // msg.file.url = nim.viewImageSync({
                 //     url: msg.file.url
                 // })
                 // str = '<a href="' + msg.file.url + '?imageView" target="_blank"><img onload="loadImg()" data-src="' + msg.file.url + '" src="' + msg.file.url + '?imageView&thumbnail=200x0&quality=85"/></a>';
-                str = '<a href="' + url + '?imageView" target="_blank"><img onload="loadImg()" data-src="' + url + '" src="' + url + '?imageView&thumbnail=200x0&quality=85"/></a>';
+                str = '<a href="' + url + '" target="_blank"><img onload="loadImg()" data-src="' + url + '" src="' + url + '?imageView&thumbnail=200x0&quality=85"/></a>';
             }
             break;
         case 'file':
@@ -230,9 +229,17 @@ function getMessage(msg) {
                     //     url: msg.file.url
                     // })
                     // str = '<a class="f-maxWid" href="' + msg.file.url + '?imageView" target="_blank"><img data-src="' + msg.file.url + '" src="' + msg.file.url + '?imageView&thumbnail=200x0&quality=85"/></a>';
-                    str = '<a class="f-maxWid" href="' + url + '?imageView" target="_blank"><img data-src="' + url + '" src="' + url + '?imageView&thumbnail=200x0&quality=85"/></a>';
+                    if (url) {
+                        url = nim.viewImageSync({
+                            url: url
+                        })
+                    }
+                    str = '<a class="f-maxWid" href="' + url + '" target="_blank"><img data-src="' + url + '" src="' + url + '?imageView&thumbnail=200x0&quality=85"/></a>';
                 } else if (!/exe|bat/i.test(msg.file.ext)) {
-                    url += msg.file ? '?download=' + encodeURI(_$escape(msg.file.name)) : '';
+                    if (msg.file) {
+                        url += msg.file.url.indexOf('?') === -1 ? '?' : '&'
+                        url += 'download=' + encodeURI(_$escape(msg.file.name));
+                    }
                     str = '<a href="' + url + '" target="_blank" class="download-file f-maxWid"><span class="icon icon-file2"></span>' + _$escape(msg.file.name) + '</a>';
                 } else {
                     str = '<p>[非法文件，已被本站拦截]</p>';

diff --git a/webdemo/im/main.html b/webdemo/im/main.html
@@ -633,10 +633,10 @@
 		}
 	</script>
 	<script src="../3rd/nim_server_conf.js"></script>
-	<script src="../3rd/NIM_Web_SDK_v5.4.0.js"></script>
-	<script src="../3rd/NIM_Web_Netcall_v5.4.0.js"></script>
-	<script src="../3rd/NIM_Web_WebRTC_v5.4.0.js"></script>
-	<script src="../3rd/NIM_Web_WhiteBoard_v5.4.0.js"></script>
+	<script src="../3rd/NIM_Web_SDK_v5.5.0.js"></script>
+	<script src="../3rd/NIM_Web_Netcall_v5.5.0.js"></script>
+	<script src="../3rd/NIM_Web_WebRTC_v5.5.0.js"></script>
+	<script src="../3rd/NIM_Web_WhiteBoard_v5.5.0.js"></script>
 	<script src="../3rd/DrawPlugin.js"></script>
 
 	<script src="./js/3rd/whiteboard.js"></script>