Skip to content

Commit

Permalink
update to version v3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
fanjiangwei7 committed Aug 1, 2024
1 parent f77afdb commit a3a377f
Show file tree
Hide file tree
Showing 9 changed files with 176 additions and 59 deletions.
10 changes: 10 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

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

### v3.2.1 20240801

1.修复 页面存储账号信息在从明文模式切换到加密模式时可能出现的兼容问题。
2.修复群组黑名单操作或者删除群成员后出现的整个用户所有群成员列表清空的bug。
3.修复群组设置界面群成员过多不能正常展示群设置弹出窗口的问题。
4.修改群组设置界面设置及展示群公告的样式。
5.修改群组设置界面操作处理后选择的选项没有被清空的问题。
6.修改群组共享文件的操作处理界面的样式。
7.修改群组设置界面的禁言设置操作展示,被禁言的状态的成员使用红色展示。

### v3.2.0 20240727
1.增加多账号切换登录功能。
2.修改floo web页面二维码扫描输出内容及格式,与app和小程序保持一致。
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,5 @@
"all": "node .electron-vue/build.js && electron-builder",
"w": "node .electron-vue/build.js"
},
"version": "3.2.0"
"version": "3.2.1"
}
2 changes: 1 addition & 1 deletion src/renderer/assets/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
float: right;
width: 200px;
border-left: 1px solid #eee;
height: 75%;
height: 68%;
margin-top: 40px;
background: white;
box-sizing: border-box;
Expand Down
20 changes: 20 additions & 0 deletions src/renderer/assets/layers.css
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,13 @@

.group_setting_layer .group_setting_group .setting_lists {
margin: 10px 0px 10px 0px;
max-height: 200px;
overflow-y: auto;
}

.group_setting_layer .group_setting_group .setting_lists .setting_lists_bars {
display: flex;
flex-direction: row;
}

.group_setting_layer .group_setting_group .setting_lists .item {
Expand All @@ -557,8 +564,21 @@
overflow: hidden;
}

.group_setting_layer .group_setting_group .setting_lists .item_list {
border-bottom: 1px solid #ececec;
margin: 6px;
}

.group_setting_layer .group_setting_group .setting_lists .item span {
float: left;
overflow: hidden;
text-overflow: ellipsis;
max-width: 66.6%;
white-space: nowrap;
}

.group_setting_layer .group_setting_group .setting_lists .item .file_span {
max-width: 90%;
}

.group_setting_layer .group_setting_group .setting_lists .item input {
Expand Down
4 changes: 3 additions & 1 deletion src/renderer/assets/support.css
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@
float: right;
width: 200px;
border-left: 1px solid #eee;
height: 75%;
height: 68%;
margin-top: 38px;
background: white;
box-sizing: border-box;
Expand Down Expand Up @@ -596,4 +596,6 @@

.el-tooltip__popper {
border: none !important;
max-width: 260px !important;
font-size: 12px;
}
2 changes: 1 addition & 1 deletion src/renderer/im/floo-3.0.0.js

Large diffs are not rendered by default.

78 changes: 57 additions & 21 deletions src/renderer/ui/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,28 @@ export default {
} catch (ex) {
//
}
if (data.type === 'lanying_link_support_user' && data.data) {
try {
let info = JSON.parse(data.data);
that.saveLoginInfo({ username: info.username, password: info.password }, info.appid);
that.officialUser = true;
} catch (ex) {
console.error('Can not parse info in lanying_link_support_user');
if (data.type === 'lanying_link_support_user') {
if (data.link_mode === 'lanying-support') {
that.intent.linkMode = 'lanying-support';
} else {
that.intent.linkMode = 'lanying-link';
that.$store.dispatch('login/actionChangeAppStatus', 'loading');
parent.postMessage(
JSON.stringify({
type: 'lanying_toggle_chat',
size: 'large'
}),
'*'
);
}
if (data.data) {
try {
let info = JSON.parse(data.data);
that.saveLoginInfo({ username: info.username, password: info.password }, info.appid);
that.officialUser = true;
} catch (ex) {
console.error('Can not parse info in lanying_link_support_user');
}
}
} else if (data.type === 'lanying_link_toggle_chat' && data.size) {
switch (data.size) {
Expand Down Expand Up @@ -217,21 +232,32 @@ export default {
loginSuccess: () => {
that.$store.dispatch('login/actionChangeLoginStatus', true);
if (that.intent.action === 'support') {
if (that.checkMobile()) {
that.$store.dispatch('login/actionChangeAppStatus', 'minimize');
parent.postMessage(
JSON.stringify({
type: 'lanying_toggle_chat',
size: 'minimize'
}),
'*'
);
if (that.intent.linkMode === 'lanying-support') {
if (that.checkMobile()) {
that.$store.dispatch('login/actionChangeAppStatus', 'minimize');
parent.postMessage(
JSON.stringify({
type: 'lanying_toggle_chat',
size: 'minimize'
}),
'*'
);
} else {
that.$store.dispatch('login/actionChangeAppStatus', 'navigation');
parent.postMessage(
JSON.stringify({
type: 'lanying_toggle_chat',
size: 'navigation'
}),
'*'
);
}
} else {
that.$store.dispatch('login/actionChangeAppStatus', 'navigation');
that.$store.dispatch('login/actionChangeAppStatus', 'support');
parent.postMessage(
JSON.stringify({
type: 'lanying_toggle_chat',
size: 'navigation'
size: 'large'
}),
'*'
);
Expand Down Expand Up @@ -490,7 +516,13 @@ export default {
let info = {};
const encryptInfo = window.sessionStorage.getItem('lanying_im_logininfo') || window.localStorage.getItem('lanying_im_logininfo') || '';
if (encryptInfo) {
const info_str = this.cryptoDecrypt(encryptInfo);
let info_str = '';
try {
info_str = this.cryptoDecrypt(encryptInfo);
} catch (ex) {
info_str = encryptInfo;
}
try {
info = JSON.parse(info_str);
} catch (ex) {
Expand All @@ -515,7 +547,6 @@ export default {
}
infoList.unshift(info);
let data = this.cryptoEncrypt(JSON.stringify(infoList));
console.log(data);
window.localStorage.setItem('lanying_im_logininfo_list', data);
}
} catch (ex) {
Expand All @@ -527,7 +558,12 @@ export default {
let infoList = [];
const encryptInfo = window.localStorage.getItem('lanying_im_logininfo_list') || '';
if (encryptInfo) {
const list = this.cryptoDecrypt(encryptInfo);
let list = '';
try {
list = this.cryptoDecrypt(encryptInfo);
} catch (ex) {
list = encryptInfo;
}
try {
if (list.length) {
infoList = JSON.parse(list);
Expand Down
Loading

0 comments on commit a3a377f

Please sign in to comment.