|
|
@@ -15,7 +15,8 @@
|
|
|
import lottie from "lottie-web"; //lottie
|
|
|
// const { createWorker } = require('@ffmpeg/ffmpeg');
|
|
|
import { FFmpeg } from "@ffmpeg/ffmpeg";
|
|
|
- import { fetchFile, toBlobURL } from '@ffmpeg/util'
|
|
|
+ import { fetchFile, toBlobURL } from '@ffmpeg/util';
|
|
|
+ var qiniu = require('qiniu-js');
|
|
|
const baseURL = '.'
|
|
|
let ffmpeg = null;
|
|
|
// import { createFFmpeg, fetchFile } from '@/assets/ffmpeg.min.js';
|
|
|
@@ -120,7 +121,7 @@
|
|
|
async mounted() {
|
|
|
// await this.getCityHouseList();
|
|
|
console.warn("***viewAI***")
|
|
|
- Indicator.open('加载中...');
|
|
|
+ // Indicator.open('加载中...');
|
|
|
this.getDatalist(0);
|
|
|
this.getDatalist(1);
|
|
|
this.getDatalist(3);
|
|
|
@@ -217,6 +218,7 @@
|
|
|
this.leftList[0].url = '';
|
|
|
this.uploadStatus = 0;//处理完毕
|
|
|
},
|
|
|
+ //前端压缩视频代码-旧版SDK-需要严格的跨域隔离才行
|
|
|
async transcode(file,ffmpeg){
|
|
|
// if(!crossOriginIsolated) {
|
|
|
// SharedArrayBuffer = ArrayBuffer;
|
|
|
@@ -237,6 +239,7 @@
|
|
|
}));
|
|
|
// this.uploadMaterielFile(newfile)
|
|
|
},
|
|
|
+ //前端压缩视频代码-新版版SDK-需要严格的跨域隔离才行
|
|
|
async transcodeNew(file,form){
|
|
|
if (ffmpeg === null) {
|
|
|
ffmpeg = new FFmpeg();
|
|
|
@@ -261,7 +264,8 @@
|
|
|
this.uploadStatus = -1;
|
|
|
let d0 = Date.now();
|
|
|
await ffmpeg.writeFile(name, await fetchFile(file));
|
|
|
- await ffmpeg.exec(['-i', name, 'output.mp4']);
|
|
|
+ //‘-b’,‘2000000’,
|
|
|
+ await ffmpeg.exec(['-i', name, '-r', '15', 'output.mp4']);//,
|
|
|
this.uploadStatus = 1;
|
|
|
let d1 = Date.now();
|
|
|
console.warn("***time1**", d0, d1,d1 - d0)
|
|
|
@@ -272,8 +276,62 @@
|
|
|
// video.src = URL.createObjectURL(new Blob([data.buffer], { type: 'video/mp4' }));
|
|
|
|
|
|
var newfile = new File([data.buffer], name, { type: "video/mp4" });
|
|
|
+ // return newfile;
|
|
|
this.uploadMaterielFile({file:newfile},form)
|
|
|
},
|
|
|
+ //上传到七牛云中
|
|
|
+ async uploadVideolFile(file,form){
|
|
|
+ var self = this;
|
|
|
+ let tokenObj = await requestConfig('getUploadToken', {});//获取上传token
|
|
|
+
|
|
|
+ var token = tokenObj.single.token;
|
|
|
+ var resultUrl = tokenObj.single.resultUrl; //上传图片的访问前缀this.resultUrl =
|
|
|
+ var tp = file.name.substring(file.name.lastIndexOf('.'));
|
|
|
+ var putExtra = {
|
|
|
+ fname: "",
|
|
|
+ params: {},
|
|
|
+ mimeType: null
|
|
|
+ };
|
|
|
+ var config = {
|
|
|
+ useCdnDomain: true,
|
|
|
+ disableStatisticsReport: false,
|
|
|
+ retryCount: 6,
|
|
|
+ region: qiniu.region.z0
|
|
|
+ };
|
|
|
+ self.uploadStatus = 1;//上传中
|
|
|
+ self.showPersonView = false;
|
|
|
+ self.addSilhouette();//添加剪影视频
|
|
|
+ var fileName = decodeURIComponent(encodeURIComponent(Date.now() + '/video' + Math.floor(Math.random()*1000))) + tp;
|
|
|
+ var observable = qiniu.upload(file, fileName, token, putExtra, config);
|
|
|
+ var subscription = observable.subscribe(self.next, self.error, async function(res){
|
|
|
+ self.uploading=false;
|
|
|
+ let VideoUrl = resultUrl + fileName;
|
|
|
+ console.warn("视频上传七牛成功",VideoUrl);
|
|
|
+ // self.$message.success('视频上传成功');
|
|
|
+ // alert("***uploadMaterielFile***"+$config.brandId+this.userId);
|
|
|
+ let data = {
|
|
|
+ "url":VideoUrl,
|
|
|
+ "brandId": $config.brandId,
|
|
|
+ "userId":self.userId
|
|
|
+ }
|
|
|
+ let res1 = await requestConfig('robust_videoV2', data, true, false)
|
|
|
+ if (res1 && res1.success && res1.single) {
|
|
|
+ self.videoId = res1.single;//根据Id查询结果
|
|
|
+ self.startInterval();//开始轮询获取结果
|
|
|
+ }else{
|
|
|
+ self.initStatus();//还原初始状态
|
|
|
+ }
|
|
|
+ let videoForm = document.getElementById(form); //获取表单对象
|
|
|
+ videoForm && videoForm.reset(); // 重置表单
|
|
|
+ });
|
|
|
+ },
|
|
|
+ next(res){
|
|
|
+ this.progress = Math.round(res.total.percent);//loaded已经加载的
|
|
|
+ },
|
|
|
+ // 上传七牛云发生错误
|
|
|
+ error(res){
|
|
|
+ this.$message.error('视频上传失败'+res.message);
|
|
|
+ },
|
|
|
async uploadImgObj(e,form,type=1){
|
|
|
this.stopFlag = false;//上传开始时，开启上传
|
|
|
if(type==2){
|
|
|
@@ -283,7 +341,8 @@
|
|
|
var file = e.target.files[0];
|
|
|
// this.transcodeNew(file,form);
|
|
|
var fileSize = file.size / 1024 / 1024;
|
|
|
- // alert('**文件**' + e.target.value + "-fileName=" + file.name);
|
|
|
+ console.warn('**文件**' + e.target.value + "-fileName=" + file.name+ "-fileSize="+fileSize);
|
|
|
+ // alert('**文件**' + e.target.value + "-fileName=" + file.name+ "-fileSize="+fileSize);
|
|
|
if (!/\.(MP4|mp4|MOV|mov)$/.test(e.target.value)) {
|
|
|
this.$message.warning('文件类型必须是mp4或者mov');
|
|
|
var videoForm = document.getElementById(form); //获取表单对象
|
|
|
@@ -307,7 +366,11 @@
|
|
|
var item = {};
|
|
|
item.file = file;
|
|
|
console.warn("***uploadImgObj***",file)
|
|
|
- this.uploadMaterielFile(item, form); //正常上传图片
|
|
|
+ if(fileSize>20){//七牛云上传-服务端压缩
|
|
|
+ this.uploadVideolFile(file,form);
|
|
|
+ }else{
|
|
|
+ this.uploadMaterielFile(item, form); //正常上传图片
|
|
|
+ }
|
|
|
}
|
|
|
}else{//安卓
|
|
|
let reader = new FileReader();
|
|
|
@@ -331,7 +394,11 @@
|
|
|
var item = {};
|
|
|
item.file = file;
|
|
|
console.warn("***uploadImgObj***",file)
|
|
|
- this.uploadMaterielFile(item, form); //正常上传图片
|
|
|
+ if(fileSize>20){//七牛云上传-服务端压缩
|
|
|
+ this.uploadVideolFile(file,form);
|
|
|
+ }else{
|
|
|
+ this.uploadMaterielFile(item, form); //正常上传图片-不压缩
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -343,7 +410,6 @@
|
|
|
//视频上传进度处理
|
|
|
uploadProgress(e){
|
|
|
this.progress = Math.round((e.loaded / e.total) * 100);//loaded已经加载的
|
|
|
- console.warn("***uploadProgress***",this.progress)
|
|
|
},
|
|
|
//显示弹窗提示框
|
|
|
showPopViewHandle(){
|
|
|
@@ -402,6 +468,7 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ //视频直接二进制上传方式
|
|
|
async uploadMaterielFile(item, form) {
|
|
|
this.uploadStatus = 0;
|
|
|
this.peopleIndex = 0; //选中第一个
|
|
|
@@ -413,14 +480,16 @@
|
|
|
formData.append('file', item.file);
|
|
|
formData.append('brandId', $config.brandId);
|
|
|
formData.append('userId', this.userId);
|
|
|
- console.warn("***uploadMaterielFile***");
|
|
|
+ console.warn("****uploadMaterielFile**",$config.brandId,this.userId)
|
|
|
+ // alert("***uploadMaterielFile***"+$config.brandId+this.userId);
|
|
|
this.uploadStatus = 1;//上传中
|
|
|
this.showPersonView = false;
|
|
|
this.addSilhouette();//添加剪影视频
|
|
|
let res = await requestConfig('robust_video', formData, true, false,'post',this.uploadProgress,this.cancel)
|
|
|
+ // alert("***uploadMaterielFile1***"+JSON.stringify(res));
|
|
|
if (axios.isCancel(res)) {//取消上传处理
|
|
|
this.initStatus();//还原初始状态
|
|
|
- }else if (res.success && res.single) {
|
|
|
+ }else if (res && res.success && res.single) {
|
|
|
this.videoId = res.single;//根据Id查询结果
|
|
|
this.startInterval();//开始轮询获取结果
|
|
|
}else{
|
|
|
@@ -499,7 +568,8 @@
|
|
|
let index = progress.indexOf("|");
|
|
|
progress = progress.substr(0,index);
|
|
|
console.warn("***抠图进度条***",progress);
|
|
|
- this.ktProgress = parseFloat(progress);//提取出来的进度条
|
|
|
+ let numbers = progress.match(/\d+/g)
|
|
|
+ this.ktProgress = parseFloat(numbers);//提取出来的进度条
|
|
|
if(this.ktProgress>99){
|
|
|
this.ktProgress = 99;
|
|
|
}
|
|
|
@@ -637,7 +707,7 @@
|
|
|
typeName = "Virtual_Pet";
|
|
|
} else if (type == 3) {
|
|
|
typeName = "Virtual_Music";
|
|
|
- Indicator.close();
|
|
|
+ // Indicator.close();
|
|
|
}
|
|
|
var parmas = {
|
|
|
"type": typeName,
|
zjs_project