SanHQin 3 days ago
parent
commit
f169e8cb54

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.5748ccc104a4eb07af4d83be244cbea4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.a01b64be0d06813dc10b.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.847925d74f6b617875577ae9e57204fb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.799099ac470dbf7a8d34.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.847925d74f6b617875577ae9e57204fb.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.847925d74f6b617875577ae9e57204fb.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.799099ac470dbf7a8d34.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.799099ac470dbf7a8d34.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 49 - 4
src/components/pptEasyClass/index.vue

@@ -58,10 +58,16 @@
           <div class="pec_h_r_btnArea">
             <!-- openObserveDialog -->
             <!-- toggleRecording -->
+
+            <div class="pec_h_r_btn_uploadVoiceBtn" @click="uploadVoiceBtn" v-if="courseDetail.userid == userid" v-show="false">
+              <span>{{ lang.ssUploadRecordingFile }}</span>
+            </div>
+
             <div class="pec_h_r_btn_afterClass" @click="afterClass" v-if="courseDetail.userid == userid">
               <img src="../../assets/icon/newIcon/afterClass.svg" alt="" />
               <span>{{ lang.ssEndClass }}</span>
             </div>
+
             <div class="name_box" v-if="tType == 2">
               {{ userJson.username }}
             </div>
@@ -391,10 +397,9 @@ export default {
           sendFileData();
         }
       }, 100);
-      // setTimeout(()=>{
-        // window.focus()
-        // _pageWindow.focus()
-      // },300)
+      setTimeout(()=>{
+        window.focus()
+      },100)
       function openPageWindow(){
         _pageWindow.focus()
       }
@@ -625,6 +630,40 @@ export default {
         console.log('同步数据')
       }
     },
+    // 直接上传录制音频/视频
+    uploadVoiceBtn(){
+      const input = document.createElement('input');
+      input.type = 'file';
+      input.accept = '.m4a,.mp4,.mov,.mp3,.wav';
+      input.click();
+      input.onchange = (e) => {
+        const fileList = e.target.files;
+        const file = fileList[0]
+        this.addPPTClass(file)
+      // 判断文件类型并获取音频或视频时长
+      // if (file && (file.type.startsWith('audio/') || file.type.startsWith('video/'))) {
+      //   const url = URL.createObjectURL(file);
+      //   let media;
+      //   if (file.type.startsWith('audio/')) {
+      //     media = new Audio();
+      //   } else {
+      //     media = document.createElement('video');
+      //   }
+      //   media.preload = 'metadata';
+      //   media.src = url;
+      //   media.onloadedmetadata = () => {
+      //     const duration = media.duration;
+      //     console.log('文件时长(秒):', duration);
+      //     // 这里可以赋值或者进一步处理时长 duration
+      //     URL.revokeObjectURL(url);
+      //   };
+      //   media.onerror = () => {
+      //     console.error('无法读取文件时长');
+      //     URL.revokeObjectURL(url);
+      //   };
+      // }
+      }
+    }
   },
   destroyed() {
     clearInterval(this.opertimer);
@@ -809,6 +848,12 @@ export default {
   color: #F53F3F;
 }
 
+.pec_h_r_btn_uploadVoiceBtn{
+  border-color: #F0E1DD;
+  background-color: #FFF7F5;
+  color: #000;
+}
+
 .backBtn {
   width: 15px;
   height: 15px;

+ 2 - 1
src/lang/cn.json

@@ -895,5 +895,6 @@
   "ssStopRecordingNotice": "停止录制后,录音文件将发送至课堂分析应用。",
   "ssStopRecordingConfirm": "确定停止课堂录制?",
   "ssStoppedRecording": "已停止录制",
-  "ssViewRecordingResult": "查看结果"
+  "ssViewRecordingResult": "查看结果",
+  "ssUploadRecordingFile": "上传录制"
 }

+ 2 - 1
src/lang/en.json

@@ -893,5 +893,6 @@
   "ssStopRecordingNotice": "After stopping the recording, the file will be sent to the classroom analysis application.",
   "ssStopRecordingConfirm": "Are you sure you want to stop classroom recording?",
   "ssStoppedRecording": "Recording stopped",
-  "ssViewRecordingResult": "View result"
+  "ssViewRecordingResult": "View result",
+  "ssUploadRecordingFile": "Upload Recording"
 }

+ 2 - 1
src/lang/hk.json

@@ -893,5 +893,6 @@
   "ssStopRecordingNotice": "停止錄製後,錄音檔案將發送至課堂分析應用。",
   "ssStopRecordingConfirm": "確定停止課堂錄製?",
   "ssStoppedRecording": "已停止錄製",
-  "ssViewRecordingResult": "查看結果"
+  "ssViewRecordingResult": "查看結果",
+  "ssUploadRecordingFile": "上傳錄製"
 }

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