Merge remote-tracking branch 'origin/release/wap-im'
Showing
1 changed file
with
28 additions
and
1 deletions
@@ -41,7 +41,34 @@ const msgTypeMap = { | @@ -41,7 +41,34 @@ const msgTypeMap = { | ||
41 | let userName = $('#js-uname').val(); | 41 | let userName = $('#js-uname').val(); |
42 | let uid = cmEntity.userId = $('#js-uid').val() || 0; | 42 | let uid = cmEntity.userId = $('#js-uid').val() || 0; |
43 | let encryptedUid = cmEntity.encryptedUid = $('#js-eid').val() || 0; | 43 | let encryptedUid = cmEntity.encryptedUid = $('#js-eid').val() || 0; |
44 | -let userAvatar = cmEntity.userHead = $('#js-avatar').val() || socketConf.defaultUserHead; | 44 | +let userAvatar = cmEntity.userHead = socketConf.defaultUserHead; |
45 | + | ||
46 | +let imgSrc = $('#js-avatar').val(); | ||
47 | + | ||
48 | +function checkUserAvatarValid(src, success) { | ||
49 | + let imgDOM = new Image(); | ||
50 | + | ||
51 | + imgDOM.src = src; | ||
52 | + imgDOM.style.display = 'none'; | ||
53 | + | ||
54 | + imgDOM.onload = function() { | ||
55 | + success(src); | ||
56 | + | ||
57 | + document.body.removeChild(this); | ||
58 | + }; | ||
59 | + | ||
60 | + imgDOM.onerror = function() { | ||
61 | + document.body.removeChild(this); | ||
62 | + }; | ||
63 | + | ||
64 | + document.body.appendChild(imgDOM); | ||
65 | +} | ||
66 | + | ||
67 | +// window.checkUserAvatarValid = checkUserAvatarValid; | ||
68 | + | ||
69 | +checkUserAvatarValid(imgSrc, src => { | ||
70 | + userAvatar = cmEntity.userHead = src; | ||
71 | +}); | ||
45 | 72 | ||
46 | let isAndroid = /YohoBuy-android/i.test(navigator.userAgent); | 73 | let isAndroid = /YohoBuy-android/i.test(navigator.userAgent); |
47 | 74 |
-
Please register or login to post a comment