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 | 360 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 199 insertions(+), 161 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 29121d2..e0d3d9a 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -1,6 +1,8 @@
// pages/resourceDetails/index.js
const app = getApp()
const myAudio = wx.createInnerAudioContext();
+// innerAudioContext.onPlay(function callback),
+// InnerAudioContext.onTimeUpdate(function callback)
Page({
/**
@@ -11,7 +13,7 @@
noteList: [],
navBarHeight: '',
barHeight: '',
- flag: true, // 杈撳叆妗嗘槸鍚︽樉绀�
+ flag: false, // 杈撳叆妗嗘槸鍚︽樉绀�
tabPanelstyle: 'display:flex;justify-content:center;align-items:center;',
activeValues: [0],
dialogKey: false,
@@ -35,19 +37,27 @@
style: 'height: 248rpx',
submitType: "new", // 鏂板缓 or 缂栬緫
noteId: '',
- myAudioDuration: '00:00', // 瑙嗛鏃堕棿
- myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害
+ myAudioDuration: '00:00', // 瑙嗛鏃堕棿
+ myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害
isplay: false, //鏄惁榛樿鎾斁,
selectId: '',
speed: 1.0,
+ myAudioPos: '',
+ startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿
+ pauseTime: 0, //鏆傚仠鏃堕棿
+ formPath: '',
+ loading: true,
+ hidden: true
+ },
+ format(time) {
+ let minute = 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;
},
- // 鏃堕棿鏍煎紡鍖�
- 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;
- },
+
audio: null,
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -62,17 +72,17 @@
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; // 瀵艰埅鏍忛珮搴�
- // console.log(options, 'options');
this.setData({
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
@@ -80,48 +90,97 @@
bookId: options.bookId,
bookName: options.bookName,
cmsId: options.cmsId,
- parentName: options.parentName,
parentProductLinkPath: options.parentProductLinkPath,
- productLinkPath: options.productLinkPath
+ productLinkPath: options.productLinkPath,
+ formPath: options.formPath
})
+ if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
+ this.setData({
+ parentName: options.parentName,
+ })
+ }
this.resourceDetailsData()
this.getNoteList()
-
-
-
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ *
*/
- onReady() {
-
-
- },
+ onReady() {},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
- this.pubulicPlayFun()
+ this.setData({
+ startTime: Date.now()
+ })
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
onHide() {
-
+ this.setData({
+ pauseTime: Date.now()
+ })
+ if (wx.getStorageSync(app.config.tokenKey)) {
+ let duration = this.data.pauseTime - this.data.startTime
+ this.count(duration)
+ }
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ *
+ * 閫�鍑洪〉闈㈡椂鍊欒皟鐢ㄧ殑
+ *
*/
onUnload() {
+ // this.setData({
+ // pauseTime: Date.now()
+ // })
+ // if (wx.getStorageSync(app.config.tokenKey)) {
+ // let duration = this.data.pauseTime - this.data.startTime
+ // this.count(duration)
+ // }
+
+ // myAudio.src = ''
+ // myAudio.destroy()
+ this.setData({
+ // myAudioPos: '',
+ isplay: false, //鏄惁榛樿鎾斁,
+ myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害
+ showData: '',
+ speed: 1.0,
+ });
+ myAudio.playbackRate = this.data.speed;
+ // 鍋滄闊抽鎾斁
+ myAudio.stop();
+ // 閿�姣� InnerAudioContext 瀹炰緥
+ // myAudio.destroy();
},
-
+ count(timeStr) {
+ const data = {
+ appRefCode: app.config.appRefCode,
+ type: 'LearningTime', //缁熻绫诲瀷--闃呰鏃堕暱
+ data: timeStr + '', //缁熻鍐呭--鏃堕暱姣
+ event: 'LearningTime',
+ sysType: 'App'
+ }
+ //闃呰鍟嗗搧鐨刬d
+ if (this.data.bookId) {
+ data.productId = this.data.bookId
+ }
+ //闃呰璧勬簮鐨刬d
+ if (this.data.cmsId) {
+ data.cmsItemId = this.data.cmsId
+ }
+ app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
+ },
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
@@ -142,33 +201,24 @@
onShareAppMessage() {
},
- onTabsChange(event) {
+ onTabsChange(event) {},
- },
-
- onTabsClick(event) {
-
- }, handleChange(e) {
+ 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: ''
-
-
+ textvalue: ''
});
},
closeDialog() {
-
this.setData({
dialogKey: false
});
@@ -177,8 +227,6 @@
wx.navigateBack();
},
resourceDetailsData() {
-
-
let query = {
path: '*',
queryType: '*',
@@ -186,7 +234,6 @@
cmsPath: this.data.parentProductLinkPath,
itemFields: {
SysType: 'CmsFolder',
- // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
selectType: [],
freeFile: [],
file: [],
@@ -196,6 +243,7 @@
jsek_resourceBrief: [],
jsek_link: [],
jsek_questionBank: [],
+ learnSelectType: [],
learnSelectType: []
},
pading: {
@@ -205,59 +253,74 @@
}
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") {
- this.data.threeLeveData.push(item)
- this.setData({
- threeLeveData: this.data.threeLeveData
- })
-
-
- if (this.data.productLinkPath == item.productLinkPath) {
- console.log(item.id, 'index');
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file,
- titleName: item.name
- })
- this.pubulicPlayFun()
- // this.setData({
- // selectedId: index
-
- // })
- }
+ if (item.selectType === "audio" || item.learnSelectType === "audio") {
+ this.data.threeLeveData.push(item);
}
+ });
+ this.data.threeLeveData.forEach((items, indexs) => {
+ if (this.data.productLinkPath == items.productLinkPath) {
+ selectedId = indexs;
+ }
})
- this.data.threeLeveData.forEach((item) => {
- // console.log(item.name);
- })
- })
+ 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',
+ 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: ''
})
+ if (item.selectType == "audio" || item.learnSelectType === "audio") {
+ if (this.data.formPath == 'jsek_cloudLearning') {
+ // 杩欓噷澶勭悊浜戝涔犵殑
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + item.protectedFile + '&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()
+ }
+ }
}
- this.setData({
- selectedId: e.currentTarget.dataset.index,
- })
-
-
- this.setData({
- titleName: item.name,
- selectId: item.id
- })
-
- if (item.selectType == "audio") {
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
- })
- this.pubulicPlayFun()
- }
-
},
getProductUserSubmitTopicGet() {
@@ -265,15 +328,11 @@
productId: this.data.bookId,
appRefCode: app.config.appRefCode
}).then((res) => {
- // console.log(res);
-
this.setData({
topicId: res.id
})
})
},
-
-
newTopicMessageGet() {
let query = {
@@ -285,33 +344,31 @@
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
-
})
},
// 鏍囬杈撳叆妗嗗��
inputChange(e) {
this.setData({
- titleName: e.detail.value
+ submitTitle: e.detail.value
})
},
confirmSuggest() {
- if (!this.data.textvalue) {
+ if (!this.data.textvalue.trim()) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁板唴瀹�',
})
- } else if (!this.data.titleName) {
+ } else if (!this.data.submitTitle) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁版爣棰�',
@@ -322,21 +379,20 @@
} else if (this.data.submitType == 'edit') {
this.updateNote()
}
- // console.log(this.data.textvalue);
- // console.log(this.data.titleName);
+
this.setData({
dialogKey: false
});
+
+ this.getNoteList()
+
},
- onTextarea() {
- // console.log(this.data.textvalue);
- },
+ onTextarea() {},
textareaChange(e) {
this.setData({
textvalue: e.detail.value
})
},
-
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
@@ -372,18 +428,14 @@
topicIdOrRefCode: topicId + ''
}
await app.MG.ugc.getTopicMessageList(query).then((res) => {
- // notePage.value.total = res.totalSize
res.datas.forEach((item) => {
-
item.createDate = this.convertTimestamp(item.createDate)
- console.log(item, 'item789');
})
this.setData({
"pageCount.total": res.totalSize,
noteList: res.datas,
- loading: false
})
- // console.log('绗旇鍒楄〃', res.datas);
+
})
},
// 缂栬緫鎸夐挳
@@ -393,9 +445,12 @@
submitType: "edit",
textvalue: note.content,
submitTitle: note.name,
- noteId: note.id
+
+ noteId: note.id,
+ dialogKey: true,
})
- this.showDialog()
+
+ // this.showDialog()
},
// 鍒犻櫎绗旇
@@ -405,13 +460,15 @@
messageIds.push(id)
wx.showModal({
title: '鎻愮ず',
- content: '纭鍒犻櫎璇ョ瑪璁板悧锛�',//editable濡傛灉涓簍rue锛岃繖灏辨槸杈撳叆妗嗙殑鍐呭
- editable: false,//鏄惁鏄剧ず杈撳叆妗�
- placeholderText: '璇疯緭鍏ュ唴瀹瑰惂',//杈撳叆妗嗙殑榛樿鍐呭
+ content: '纭鍒犻櫎璇ョ瑪璁板悧锛�', //editable濡傛灉涓簍rue锛岃繖灏辨槸杈撳叆妗嗙殑鍐呭
+ editable: false, //鏄惁鏄剧ず杈撳叆妗�
+ placeholderText: '璇疯緭鍏ュ唴瀹瑰惂', //杈撳叆妗嗙殑榛樿鍐呭
success: (res) => {
if (res.confirm) {
app.MG.ugc
- .delTopicMessage({ messageIds })
+ .delTopicMessage({
+ messageIds
+ })
.then((res) => {
wx.showToast({
title: '鍒犻櫎鎴愬姛',
@@ -429,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({
@@ -515,66 +563,65 @@
},
// 鎾斁鍏叡浠ｇ爜
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; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌銆傘�傘��
+ myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌
setTimeout(() => {
- console.log(myAudio.duration, 'myAudio.duration');
- // debugger
this.setData({
myAudioDuration: this.format(myAudio.duration),
myAudioCurrent: this.format(myAudio.currentTime)
});
- }, 1000);
+ }, 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(() => {
this.setData({
myAudioPos: myAudio.currentTime / myAudio.duration * 100,
- myAudioCurrent: this.format(myAudio.currentTime)
+ myAudioCurrent: this.format(myAudio.currentTime),
+ myAudioDuration: this.format(myAudio.duration),
});
+ console.log(myAudio.currentTime, myAudio.duration);
})
},
-
//鎾斁
play() {
- console.log(22222);
myAudio.startTime = this.data.myAudioCurrent; //鑰冭檻鍒拌繘搴︽潯琚嫋鍔紝涓嶄竴瀹氫粠00:00:00寮�濮�
myAudio.play();
this.setData({
- isplay: true
+ isplay: false
});
-
-
},
// 鍋滄
stop() {
- console.log(11111);
myAudio.pause();
this.setData({
- isplay: false
- });
- },
- adsfhaewlf() {
- myAudio.pause();
- this.setData({
- isplay: false
+ isplay: true
});
},
@@ -589,27 +636,22 @@
this.changeItem(this.data.threeLeveData[index - 1])
this.setData({
selectedId: index - 1,
-
})
} else {
console.log('宸茬粡鏄涓�棣栦簡');
}
-
},
-
//鍙冲垏鎹�
onRightSwitch() {
this.setData({
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])
this.setData({
selectedId: index + 1,
-
})
} else {
console.log('宸茬粡鏄渶鍚庝竴棣栦簡');
@@ -618,8 +660,6 @@
// 宸﹀彸鍒囨崲
changeItem(item) {
- console.log(item);
-
if (this.data.showData != '') {
this.setData({
showData: ''
@@ -629,7 +669,6 @@
titleName: item.name,
selectId: item.id
})
-
if (item.selectType == "audio") {
this.setData({
showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
@@ -653,8 +692,8 @@
}
setTimeout(() => {
- console.log(this.data.speed, 'this.data.speed');
- myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
@@ -670,12 +709,10 @@
})
},
-
toggleDropdown() {
this.setData({
showDropdown: !this.data.showDropdown
});
-
},
smallSpeed() {
this.setData({
@@ -683,7 +720,7 @@
showDropdown: !this.data.showDropdown
})
setTimeout(() => {
- myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
@@ -693,7 +730,7 @@
showDropdown: !this.data.showDropdown
})
setTimeout(() => {
- myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
@@ -703,7 +740,7 @@
showDropdown: !this.data.showDropdown
})
setTimeout(() => {
- myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
},
@@ -713,8 +750,9 @@
showDropdown: !this.data.showDropdown
})
setTimeout(() => {
- myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
+ myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂�
myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼
}, 200);
- }
+ },
+
})
\ No newline at end of file
--
Gitblit v1.9.1