From 4c29b79d485d68d506e798f4fd381232ebc55a86 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期六, 14 九月 2024 11:27:33 +0800
Subject: [PATCH] bug
---
packageDomain/pages/resourceDetails/myAudio/index.js | 218 +++++++++++++++++++++++++++++-------------------------
1 files changed, 117 insertions(+), 101 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index ca60362..af8f609 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -1,6 +1,9 @@
// pages/resourceDetails/index.js
const app = getApp()
const myAudio = wx.createInnerAudioContext();
+import {
+ loginInfo
+} from '../../../../assets/js/login';
// innerAudioContext.onPlay(function callback),
// InnerAudioContext.onTimeUpdate(function callback)
Page({
@@ -19,6 +22,7 @@
dialogKey: false,
style: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx;',
activeId: '',
+ storeInfo: '',
bookId: '',
bookName: '',
cmsId: '',
@@ -26,6 +30,7 @@
parentProductLinkPath: '',
productLinkPath: '',
threeLeveData: [],
+ source: "",
showData: '',
src: '',
selectedId: null,
@@ -47,19 +52,14 @@
pauseTime: 0, //鏆傚仠鏃堕棿
formPath: '',
loading: true,
- hidden: true
+ hidden: true,
+ playerList: [],
+ progress: 0,
},
- // // 鏃堕棿鏍煎紡鍖�
- // format(t) {
- // let time = Math.floor(t / 60) >= 10 ? Math.floor(t / 60) : '0' + Math.floor(t / 60);
- // t = time + ':' + ((t % 60) / 100).toFixed(2).slice(-2);
- // return t;
- // },
-
format(time) {
let minute = Math.floor(time / 60);
- let second = Math.floor(time % 60);
+ let second = Math.round(time % 60);
let minuteStr = minute < 10 ? "0" + minute : "" + minute;
let secondStr = second < 10 ? "0" + second : "" + second;
return minuteStr + ":" + secondStr;
@@ -79,23 +79,14 @@
return formattedDate
},
-
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
+ console.log(options);
wx.setNavigationBarTitle({
-
title: '璧勬簮璇︽儏-闊抽'
-
});
-
-
-
-
-
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -103,12 +94,14 @@
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
activeId: options.activeId,
+ storeInfo: options.storeInfo,
bookId: options.bookId,
bookName: options.bookName,
cmsId: options.cmsId,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
- formPath: options.formPath
+ formPath: options.formPath,
+ source: options.source,
})
if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
@@ -116,18 +109,28 @@
parentName: options.parentName,
})
}
- this.resourceDetailsData()
- this.getNoteList()
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.resourceDetailsData()
+ this.getNoteList()
+ } else {
+ this.resourceDetailsData()
+ this.getNoteList()
+ }
+ })
+ } else {
+ this.resourceDetailsData()
+ this.getNoteList()
+ }
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*
*/
- onReady() {
-
-
- },
+ onReady() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
@@ -149,6 +152,7 @@
let duration = this.data.pauseTime - this.data.startTime
this.count(duration)
}
+ this.setPlayerList()
},
/**
@@ -181,6 +185,7 @@
myAudio.stop();
// 閿�姣� InnerAudioContext 瀹炰緥
// myAudio.destroy();
+ this.setPlayerList()
},
count(timeStr) {
const data = {
@@ -217,24 +222,17 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
+ onShareAppMessage() {},
+ onShareTimeline() {},
+ onTabsChange(event) {},
- },
- onTabsChange(event) {
-
- },
-
- onTabsClick(event) {
-
- },
+ onTabsClick(event) {},
handleChange(e) {
this.setData({
activeValues: e.detail.value,
});
},
- onTakeNotes() {
-
- },
+ onTakeNotes() {},
showDialog(e) {
this.setData({
submitTitle: this.data.titleName,
@@ -268,6 +266,7 @@
jsek_resourceBrief: [],
jsek_link: [],
jsek_questionBank: [],
+ learnSelectType: [],
learnSelectType: []
},
pading: {
@@ -275,28 +274,51 @@
size: 999
}
}
-
+ if (this.data.storeInfo) {
+ query.storeInfo = this.data.storeInfo
+ }
app.MG.store.getProductDetail(query).then(res => {
let selectedId = -1; // 鍒濆鍖栭�変腑椤圭储寮�
let showDataUrl = '';
let titleName = '';
res.datas.cmsDatas[0].datas.forEach((item, index) => {
- if (item.selectType === "audio" || item.learnSelectType === "audio") {
- this.data.threeLeveData.push(item);
+ if (this.data.source == 'qrcode') {
+ if (item.id == this.data.activeId) {
+ this.data.threeLeveData.push(item);
+ }
+ } else {
+ if (item.selectType === "audio" || item.learnSelectType === "audio") {
+ // this.data.threeLeveData.push(item);
+ if (this.data.storeInfo == 'jsek_digitalCourses') {
+ if (this.data.isBuy) {
+ if (item.sysType == 'CmsItem') {
+ this.data.threeLeveData.push(item)
+ }
+ } else {
+ if (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
+ }
+ }
+ } else {
+ if (res.datas.purchasedSaleMethodIdList.includes(item.defaultSaleMethodId) || item.freeFile) {
+ this.data.threeLeveData.push(item)
+ }
+ }
+ }
}
+
});
this.data.threeLeveData.forEach((items, indexs) => {
if (this.data.productLinkPath == items.productLinkPath) {
selectedId = indexs;
-
}
})
if (selectedId !== -1) {
let datas = this.data.threeLeveData[selectedId];
-
if (this.data.formPath == 'jsek_cloudLearning') {
- showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey);
+ let file = datas.protectedFile ? datas.protectedFile : datas.file
+ showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey);
} else {
showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
}
@@ -312,45 +334,39 @@
hidden: false
});
this.pubulicPlayFun();
-
});
},
onVideo(e) {
- // myAudio.destroy();
-
+ this.setPlayerList()
this.setData({
myAudioCurrent: '00:00',
myAudioPos: '',
isplay: false
})
-
const item = e.currentTarget.dataset.item
if (this.data.showData != '') {
this.setData({
titleName: item.name,
selectId: item.id,
selectedId: e.currentTarget.dataset.index,
- showData: ''
- })
+ showData: '',
+ activeId: item.id
+ })
if (item.selectType == "audio" || item.learnSelectType === "audio") {
if (this.data.formPath == 'jsek_cloudLearning') {
+ let file = item.protectedFile ? item.protectedFile : item.file
// 杩欓噷澶勭悊浜戝涔犵殑
this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + item.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey)
+ showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey)
})
this.pubulicPlayFun()
-
} else {
-
-
this.setData({
showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile
})
this.pubulicPlayFun()
-
-
}
}
}
@@ -366,8 +382,6 @@
})
})
},
-
-
newTopicMessageGet() {
let query = {
@@ -385,7 +399,6 @@
// 鏍囬鏀瑰彉
changeTitle(e) {
-
this.setData({
flag: e.currentTarget.dataset.value
})
@@ -423,15 +436,12 @@
this.getNoteList()
},
- onTextarea() {
-
- },
+ onTextarea() {},
textareaChange(e) {
this.setData({
textvalue: e.detail.value
})
},
-
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
@@ -525,7 +535,6 @@
},
// 鏂板缓绗旇鎺ュ彛
async makeNote() {
-
let topicId
await app.MG.ugc
.getProductUserSubmitTopic({
@@ -603,7 +612,6 @@
},
// 鎾斁鍏叡浠ｇ爜
pubulicPlayFun() {
- // debugger
this.setData({
speed: 1.0,
})
@@ -613,6 +621,8 @@
myAudio.onCanplay(() => {
myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌
setTimeout(() => {
+ // 瑕佸垵濮嬪寲闊抽鐨勬椂闂�
+ // myAudio.startTime = myAudio.currentTime //寮�濮嬫椂闂�
this.setData({
myAudioDuration: this.format(myAudio.duration),
myAudioCurrent: this.format(myAudio.currentTime)
@@ -624,54 +634,34 @@
//鎾斁浜嬩欢
myAudio.play();
-
-
-
// 鎾斁瀹屾垚澶勭悊锛屾寜閽彉涓�涓�
myAudio.onEnded((res) => {
this.setData({
speed: 1.0,
})
myAudio.playbackRate = this.data.speed;
-
this.setData({
isplay: true,
myAudioCurrent: '00:00',
myAudioPos: '',
})
+
+
});
//杩涘害鏉″彉鍖�
myAudio.onTimeUpdate(() => {
-
-
-
+ myAudio.startTime = 0
this.setData({
myAudioPos: myAudio.currentTime / myAudio.duration * 100,
myAudioCurrent: this.format(myAudio.currentTime),
myAudioDuration: this.format(myAudio.duration),
+ progress: ((myAudio.currentTime / myAudio.duration) * 100).toFixed(2)
});
- // debugger
-
- console.log(this.data.myAudioPos);
+ // console.log(myAudio.currentTime.toFixed(3), myAudio.duration);
})
-
- // if (this.data.myAudioDuration !== this.data.myAudioCurrent) {
- // this.setData({
- // myAudioPos: myAudio.currentTime / myAudio.duration * 100,
- // myAudioCurrent: this.format(myAudio.currentTime),
- // myAudioDuration: this.format(myAudio.duration),
- // });
-
- // }else{
- // myAudio.pause();
- // this.setData({
- // isplay: true
- // });
- // }
},
-
//鎾斁
play() {
@@ -689,7 +679,6 @@
isplay: true
});
},
-
//鍙冲垏鎹�
onLeftSwitch() {
@@ -713,7 +702,6 @@
speed: 1.0,
myAudioCurrent: '00:00'
})
- console.log('鍙冲垏鎹�');
const index = this.data.threeLeveData.findIndex((item) => item.id == this.data.selectId)
if (this.data.threeLeveData[index + 1]) {
this.changeItem(this.data.threeLeveData[index + 1])
@@ -727,8 +715,6 @@
// 宸﹀彸鍒囨崲
changeItem(item) {
-
-
if (this.data.showData != '') {
this.setData({
showData: ''
@@ -769,7 +755,6 @@
// 鎷栧姩杩涘害鏉★紝鍒版寚瀹氫綅缃�
hanle_slider_change(e) {
-
const position = e.detail.value;
var currentTime = position / 100 * myAudio.duration;
myAudio.seek(currentTime);
@@ -777,17 +762,12 @@
myAudioPos: position,
myAudioCurrent: this.format(currentTime)
})
-
-
-
},
-
toggleDropdown() {
this.setData({
showDropdown: !this.data.showDropdown
});
-
},
smallSpeed() {
this.setData({
@@ -829,5 +809,41 @@
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
-
+ //鑾峰彇闊抽瀛︿範
+ getPlayerList() {
+ app.MG.identity
+ .getUserKey({
+ domain: 'videoPlayer',
+ keys: [this.data.bookId]
+ })
+ .then((res) => {
+ if (res.length > 0) {
+ this.setData({
+ playerList: JSON.parse(res[0].value)
+ })
+ }
+ })
+ },
+ setPlayerList() {
+ let that = this
+ if (that.data.progress > 0) {
+ let index = that.data.playerList.findIndex((itemData) => itemData.cmsItemId == that.data.selectId)
+ if (index > -1) {
+ that.data.playerList.splice(index, 1)
+ }
+ that.data.playerList.push({
+ cmsItemId: that.data.selectId,
+ progress: that.data.progress
+ })
+ app.MG.identity
+ .setUserKey({
+ setKeyRequests: [{
+ domain: 'videoPlayer',
+ key: that.data.bookId,
+ value: JSON.stringify(that.data.playerList)
+ }]
+ })
+ .then((res) => {})
+ }
+ },
})
\ No newline at end of file
--
Gitblit v1.9.1