From e8ec903206cb82e4dbb4687291d5f7788e7ff046 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 06 五月 2024 18:17:47 +0800
Subject: [PATCH] bug修改
---
packageDomain/pages/resourceDetails/myAudio/index.js | 222 +++++++++++++++++++++++--------------------------------
1 files changed, 94 insertions(+), 128 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index c15864e..e0d3d9a 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -49,23 +49,15 @@
loading: true,
hidden: true
},
- // // 鏃堕棿鏍煎紡鍖�
- // 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);
- minute = minute < 10 ? ("0" + minute) : minute;
- second = second < 10 ? ("0" + second) : second;
- let res = minute + ":" + second;
- return res;
+ let second = Math.round(time % 60);
+ let minuteStr = minute < 10 ? "0" + minute : "" + minute;
+ let secondStr = second < 10 ? "0" + second : "" + second;
+ return minuteStr + ":" + secondStr;
},
+
audio: null,
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -80,12 +72,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; // 瀵艰埅鏍忛珮搴�
@@ -96,24 +90,25 @@
bookId: options.bookId,
bookName: options.bookName,
cmsId: options.cmsId,
- parentName: options.parentName,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
formPath: options.formPath
})
+
+ if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
+ this.setData({
+ parentName: options.parentName,
+ })
+ }
this.resourceDetailsData()
this.getNoteList()
- console.log(options, 'options');
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*
*/
- onReady() {
-
-
- },
+ onReady() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
@@ -139,6 +134,9 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ *
+ * 閫�鍑洪〉闈㈡椂鍊欒皟鐢ㄧ殑
+ *
*/
onUnload() {
// this.setData({
@@ -152,16 +150,18 @@
// myAudio.src = ''
// myAudio.destroy()
- // this.setData({
- // myAudioPos: '',
- // isplay: false, //鏄惁榛樿鎾斁,
- // myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害
- // showData: '',
- // });
+ this.setData({
+ // myAudioPos: '',
+ isplay: false, //鏄惁榛樿鎾斁,
+ myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害
+ showData: '',
+ speed: 1.0,
+ });
+ myAudio.playbackRate = this.data.speed;
// 鍋滄闊抽鎾斁
myAudio.stop();
// 閿�姣� InnerAudioContext 瀹炰緥
- myAudio.destroy();
+ // myAudio.destroy();
},
count(timeStr) {
const data = {
@@ -201,24 +201,18 @@
onShareAppMessage() {
},
- 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.bookName,
+ submitTitle: this.data.titleName,
dialogKey: true,
textvalue: ''
});
@@ -240,7 +234,6 @@
cmsPath: this.data.parentProductLinkPath,
itemFields: {
SysType: 'CmsFolder',
- // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
selectType: [],
freeFile: [],
file: [],
@@ -250,6 +243,7 @@
jsek_resourceBrief: [],
jsek_link: [],
jsek_questionBank: [],
+ learnSelectType: [],
learnSelectType: []
},
pading: {
@@ -257,44 +251,47 @@
size: 999
}
}
+
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)
- this.setData({
- threeLeveData: this.data.threeLeveData
- })
- this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
- if (this.data.productLinkPath == items.productLinkPath) {
- if (this.data.formPath == 'jsek_cloudLearning') {
- // 杩欓噷澶勭悊浜戝涔犵殑
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + items.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey),
- titleName: items.name
- })
- this.pubulicPlayFun()
- } else {
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file,
- titleName: items.name
- })
- this.pubulicPlayFun()
- }
- let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
- this.setData({
- selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
- });
- }
- });
+ this.data.threeLeveData.push(item);
+ }
+ });
+ this.data.threeLeveData.forEach((items, indexs) => {
+ if (this.data.productLinkPath == items.productLinkPath) {
+ selectedId = indexs;
+
}
})
- this.data.threeLeveData.forEach((item) => {})
+ 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);
+ } else {
+ showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
+ }
+ titleName = datas.name;
+ }
+
this.setData({
+ threeLeveData: this.data.threeLeveData,
+ selectedId: selectedId,
+ showData: showDataUrl,
+ titleName: titleName,
loading: false,
hidden: false
- })
- })
+ });
+ this.pubulicPlayFun();
+
+ });
},
+
onVideo(e) {
this.setData({
myAudioCurrent: '00:00',
@@ -309,7 +306,6 @@
selectedId: e.currentTarget.dataset.index,
showData: ''
})
-
if (item.selectType == "audio" || item.learnSelectType === "audio") {
if (this.data.formPath == 'jsek_cloudLearning') {
// 杩欓噷澶勭悊浜戝涔犵殑
@@ -317,10 +313,9 @@
showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + item.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey)
})
this.pubulicPlayFun()
-
} else {
this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
+ showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile
})
this.pubulicPlayFun()
}
@@ -333,14 +328,11 @@
productId: this.data.bookId,
appRefCode: app.config.appRefCode
}).then((res) => {
- // console.log(res);
this.setData({
topicId: res.id
})
})
},
-
-
newTopicMessageGet() {
let query = {
@@ -352,13 +344,12 @@
newDataListRequest: []
}
app.MG.ugc.newTopicMessage(query).then(res => {
- // console.log(res);
+
})
},
// 鏍囬鏀瑰彉
changeTitle(e) {
- // console.log(e.currentTarget.dataset.value);
this.setData({
flag: e.currentTarget.dataset.value
})
@@ -388,8 +379,7 @@
} else if (this.data.submitType == 'edit') {
this.updateNote()
}
- // console.log(this.data.textvalue);
- // console.log(this.data.titleName);
+
this.setData({
dialogKey: false
});
@@ -397,15 +387,12 @@
this.getNoteList()
},
- onTextarea() {
- // console.log(this.data.textvalue);
- },
+ onTextarea() {},
textareaChange(e) {
this.setData({
textvalue: e.detail.value
})
},
-
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
@@ -447,9 +434,8 @@
this.setData({
"pageCount.total": res.totalSize,
noteList: res.datas,
- loading: false
})
- // console.log('绗旇鍒楄〃', res.datas);
+
})
},
// 缂栬緫鎸夐挳
@@ -463,7 +449,7 @@
noteId: note.id,
dialogKey: true,
})
- console.log(this.data.submitTitle);
+
// this.showDialog()
},
@@ -500,15 +486,6 @@
},
// 鏂板缓绗旇鎺ュ彛
async makeNote() {
- // const token = wx.getStorageSync('jsek-token')
- // if (!token) {
- // return wx.getUserProfile({
- // desc: '鐢ㄦ埛鐧诲綍',
- // success: (res) => {
- // // console.log(res);
- // }
- // })
- // }
let topicId
await app.MG.ugc
.getProductUserSubmitTopic({
@@ -586,15 +563,15 @@
},
// 鎾斁鍏叡浠ｇ爜
pubulicPlayFun() {
+ // debugger
+ this.setData({
+ speed: 1.0,
+ })
+ myAudio.playbackRate = this.data.speed;
myAudio.src = this.data.showData
- // console.log(myAudio.src);
// 鍦╫nCanplay閲岃幏鍙栧苟璁剧疆闊抽鏃堕暱鍜屾挱鏀捐繘搴�
myAudio.onCanplay(() => {
myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌
- this.setData({
- myAudioDuration: this.format(myAudio.duration),
- })
-
setTimeout(() => {
this.setData({
myAudioDuration: this.format(myAudio.duration),
@@ -603,27 +580,33 @@
}, 100);
});
+
+ //鎾斁浜嬩欢
+ myAudio.play();
+
// 鎾斁瀹屾垚澶勭悊锛屾寜閽彉涓�涓�
myAudio.onEnded((res) => {
this.setData({
- isplay: false
+ speed: 1.0,
+ })
+ myAudio.playbackRate = this.data.speed;
+ this.setData({
+ isplay: true,
+ myAudioCurrent: '00:00',
+ myAudioPos: '',
})
});
-
//杩涘害鏉″彉鍖�
myAudio.onTimeUpdate(() => {
- console.log(this.format(myAudio.duration));
this.setData({
myAudioPos: myAudio.currentTime / myAudio.duration * 100,
myAudioCurrent: this.format(myAudio.currentTime),
myAudioDuration: this.format(myAudio.duration),
});
+ console.log(myAudio.currentTime, myAudio.duration);
})
-
- myAudio.play();
},
-
//鎾斁
play() {
@@ -641,7 +624,6 @@
isplay: true
});
},
-
//鍙冲垏鎹�
onLeftSwitch() {
@@ -665,7 +647,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])
@@ -679,8 +660,6 @@
// 宸﹀彸鍒囨崲
changeItem(item) {
- console.log(item);
-
if (this.data.showData != '') {
this.setData({
showData: ''
@@ -713,7 +692,7 @@
}
setTimeout(() => {
- console.log(this.data.speed, 'this.data.speed');
+
myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
@@ -730,12 +709,10 @@
})
},
-
toggleDropdown() {
this.setData({
showDropdown: !this.data.showDropdown
});
-
},
smallSpeed() {
this.setData({
@@ -743,7 +720,7 @@
showDropdown: !this.data.showDropdown
})
setTimeout(() => {
- // myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
@@ -753,7 +730,7 @@
showDropdown: !this.data.showDropdown
})
setTimeout(() => {
- // myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
@@ -763,7 +740,7 @@
showDropdown: !this.data.showDropdown
})
setTimeout(() => {
- // myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
@@ -773,20 +750,9 @@
showDropdown: !this.data.showDropdown
})
setTimeout(() => {
- // myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
- // 浜戝涔犲鐞嗗凡璐拱姝ｅ紡鏂囦欢
- handleFile() {
- console.log(1111);
- },
- // 浜戝涔犺瘯鐪嬪鐞�
- handleFreeFile() {
- console.log(2222);
- },
- // 鍒ゆ柇璧勬簮鏄惁璐拱
- resourceIsBuy() {
- console.log(333);
- }
+
})
\ No newline at end of file
--
Gitblit v1.9.1