Skip to content

Commit

Permalink
update to version 3.2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
fanjiangwei7 committed Dec 9, 2024
1 parent 2cf6625 commit 81571f7
Show file tree
Hide file tree
Showing 15 changed files with 86 additions and 30 deletions.
8 changes: 8 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

[蓝莺IM](https://www.lanyingim.com/),是由美信拓扑团队研发的新一代即时通讯云服务,SDK设计简单集成方便,服务采用云原生技术和多云架构,私有云也可按月付费。

### v3.2.8 20241209
1.修复发送消息模式改变,导致的已发送消息多次重复展示在聊天信息列表中的问题。
2.修改 dns 无效时的错误输出提示。
3.修改验证信息的展示样式。
4.修复 im 输入错误的参数后切换为 link 时出现的提示 dns 无效后界面卡住无任何响应的问题。
5.修改 safari 状态下的语音振铃提示展示样式,修复过场时导致的用户头像不展示问题。
6.修复xsync信令处理大数时的错误处理。

### v3.2.7 20241111
1.修改消息发送逻辑,由消息发送成功修改为消息发送出之后,解决由于网络不佳导致的发送成功后消息发送端没有展示已发送消息的问题。
2.在登录页面增加认证展示信息,将appid关联的认证信息展示在登录页面上,点击可以跳转详细展示认证信息。
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,5 @@
"all": "node .electron-vue/build.js && electron-builder",
"w": "node .electron-vue/build.js"
},
"version": "3.2.7"
"version": "3.2.8"
}
6 changes: 4 additions & 2 deletions src/renderer/assets/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -658,8 +658,9 @@
.user_setting img.verify {
width: 20px;
height: 20px;
position: absolute;
top: 103px;
position: relative;
top: 3px;
padding-right: 4px;
}

.user_setting .line {
Expand Down Expand Up @@ -743,6 +744,7 @@
-webkit-line-clamp: 1;
overflow: hidden;
text-overflow: ellipsis;
font-weight: bold;
}

.roster_notice_list {
Expand Down
3 changes: 3 additions & 0 deletions src/renderer/assets/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@
margin-top: 14px;
font-size: 16px;
color: white;
text-overflow: ellipsis;
overflow: hidden;
max-width: 155px;
}

.header .supportname {
Expand Down
4 changes: 3 additions & 1 deletion src/renderer/assets/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@
.login .verify_detail img {
width: 20px;
height: 20px;
padding-top: 7px;
padding-top: 3px;
padding-right: 4px;
}

.login .verify_detail .ll {
Expand All @@ -235,4 +236,5 @@
-webkit-line-clamp: 1;
overflow: hidden;
text-overflow: ellipsis;
font-weight: bold;
}
2 changes: 1 addition & 1 deletion src/renderer/im/floo-3.0.0.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/renderer/ui/chatting/content/group/chat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@ export default {
});
this.$store.getters.im.on('onSendingMessageStatusChanged', ({ status, mid, message }) => {
console.log('Sending Message status changed to ', status, ' mid: ', mid);
// this.requireMessage();
if (status === 'sending') {
console.log('Sending Message status changed to sending mid: ', mid);
this.$store.dispatch('content/actionAppendMessage', {
sendingMessages: [message]
});
} else if (status === 'sent') {
console.log('Sending Message status changed to sent mid: ', mid);
this.$store.dispatch('content/actionUpdateMessage', {
message,
mid
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/ui/chatting/content/roster/chat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,14 @@ export default {
});
this.$store.getters.im.on('onSendingMessageStatusChanged', ({ status, mid, message }) => {
console.log('Sending Message status changed to ', status, ' mid: ', mid);
// this.requireMessage();
if (status === 'sending') {
console.log('Sending Message status changed to sending mid: ', mid);
this.$store.dispatch('content/actionAppendMessage', {
sendingMessages: [message]
});
} else if (status === 'sent') {
console.log('Sending Message status changed to sent mid: ', mid);
this.$store.dispatch('content/actionUpdateMessage', {
message,
mid
Expand Down
14 changes: 7 additions & 7 deletions src/renderer/ui/chatting/content/verification/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<span>本APP(APPID:{{ appid }})由</span>
<br />
<span class="span-lines">{{ verification_description }}</span>
<span>{{ verification_status }}</span>
<img :src="verification_img" class="verify" />
<span :style="{ 'font-size': '12px' }">{{ verification_status }}</span>
<br />
<span>提供服务</span>
</p>
Expand All @@ -21,30 +21,30 @@ export default {
return {
verification_description: '', // 认证描述
verification_img: '/image/unverified.png', // 认证图片
verification_status: '(?未认证'
verification_status: '未认证'
};
},
mounted() {
const im = this.$store.getters.im;
let appConfig = im.sysManage.getAppConfig(im.userManage.getAppid());
if (appConfig) {
if (appConfig.account_verification_type && appConfig.account_verification_type == 'enterprise') {
this.verification_description += '' + appConfig.account_verification_name + '';
this.verification_description += appConfig.account_verification_name;
} else {
this.verification_description += '个人开发者:' + appConfig.account_verification_name + '';
this.verification_description += '个人开发者:' + appConfig.account_verification_name;
}
if (appConfig.account_verification_status) {
switch (appConfig.account_verification_status) {
case 'unverified':
this.verification_status = '(?未认证';
this.verification_status = '未认证';
this.verification_img = '/image/unverified.png';
break;
case 'verified':
this.verification_status = '(v已认证)';
this.verification_status = '已认证';
this.verification_img = '/image/verifyed.png';
break;
case 'expired':
this.verification_status = '(!认证失败';
this.verification_status = '认证失败';
this.verification_img = '/image/verify_failed.png';
break;
default:
Expand Down
17 changes: 14 additions & 3 deletions src/renderer/ui/chatting/header/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="header">
<div class="header" ref="imHeader">
<div class="searchArea">
<input @input="handleSearch" placeHolder="搜索会话" type="text" v-model="kw" />
<div @click="headerAddChickHandler" class="addBtn"></div>
Expand All @@ -14,7 +14,7 @@
<div @click="touchAboutUs" class="stab"><img :src="aboutUsImage" /></div>
<div @click="touchSafariAudioSupport" class="stab" v-if="checkSafari">
<img :src="audioImage" />
<span class="supportname">点击获取振铃权限</span>
<span class="supportname" v-if="showSafariTips">点击获取振铃权限</span>
</div>
</div>
<div class="profile">
Expand All @@ -37,6 +37,16 @@ export default {
if (navigator.userAgent.indexOf('Safari') > -1 && navigator.userAgent.indexOf('Chrome') == -1) {
this.checkSafari = true;
}
window.addEventListener('resize', () => {
this.$nextTick(() => {
const width = this.$refs.imHeader.offsetWidth;
if (width >= 900) {
this.showSafariTips = true;
} else {
this.showSafariTips = false;
}
});
});
},
data() {
Expand All @@ -49,7 +59,8 @@ export default {
audioImage: '',
name: '',
avatar: '',
checkSafari: false
checkSafari: false,
showSafariTips: true
};
},
watch: {
Expand Down
24 changes: 22 additions & 2 deletions src/renderer/ui/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,28 @@ export default {
}
},
flooError: (msg) => {
const { category, desc } = msg;
const { category, desc, code } = msg;
switch (category) {
case 'USER_BANNED':
that.alert('用户错误: ' + desc);
break;
case 'DNS_FAILED':
that.alert('DNS错误: ' + desc);
if (code && code === 99998) {
if (that.intent && that.intent.action === 'support') {
that.alert('DNS错误: 无效AppID,重置为默认AppID');
setTimeout(() => {
that.$store.dispatch('actionChangeAppID', 'welovemaxim');
}, 500);
let currentUrl = new URL(window.location.href);
currentUrl.searchParams.delete('code');
currentUrl.searchParams.set('link', '3qur4g');
window.history.replaceState({}, document.title, currentUrl.toString());
} else {
that.alert('DNS错误: 无效AppID');
}
} else {
that.alert('DNS错误: ' + desc);
}
break;
case 'LICENSE':
that.alert('服务需要续费: ' + desc);
Expand Down Expand Up @@ -444,6 +459,11 @@ export default {
})
.catch((err) => {
that.alert('Link无效: ' + err.code + ':' + err.message);
let currentUrl = new URL(window.location.href);
currentUrl.searchParams.delete('code');
currentUrl.searchParams.set('link', '3qur4g');
window.history.replaceState({}, document.title, currentUrl.toString());
window.location.replace(currentUrl.toString());
});
},
Expand Down
18 changes: 10 additions & 8 deletions src/renderer/ui/login/verifyinfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
<br />
<span class="ll span-lines">{{ verification_description }}</span>
<br />
<span class="ll">{{ verification_status }}</span>
<img :src="verification_img" class="verify" />
<span :style="{ display: 'flex' }">
<img :src="verification_img" class="verify" />
<span :style="{ 'font-size': '12px' }">{{ verification_status }}</span>
</span>
<br />
<span class="ll lastl">提供服务</span>
<br />
Expand All @@ -30,7 +32,7 @@ export default {
return {
verification_description: '', // 认证描述
verification_img: '/image/unverified.png', // 认证图片
verification_status: '(?未认证'
verification_status: '未认证'
};
},
computed: {},
Expand All @@ -40,22 +42,22 @@ export default {
let appConfig = im.sysManage.getAppConfig(im.userManage.getAppid());
if (appConfig) {
if (appConfig.account_verification_type && appConfig.account_verification_type == 'enterprise') {
this.verification_description += '' + appConfig.account_verification_name + '';
this.verification_description += appConfig.account_verification_name;
} else {
this.verification_description += '个人开发者:' + appConfig.account_verification_name + '';
this.verification_description += '个人开发者:' + appConfig.account_verification_name;
}
if (appConfig.account_verification_status) {
switch (appConfig.account_verification_status) {
case 'unverified':
this.verification_status = '(?未认证';
this.verification_status = '未认证';
this.verification_img = '/image/unverified.png';
break;
case 'verified':
this.verification_status = '(v已认证)';
this.verification_status = '已认证';
this.verification_img = '/image/verifyed.png';
break;
case 'expired':
this.verification_status = '(!认证失败';
this.verification_status = '认证失败';
this.verification_img = '/image/verify_failed.png';
break;
default:
Expand Down
6 changes: 5 additions & 1 deletion src/renderer/ui/store/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,11 @@ const actions = {
}

if (sendingMessages.length) {
allMessages = allMessages.concat(sendingMessages);
sendingMessages.forEach((msg) => {
if (allMessages.filter((m) => m.id === msg.id).length === 0) {
allMessages.push(msg);
}
});
}

context.commit('setMessage', allMessages);
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/ui/support/content/group/chat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,14 @@ export default {
});
this.$store.getters.im.on('onSendingMessageStatusChanged', ({ status, mid, message }) => {
console.log('Sending Message status changed to ', status, ' mid: ', mid);
// this.requireMessage();
if (status === 'sending') {
console.log('Sending Message status changed to sending mid: ', mid);
this.$store.dispatch('content/actionAppendMessage', {
sendingMessages: [message]
});
} else if (status === 'sent') {
console.log('Sending Message status changed to sent mid: ', mid);
this.$store.dispatch('content/actionUpdateMessage', {
message,
mid
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/ui/support/content/roster/chat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,14 @@ export default {
});
this.$store.getters.im.on('onSendingMessageStatusChanged', ({ status, mid, message }) => {
console.log('Sending Message status changed to ', status, ' mid: ', mid);
// this.requireMessage();
if (status === 'sending') {
console.log('Sending Message status changed to sending mid: ', mid);
this.$store.dispatch('content/actionAppendMessage', {
sendingMessages: [message]
});
} else if (status === 'sent') {
console.log('Sending Message status changed to sent mid: ', mid);
this.$store.dispatch('content/actionUpdateMessage', {
message,
mid
Expand Down

0 comments on commit 81571f7

Please sign in to comment.