no message

package.json

@@ -1,6 +1,6 @@
 {
     "name": "DooTask",
-    "version": "0.20.64",
+    "version": "0.20.65",
     "description": "DooTask is task management system.",
     "scripts": {
         "start": "./cmd dev",

public/js/hash

@@ -1 +1 @@
-92c9278aa827e6c9
+c0ec48cb1d98524a

public/mix-manifest.json

@@ -788,21 +788,21 @@
     "/js/build/60.js": "/js/build/60.js",
     "/js/build/680.js": "/js/build/680.js",
     "/js/build/694.js": "/js/build/694.js",
-    "/js/build/706.js": "/js/build/706.js",
-    "/js/build/706.js.LICENSE.txt": "/js/build/706.js.LICENSE.txt",
     "/js/build/711.js": "/js/build/711.js",
     "/js/build/711.js.LICENSE.txt": "/js/build/711.js.LICENSE.txt",
     "/js/build/724.js": "/js/build/724.js",
     "/js/build/725.js": "/js/build/725.js",
     "/js/build/73.js": "/js/build/73.js",
     "/js/build/781.js": "/js/build/781.js",
-    "/js/build/808.js": "/js/build/808.js",
+    "/js/build/82.js": "/js/build/82.js",
     "/js/build/826.js": "/js/build/826.js",
     "/js/build/826.js.LICENSE.txt": "/js/build/826.js.LICENSE.txt",
     "/js/build/827.js": "/js/build/827.js",
     "/js/build/834.js": "/js/build/834.js",
     "/js/build/856.js": "/js/build/856.js",
     "/js/build/856.js.LICENSE.txt": "/js/build/856.js.LICENSE.txt",
+    "/js/build/878.js": "/js/build/878.js",
+    "/js/build/878.js.LICENSE.txt": "/js/build/878.js.LICENSE.txt",
     "/js/build/889.js": "/js/build/889.js",
     "/js/build/889.js.LICENSE.txt": "/js/build/889.js.LICENSE.txt",
     "/js/build/904.js": "/js/build/904.js",

resources/assets/js/pages/login.vue

@@ -415,7 +415,7 @@ export default {
         onPrivacy(agree) {
             if (agree) {
                 this.privacyShow = false
-                this.inputServerUrl()
+                this.chackServerUrl().catch(_ => {});
             } else {
                 $A.eeuiAppGoDesktop()
             }

resources/assets/js/pages/manage/components/MeetingManager.vue

@@ -54,10 +54,9 @@
             fullscreen>
             <ul>
                 <li v-if="localUser.uid">
-                    <MeetingPlayer :player="localUser" :mediaType="localUser.mediaType"/>
+                    <MeetingPlayer :player="localUser" isLocal/>
-                </li>
+                </li><li v-for="user in remoteUsers">
-                <li v-for="user in remoteUsers">
+                    <MeetingPlayer :player="user"/>
-                    <MeetingPlayer :player="user" :mediaType="user.mediaType"/>
                 </li>
             </ul>
             <div slot="footer" class="adaption meeting-button-group">
@@ -152,7 +151,6 @@ export default {
                 uid: null,
                 audioTrack: null,
                 videoTrack: null,
-                mediaType: null
             },
         }
     },
@@ -343,7 +341,6 @@ export default {
             }
             if (this.addData.tracks.includes("video")) {
                 localTracks.push(this.localUser.videoTrack = await AgoraRTC.createCameraVideoTrack())
-                this.$set(this.localUser, 'mediaType', 'video')
             }
             // 将本地视频曲目播放到本地浏览器、将本地音频和视频发布到频道。
             if (localTracks.length > 0) {
@@ -398,7 +395,6 @@ export default {
             if (this.videoLoad || this.localUser.videoTrack) return;
             this.videoLoad = true;
             this.localUser.videoTrack = await AgoraRTC.createCameraVideoTrack()
-            this.$set(this.localUser, 'mediaType', 'video')
             await this.agoraClient.publish([this.localUser.videoTrack]);
             this.videoLoad = false;
         },
@@ -410,12 +406,10 @@ export default {
             this.localUser.videoTrack.stop();
             this.localUser.videoTrack.close();
             this.localUser.videoTrack = null;
-            this.$set(this.localUser, 'mediaType', null)
             this.videoLoad = false;
         },
 
         async handleUserJoined(user) {
-            this.$set(user, 'mediaType', null)
             const index = this.remoteUsers.findIndex(item => item.uid == user.uid)
             if (index > -1) {
                 this.remoteUsers.splice(index, 1, user)
@@ -435,7 +429,6 @@ export default {
             const item = this.remoteUsers.find(item => item.uid == user.uid)
             if (item) {
                 await this.agoraClient.subscribe(user, mediaType);
-                this.$set(item, 'mediaType', mediaType)
             }
         },
 
@@ -443,7 +436,6 @@ export default {
             const item = this.remoteUsers.find(item => item.uid == user.uid)
             if (item) {
                 await this.agoraClient.unsubscribe(user, mediaType);
-                item.mediaType = null
             }
         }
     }

resources/assets/js/pages/manage/components/MeetingPlayer.vue

@@ -10,7 +10,6 @@
 </template>
 
 <script>
-
 import {mapState} from "vuex";
 
 export default {
@@ -26,16 +25,29 @@ export default {
             type: Object,
             default: () => ({})
         },
-        mediaType: {
+        isLocal: {
-            type: String,
+            type: Boolean,
-            default: ""
+            default: false
         },
     },
     data() {
         return {
-
+            timer: null
         }
     },
+    mounted() {
+        this.timer = setInterval(_ => {
+            if (this.audio && !this.player.audioTrack.isPlaying) {
+                this.play('audio')
+            }
+            if (this.video && !this.player.videoTrack.isPlaying) {
+                this.play('video')
+            }
+        }, 3000)
+    },
+    beforeDestroy() {
+        clearInterval(this.timer)
+    },
     computed: {
         ...mapState(['cacheUserBasic']),
         userid() {
@@ -61,26 +73,38 @@ export default {
         }
     },
     watch: {
-        mediaType: {
+        audio: {
-            handler(type) {
+            handler(b) {
-                this.$nextTick(_ => {
+                if (this.isLocal || !b) {
-                    this.play(type)
+                    return
-                })
+                }
+                this.play('audio')
+            },
+            immediate: true
+        },
+        video: {
+            handler(b) {
+                if (!b) {
+                    return
+                }
+                this.play('video')
             },
             immediate: true
         }
     },
     methods: {
         play(type) {
-            try {
+            this.$nextTick(_ => {
-                if (type === 'audio') {
+                try {
-                    this.player.audioTrack.play();
+                    if (type === 'audio') {
-                } else if (type === 'video') {
+                        this.player.audioTrack.play();
-                    this.player.videoTrack.play(this.id);
+                    } else if (type === 'video') {
+                        this.player.videoTrack.play(this.id);
+                    }
+                } catch (e) {
+                    console.log("Meeting Player Error", e);
                 }
-            } catch (e) {
+            })
-                console.log("Meeting Player Error", e);
-            }
         }
     }
 }

resources/assets/sass/pages/components/meeting-manager.scss

@@ -50,12 +50,17 @@ body {
                                 }
                             }
                             @media (max-width: 768px) {
-                                grid-template-columns: repeat(auto-fill, 176px);
+                                grid-template-columns: none;
                                 grid-gap: 12px;
+                                display: flex;
+                                flex-wrap: wrap;
+                                justify-content: flex-start;
                                 > li {
+                                    width: calc(50% - 6px);
+                                    max-width: 180px;
                                     .meeting-player {
                                         .player {
-                                            width: 176px;
+                                            width: 100%;
                                             height: 176px;;
                                         }
                                     }

resources/mobile

@@ -1 +1 @@
-Subproject commit f47841bc5e1ebc94f9f507b6818f29698d973f86
+Subproject commit 0342e81ff1729ad070a13eca2df61f53f554d7b5