Authored by 姜枫

图片消息加载

@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 'use strict'; 8 'use strict';
9 9
10 const Promise = require('bluebird'); 10 const Promise = require('bluebird');
  11 +const _ = require('lodash');
11 const clientAPI = require('./client-api'); 12 const clientAPI = require('./client-api');
12 13
13 /** 14 /**
@@ -417,19 +417,31 @@ function pageInit() { @@ -417,19 +417,31 @@ function pageInit() {
417 rec.userHead = assetsPrefix + socketConf.defaultUserHead; 417 rec.userHead = assetsPrefix + socketConf.defaultUserHead;
418 } 418 }
419 419
  420 +
420 // 图片添加标签 421 // 图片添加标签
421 if (msgType === 2) { 422 if (msgType === 2) {
422 message.newContent = '<img class="img-msg" src="' + message.content + '">'; 423 message.newContent = '<img class="img-msg" src="' + message.content + '">';
423 - }  
424 -  
425 - dom = cusTpl({  
426 - userHead: rec.userHead,  
427 - userName: rec.userName,  
428 - sendTimeShort: rec.sendTimeShort,  
429 - newContent: message.newContent  
430 - }); 424 + dom = cusTpl({
  425 + userHead: rec.userHead,
  426 + userName: rec.userName,
  427 + sendTimeShort: rec.sendTimeShort,
  428 + newContent: message.newContent
  429 + });
431 430
432 - msgAppend(dom); 431 + var image = new Image();
  432 + image.src = message.content;
  433 + image.onload = function() {
  434 + msgAppend(dom);
  435 + };
  436 + } else {
  437 + dom = cusTpl({
  438 + userHead: rec.userHead,
  439 + userName: rec.userName,
  440 + sendTimeShort: rec.sendTimeShort,
  441 + newContent: message.newContent
  442 + });
  443 + msgAppend(dom);
  444 + }
433 } 445 }
434 446
435 /** 447 /**
@@ -461,16 +473,29 @@ function pageInit() { @@ -461,16 +473,29 @@ function pageInit() {
461 message.newContent = emojiPrefix(message.newContent); 473 message.newContent = emojiPrefix(message.newContent);
462 if (msgType === 2) { 474 if (msgType === 2) {
463 message.newContent = '<img class="img-msg" src="' + message.content + '">'; 475 message.newContent = '<img class="img-msg" src="' + message.content + '">';
464 - }  
465 476
466 - dom = csTpl({  
467 - csHead: rec.csHead,  
468 - csName: rec.csName,  
469 - sendTimeShort: rec.sendTimeShort,  
470 - newContent: message.newContent  
471 - }); 477 + dom = cusTpl({
  478 + userHead: rec.userHead,
  479 + userName: rec.userName,
  480 + sendTimeShort: rec.sendTimeShort,
  481 + newContent: message.newContent
  482 + });
472 483
473 - msgAppend(dom); 484 + var image = new Image();
  485 + image.src = message.content;
  486 + image.onload = function() {
  487 + msgAppend(dom);
  488 + };
  489 + } else {
  490 + dom = csTpl({
  491 + csHead: rec.csHead,
  492 + csName: rec.csName,
  493 + sendTimeShort: rec.sendTimeShort,
  494 + newContent: message.newContent
  495 + });
  496 +
  497 + msgAppend(dom);
  498 + }
474 } 499 }
475 500
476 /** 501 /**