Commit b9f44e9f b9f44e9f92e4092a3dc9bfedf3dacbbbacad5e32 by yangjun@hikoon.cn

1

1 parent 4701e452
...@@ -23,7 +23,6 @@ export default { ...@@ -23,7 +23,6 @@ export default {
23 handleFriendClick() { 23 handleFriendClick() {
24 this.tim.getConversationProfile(`C2C${this.friend.esm_id}`) 24 this.tim.getConversationProfile(`C2C${this.friend.esm_id}`)
25 .then(({data}) => { 25 .then(({data}) => {
26 console.log(data)
27 this.$store.commit('updateCurrentConversation', data) 26 this.$store.commit('updateCurrentConversation', data)
28 this.$store.commit('setActiveMenu', 'conversation-list') 27 this.$store.commit('setActiveMenu', 'conversation-list')
29 this.$store.dispatch('checkoutConversation', data.conversation.conversationID) 28 this.$store.dispatch('checkoutConversation', data.conversation.conversationID)
......
...@@ -94,18 +94,10 @@ export default { ...@@ -94,18 +94,10 @@ export default {
94 return '[自定义消息]' 94 return '[自定义消息]'
95 } 95 }
96 }, 96 },
97 formatImageMessage() {
98 console.log(this.message)
99 return {
100 // ID:
101 }
102 },
103 onImageLoaded(event) { 97 onImageLoaded(event) {
104 console.log(event)
105 this.$bus.$emit('image-loaded', event) 98 this.$bus.$emit('image-loaded', event)
106 }, 99 },
107 handlePreview() { 100 handlePreview() {
108 console.log(this.payload.description)
109 this.$bus.$emit('image-preview', { 101 this.$bus.$emit('image-preview', {
110 url: this.payload.description 102 url: this.payload.description
111 }) 103 })
......
...@@ -82,7 +82,6 @@ export default { ...@@ -82,7 +82,6 @@ export default {
82 // this.$store.commit('showMessage', {type: 'success', message: '登录成功'}) 82 // this.$store.commit('showMessage', {type: 'success', message: '登录成功'})
83 }) 83 })
84 .catch(error => { 84 .catch(error => {
85 console.log(1111)
86 this.loading = false 85 this.loading = false
87 this.$store.commit('showMessage', {message: '登录失败:' + error.message, type: 'error'}) 86 this.$store.commit('showMessage', {message: '登录失败:' + error.message, type: 'error'})
88 })) 87 }))
......
...@@ -3,14 +3,14 @@ import COSSDK from 'cos-js-sdk-v5' ...@@ -3,14 +3,14 @@ import COSSDK from 'cos-js-sdk-v5'
3 3
4 // 初始化 SDK 实例 4 // 初始化 SDK 实例
5 const tim = TIM.create({ 5 const tim = TIM.create({
6 SDKAppID: window.genTestUserSig('').SDKAppID 6 SDKAppID: 1400514950
7 }) 7 })
8 8
9 window.setLogLevel = tim.setLogLevel 9 window.setLogLevel = tim.setLogLevel
10 10
11 // 无日志级别 11 // 无日志级别
12 tim.setLogLevel(4) 12 tim.setLogLevel(1)
13 13
14 // 注册 cos 14 // 注册 cos
15 tim.registerPlugin({'cos-js-sdk':COSSDK})
16 export default tim
...\ No newline at end of file ...\ No newline at end of file
15 tim.registerPlugin({'cos-js-sdk': COSSDK})
16 export default tim
......
...@@ -7,6 +7,6 @@ let options = { ...@@ -7,6 +7,6 @@ let options = {
7 const trtcCalling = new TRTCCalling(options) 7 const trtcCalling = new TRTCCalling(options)
8 8
9 // 4 无日志级别 9 // 4 无日志级别
10 trtcCalling.setLogLevel(4) 10 // trtcCalling.setLogLevel(1)
11 11
12 export default trtcCalling 12 export default trtcCalling
......
...@@ -5,7 +5,7 @@ import tim from '../tim' ...@@ -5,7 +5,7 @@ import tim from '../tim'
5 5
6 6
7 const service = axios.create({ 7 const service = axios.create({
8 baseURL: 'http://api.spread.work/mapi', 8 baseURL: 'http://spread_dev.hikoon.com/mapi',
9 // withCredentials: true, // send cookies when cross-domain requests 9 // withCredentials: true, // send cookies when cross-domain requests
10 timeout: 5000 // request timeout 10 timeout: 5000 // request timeout
11 }) 11 })
......
...@@ -196,8 +196,6 @@ class RtcClient { ...@@ -196,8 +196,6 @@ class RtcClient {
196 const remoteStream = evt.stream; 196 const remoteStream = evt.stream;
197 const id = remoteStream.getId(); 197 const id = remoteStream.getId();
198 const userId = remoteStream.getUserId(); 198 const userId = remoteStream.getUserId();
199 console.log(`remote stream added: [${userId}] ID: ${id} type: ${remoteStream.getType()}`);
200 console.log('subscribe to this remote stream');
201 // 远端流默认已订阅所有音视频,此处可指定只订阅音频或者音视频,不能仅订阅视频。 199 // 远端流默认已订阅所有音视频,此处可指定只订阅音频或者音视频,不能仅订阅视频。
202 // 如果不想观看该路远端流,可调用 this.client_.unsubscribe(remoteStream) 取消订阅 200 // 如果不想观看该路远端流,可调用 this.client_.unsubscribe(remoteStream) 取消订阅
203 this.client_.subscribe(remoteStream); 201 this.client_.subscribe(remoteStream);
...@@ -262,4 +260,4 @@ class RtcClient { ...@@ -262,4 +260,4 @@ class RtcClient {
262 } 260 }
263 } 261 }
264 262
265 export default RtcClient
...\ No newline at end of file ...\ No newline at end of file
263 export default RtcClient
......