mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-15 13:22:49 +00:00
Merge commit '7b02bc006b397990c055e80a006e0d104387f40c' into pro
# Conflicts: # resources/assets/js/pages/manage/components/MeetingManager.vue
This commit is contained in:
kuaifan
commit
1df0a1dfb4
@ -1244,4 +1244,8 @@ Markdown 格式发送
|
||||
任务人员可见
|
||||
选择指定人员
|
||||
|
||||
加入会议失败
|
||||
加入会议失败
|
||||
确定要离开会议吗？
|
||||
继续
|
||||
退出
|
||||
会议组件加载失败！
|
||||
@ -16839,5 +16839,49 @@
|
||||
"de": "Ich wurde nicht gewählt.",
|
||||
"fr": "Échec de la Réunion d’adhésion",
|
||||
"id": "Bergabung dengan konferensi gagal"
|
||||
},
|
||||
{
|
||||
"key": "确定要离开会议吗？",
|
||||
"zh": "",
|
||||
"zh-CHT": "確定要離開會議嗎？",
|
||||
"en": "Are you sure you want to leave the meeting?",
|
||||
"ko": "회의를 정말 나가시겠습니까?",
|
||||
"ja": "会議を離れることは確実ですか?",
|
||||
"de": "Wollen sie das Treffen verlassen?",
|
||||
"fr": "Sûr de vouloir quitter la Réunion?",
|
||||
"id": "Yakin ingin meninggalkan pertemuan?"
|
||||
},
|
||||
{
|
||||
"key": "继续",
|
||||
"zh": "",
|
||||
"zh-CHT": "繼續",
|
||||
"en": "Resume",
|
||||
"ko": "계속",
|
||||
"ja": "続きます",
|
||||
"de": "Machen sie weiter.",
|
||||
"fr": "Continue",
|
||||
"id": "Terus"
|
||||
},
|
||||
{
|
||||
"key": "退出",
|
||||
"zh": "",
|
||||
"zh-CHT": "退出",
|
||||
"en": "Quit",
|
||||
"ko": "출구",
|
||||
"ja": "脱退します",
|
||||
"de": "\"Die sache\"?",
|
||||
"fr": "Le retrait",
|
||||
"id": "Keluar"
|
||||
},
|
||||
{
|
||||
"key": "会议组件加载失败！",
|
||||
"zh": "",
|
||||
"zh-CHT": "會議組件加載失敗！",
|
||||
"en": "Meeting component loading failed!",
|
||||
"ko": "회의 구성 요소 불러오기 실패!",
|
||||
"ja": "会議コンポーネントのロードに失敗しました!",
|
||||
"de": "Geladen mit fallender fracht des meetings!",
|
||||
"fr": "Échec du chargement du composant conférence!",
|
||||
"id": "Perakitan perakitan gagal!"
|
||||
}
|
||||
]
|
||||
2
public/language/web/de.js
vendored
2
public/language/web/de.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/en.js
vendored
2
public/language/web/en.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/fr.js
vendored
2
public/language/web/fr.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/id.js
vendored
2
public/language/web/id.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/ja.js
vendored
2
public/language/web/ja.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/key.js
vendored
2
public/language/web/key.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/ko.js
vendored
2
public/language/web/ko.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/zh-CHT.js
vendored
2
public/language/web/zh-CHT.js
vendored
File diff suppressed because one or more lines are too long
2
public/language/web/zh.js
vendored
2
public/language/web/zh.js
vendored
@ -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"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
|
||||
@ -117,7 +117,7 @@
|
||||
|
||||
<script>
|
||||
import {Store} from "le5le-store";
|
||||
import {mapState} from 'vuex'
|
||||
import { mapState } from 'vuex'
|
||||
import MeetingPlayer from "./MeetingPlayer";
|
||||
import DragBallComponent from "../../../components/DragBallComponent";
|
||||
import UserSelect from "../../../components/UserSelect.vue";
|
||||
@ -185,7 +185,7 @@ export default {
|
||||
this.$refs.meetingModal.modalIndex = this.$refs.meetingModal.handleGetModalIndex()
|
||||
}
|
||||
},
|
||||
meetingWindow: {
|
||||
meetingWindow : {
|
||||
handler(val) {
|
||||
switch (val.type) {
|
||||
case 'add':
|
||||
@ -276,11 +276,16 @@ export default {
|
||||
username: data.nickname,
|
||||
video: this.addData.tracks.includes("video"),
|
||||
audio: this.addData.tracks.includes("audio"),
|
||||
meetingid: data.meetingid
|
||||
meetingid: data.meetingid,
|
||||
alert: {
|
||||
title: this.$L('温馨提示'),
|
||||
message: this.$L('确定要离开会议吗？'),
|
||||
cancel: this.$L('继续'),
|
||||
confirm: this.$L('退出'),
|
||||
}
|
||||
}
|
||||
});
|
||||
this.loadIng--;
|
||||
} else {
|
||||
}else{
|
||||
$A.loadScript('js/AgoraRTC_N-4.17.0.js').then(_ => {
|
||||
this.join(data)
|
||||
}).catch(_ => {
|
||||
@ -391,21 +396,26 @@ export default {
|
||||
this.agoraClient.on("user-unpublished", this.handleUserUnpublished);
|
||||
// 加入频道、开启音视频
|
||||
const localTracks = [];
|
||||
this.localUser.uid = await this.agoraClient.join(options.appid, options.channel, options.token, options.uid)
|
||||
if (this.addData.tracks.includes("audio")) {
|
||||
localTracks.push(this.localUser.audioTrack = await AgoraRTC.createMicrophoneAudioTrack())
|
||||
try {
|
||||
this.localUser.uid = await this.agoraClient.join(options.appid, options.channel, options.token, options.uid)
|
||||
if (this.addData.tracks.includes("audio")) {
|
||||
localTracks.push(this.localUser.audioTrack = await AgoraRTC.createMicrophoneAudioTrack())
|
||||
}
|
||||
if (this.addData.tracks.includes("video")) {
|
||||
localTracks.push(this.localUser.videoTrack = await AgoraRTC.createCameraVideoTrack())
|
||||
}
|
||||
// 将本地视频曲目播放到本地浏览器、将本地音频和视频发布到频道。
|
||||
if (localTracks.length > 0) {
|
||||
await this.agoraClient.publish(localTracks);
|
||||
}
|
||||
//
|
||||
this.meetingShow = true;
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
$A.modalError("会议组件加载失败！");
|
||||
}
|
||||
if (this.addData.tracks.includes("video")) {
|
||||
localTracks.push(this.localUser.videoTrack = await AgoraRTC.createCameraVideoTrack())
|
||||
}
|
||||
// 将本地视频曲目播放到本地浏览器、将本地音频和视频发布到频道。
|
||||
if (localTracks.length > 0) {
|
||||
await this.agoraClient.publish(localTracks);
|
||||
}
|
||||
//
|
||||
this.loadIng--;
|
||||
this.addShow = false;
|
||||
this.meetingShow = true;
|
||||
},
|
||||
|
||||
async leave() {
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 6cc6ea8d6690c01ac66df25f9783421a80970725
|
||||
Subproject commit 2461b7d91b1e50c0f1a8d2b95ddd7b0313b99303
|
||||
Loading…
x
Reference in New Issue
Block a user