lex-xin 3 years ago
parent
commit
c1feb7527e

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.5918901c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.c1c597c8.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.e6749df1.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.12cf8fcb.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.8a99811c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.ee284511.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.fab50747.js


+ 2 - 2
dist/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="./favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>管乐迷</title>
-    <script type="module" crossorigin src="./assets/index.7d05c6dc.js"></script>
+    <script type="module" crossorigin src="./assets/index.ee284511.js"></script>
     <link rel="modulepreload" href="./assets/vendor.a31584f5.js">
     <link rel="stylesheet" href="./assets/index.fb6968e4.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
@@ -15,6 +15,6 @@
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
     <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.55e2facf.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.5163dc20.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.5918901c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

+ 7 - 4
src/components/live-broadcast/action-bar.tsx

@@ -30,6 +30,9 @@ export default defineComponent({
       return state.volume === 0
     }
   },
+  mounted() {
+    console.log(runtime.cameras, runtime.cameras.length)
+  },
   methods: {
     startShare() {
       console.log('调用')
@@ -57,7 +60,7 @@ export default defineComponent({
                   cursor: 'pointer'
                 }}
               />
-              <ElDropdown
+              { runtime.cameras.length === 0 ? null : <ElDropdown
                 placement="top"
                 // @ts-ignore
                 disabled={runtime.cameras.length === 0}
@@ -79,7 +82,7 @@ export default defineComponent({
                     }}
                   />
                 </div>
-              </ElDropdown>
+              </ElDropdown> }
             </div>
             <span class={styles['bar-btn-text']}>摄像头</span>
           </div>
@@ -170,7 +173,7 @@ export default defineComponent({
                   cursor: 'pointer'
                 }}
               />
-              <ElDropdown
+              { runtime.microphones.length === 0 ? null : <ElDropdown
                 placement="top-start"
                 // @ts-ignore
                 disabled={runtime.microphones.length === 0}
@@ -193,7 +196,7 @@ export default defineComponent({
                     }}
                   />
                 </div>
-              </ElDropdown>
+              </ElDropdown>}
             </div>
             <span class={styles['bar-btn-text']}>麦克风</span>
           </div>

+ 8 - 8
src/components/live-broadcast/runtime.ts

@@ -364,14 +364,14 @@ export const joinIMRoom = async (roomId: string, type: RTC.RCLivingType, listenE
 }
 
 export const joinRoom = async (roomId: string, type: RTC.RCLivingType, listenEvents: RTC.IRoomEventListener | null) => {
-  try {
-    await request.get('/api-web/imLiveBroadcastRoom/joinRoom', {
-      params: {
-        roomUid: runtime.roomUid,
-        userId: state.user?.speakerId,
-      }
-    })
-  } catch (error) {}
+  // try {
+  //   await request.get('/api-web/imLiveBroadcastRoom/joinRoom', {
+  //     params: {
+  //       roomUid: runtime.roomUid,
+  //       userId: state.user?.speakerId,
+  //     }
+  //   })
+  // } catch (error) {}
   return await joinIMRoom(roomId, type, listenEvents)
 }
 

+ 1 - 0
src/components/live-message/model/message-model.tsx

@@ -39,6 +39,7 @@ export default defineComponent({
     async onForcedOffline() {
       // 强制退出登录
       try {
+        await RuntimeUtilCast.leaveIMRoom()
         await request.post('/api-auth/exit', { data: {} });
         RuntimeUtilCast.closeDevice('camera')
         RuntimeUtilCast.closeDevice('microphone')

+ 2 - 1
src/pages/home/header/index.tsx

@@ -7,6 +7,7 @@ import runtime, * as RuntimeUtils from "/src/components/live-broadcast/runtime";
 import { removeToken } from "/src/utils/auth";
 import { removeMedia } from '/src/components/live-broadcast/helpers'
 import { state } from '/src/state'
+import userLogo from '/src/assets/home/placehorder-icon.png'
 
 export default defineComponent({
   methods: {
@@ -54,7 +55,7 @@ export default defineComponent({
             )
           }}>
           <div class={styles.avatarWrapper}>
-             <img class={styles.userAvatar} src="/src/assets/home/placehorder-icon.png" />
+            <img class={styles.userAvatar} src={userLogo} />
             <span>{ state.user?.speakerName }</span>
           </div>
         </ElDropdown>

+ 7 - 1
src/pages/login/index.tsx

@@ -79,7 +79,7 @@ export default defineComponent({
             })
             console.log(resPhone)
             // "SYSTEM,STUDENT,TEACHER"
-            const authType = resPhone.data
+            const authType = resPhone?.data || ""
             let clientType = 'SYSTEM'
             if (authType.includes('SYSTEM')) {
               clientType = 'SYSTEM'
@@ -98,6 +98,12 @@ export default defineComponent({
             setToken(token)
 
             const roomUid = sessionStorage.getItem('roomUid')
+            // 主讲人进入房间
+            await request.get('/api-web/imLiveBroadcastRoom/speakerJoinRoom', {
+              params: {
+                roomUid: roomUid
+              }
+            })
             const details:any =  await  request.get('/api-web/imLiveBroadcastRoom/queryRoom', {
               params: {
                 roomUid: roomUid

+ 2 - 2
vite.config.ts

@@ -6,8 +6,8 @@ import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
 const vueJsx = require('@vitejs/plugin-vue-jsx')
 const legacy = require('@vitejs/plugin-legacy')
 
-// const proxyUrl = "https://test.dayaedu.com/"; // test 环境
-const proxyUrl = "http://dev.dayaedu.com/"; // test 环境
+const proxyUrl = "https://test.dayaedu.com/"; // test 环境
+// const proxyUrl = "http://dev.dayaedu.com/"; // test 环境
 // https://vitejs.dev/config/
 export default defineConfig({
   base: "./",

Some files were not shown because too many files changed in this diff