github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-11 18:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat：会议模块换成原生 - web端配合修改

Browse Source
This commit is contained in:
weifashi 2023-07-05 18:36:06 +08:00
parent 560562755b
commit 9ceb00bf54
16 changed files with 145 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/UsersController.php
View File

@ -1154,7 +1154,7 @@ class UsersController extends AbstractController
if (empty($meetingSetting['appid']) || empty($meetingSetting['app_certificate'])) {
return Base::retError('会议功能配置错误，请联系管理员');
}
$uid = $user->userid . '_' . Request::header('fd');
$uid = intval(str_pad( Request::header('fd'), 6, 9, STR_PAD_LEFT) . $user->userid);
try {
$service = new AgoraTokenGenerator($meetingSetting['appid'], $meetingSetting['app_certificate'], $meeting->channel, $uid);
} catch (\Exception $e) {
@ -1183,6 +1183,8 @@ class UsersController extends AbstractController
//
$data['appid'] = $meetingSetting['appid'];
$data['uid'] = $uid;
$data['userimg'] = $user->userimg;
$data['nickname'] = $user->nickname;
$data['token'] = $token;
$data['msgs'] = $msgs;
return Base::retSuccess('success', $data);

4
language/original-web.txt
View File

@ -1242,4 +1242,6 @@ Markdown 格式发送
指定成员
项目人员可见
任务人员可见
选择指定人员
选择指定人员
加入会议失败

11
language/translate.json
View File

@ -16828,5 +16828,16 @@
"de": "Eine reine wahl.",
"fr": "Aléatoire!",
"id": "Memilih semua"
},
{
"key": "加入会议失败",
"zh": "",
"zh-CHT": "加入會議失敗",
"en": "Failed to join a meeting",
"ko": "회의에 참여할 수 없습니다.",
"ja": "参加に失敗しました",
"de": "Ich wurde nicht gewählt.",
"fr": "Échec de la Réunion d’adhésion",
"id": "Bergabung dengan konferensi gagal"
}
]

2
public/language/web/de.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/language/web/en.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/language/web/fr.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/language/web/id.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/language/web/ja.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/language/web/key.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/language/web/ko.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/language/web/zh-CHT.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/language/web/zh.js vendored
View File

@ -1 +1 @@
if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]

45
resources/assets/js/App.vue
View File

@ -297,6 +297,51 @@ export default {
this.$store.dispatch("getBasicData", 600)
}
}
// 会议事件
window.__onMeetingEvent = ({act,uuid}) => {
switch (act) {
// 获取用户信息
case "getInfo":
this.$store.dispatch("call", {
url: 'users/basic',
data: {
userid: [ (uuid+"").substring(6) ]
}
}).then(({data}) => {
$A.eeuiAppSendMessage({
action: 'updateMeetingInfo',
infos: {
uuid: uuid,
avatar: data[0]?.userimg,
username: data[0]?.nickname,
}
});
}).catch(({msg}) => {
$A.modalError(msg);
});
break;
//加入成功
case "success":
// 关闭添加会议窗口
this.$store.dispatch("closeMeetingWindow","add")
break;
// 邀请
case "invent":
// 关闭邀请会议窗口
this.$store.dispatch("closeMeetingWindow","invitation")
break;
//结束会议
case "endMeeting":
break;
//加入失败
case "error":
this.$store.dispatch("closeMeetingWindow","error")
break;
default:
break;
}
}
// 键盘状态
window.__onKeyboardStatus = (data) => {
const message = $A.jsonParse(decodeURIComponent(data));

56
resources/assets/js/pages/manage/components/MeetingManager.vue
View File

@ -117,6 +117,7 @@
<script>
import {Store} from "le5le-store";
import { mapState } from 'vuex'
import MeetingPlayer from "./MeetingPlayer";
import DragBallComponent from "../../../components/DragBallComponent";
import UserSelect from "../../../components/UserSelect.vue";
@ -156,6 +157,10 @@ export default {
}
},
computed: {
...mapState(['meetingWindow']),
},
mounted() {
this.subscribe = Store.subscribe('addMeeting', this.onAdd);
},
@ -179,6 +184,28 @@ export default {
if (!val) {
this.$refs.meetingModal.modalIndex = this.$refs.meetingModal.handleGetModalIndex()
}
},
meetingWindow : {
handler(val) {
switch (val.type) {
case 'add':
this.addShow = val.show
this.loadIng = 0;
break;
case 'invitation':
this.invitationShow = val.show
this.invitationLoad = 0;
break;
case 'error':
this.addShow = val.show
this.loadIng = 0;
this.invitationShow = val.show
this.invitationLoad = 0;
$A.modalError('加入会议失败');
break;
}
},
immediate: true,
}
},
@ -235,13 +262,30 @@ export default {
delete data.name;
delete data.msgs;
//
$A.loadScript('js/AgoraRTC_N-4.17.0.js').then(_ => {
this.join(data)
}).catch(_ => {
$A.modalError("会议组件加载失败！");
}).finally(_ => {
if ($A.isEEUiApp) {
$A.eeuiAppSendMessage({
action: 'startMeeting',
meetingParams: {
token: data.token,
channel: data.channel,
uuid: data.uid,
appid: data.appid,
avatar: data.userimg,
username: data.nickname,
video: this.addData.tracks.includes("video"),
audio: this.addData.tracks.includes("audio"),
}
});
this.loadIng--;
})
}else{
$A.loadScript('js/AgoraRTC_N-4.17.0.js').then(_ => {
this.join(data)
}).catch(_ => {
$A.modalError("会议组件加载失败！");
}).finally(_ => {
this.loadIng--;
})
}
}).catch(({msg}) => {
this.loadIng--;
$A.modalError(msg);

19
resources/assets/js/store/actions.js vendored
View File

@ -3399,5 +3399,22 @@ export default {
resolve($A.jsonParse(data))
})
})
}
},
/** *****************************************************************************************/
/** *************************************** pgp *********************************************/
/** *****************************************************************************************/
/**
* 关闭会议窗口
* @param state
* @param data
*/
closeMeetingWindow({state}, type) {
state.meetingWindow = {
show: false,
type: type
};
},
}

6
resources/assets/js/store/state.js vendored
View File

@ -194,4 +194,10 @@ export default {
// 审批待办未读数量
approveUnreadNumber: 0,
// 会议窗口
meetingWindow: {
show: false,
type: "",
}
};