From 338ad19ee45b5380a0d8433cbbce2a727a576dfa Mon Sep 17 00:00:00 2001 From: yiming <m13691596795@163.com> Date: 星期五, 19 四月 2024 17:34:36 +0800 Subject: [PATCH] bug2 --- packageDomain/pages/resourceDetails/myAudio/index.js | 324 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 207 insertions(+), 117 deletions(-) diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js index 0fbf416..7000199 100644 --- a/packageDomain/pages/resourceDetails/myAudio/index.js +++ b/packageDomain/pages/resourceDetails/myAudio/index.js @@ -13,7 +13,7 @@ noteList: [], navBarHeight: '', barHeight: '', - flag: true, // 杈撳叆妗嗘槸鍚︽樉绀� + flag: false, // 杈撳叆妗嗘槸鍚︽樉绀� tabPanelstyle: 'display:flex;justify-content:center;align-items:center;', activeValues: [0], dialogKey: false, @@ -42,7 +42,12 @@ isplay: false, //鏄惁榛樿鎾斁, selectId: '', speed: 1.0, - myAudioPos: '' + myAudioPos: '', + startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿 + pauseTime: 0, //鏆傚仠鏃堕棿 + formPath: '', + loading: true, + hidden: true }, // // 鏃堕棿鏍煎紡鍖� // format(t) { @@ -54,6 +59,7 @@ // 杞寲鏃堕棿 format(time) { + let minute = Math.floor(time / 60); let second = Math.floor(time % 60); minute = minute < 10 ? ("0" + minute) : minute; @@ -81,10 +87,20 @@ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇 */ onLoad(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, @@ -92,25 +108,19 @@ 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() - - - this.setData({ - myAudioPos: '', - isplay: false, //鏄惁榛樿鎾斁, - myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害 - showData: '', - }); - myAudio.src = '' - - - console.log(this.data.myAudioPos, this.data.isplay, this.data.myAudioCurrent, this.data.showData, myAudio.src); + console.log(options, 'options'); }, /** @@ -126,24 +136,73 @@ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず */ onShow() { - - + 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) => {}) + }, /** * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔 */ @@ -180,18 +239,14 @@ }, showDialog(e) { - this.setData({ - submitTitle: this.data.bookName, + submitTitle: this.data.titleName, dialogKey: true, textvalue: '' - - }); }, closeDialog() { - this.setData({ dialogKey: false }); @@ -207,7 +262,6 @@ cmsPath: this.data.parentProductLinkPath, itemFields: { SysType: 'CmsFolder', - // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁� selectType: [], freeFile: [], file: [], @@ -226,65 +280,84 @@ } 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 - }) - - this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟 - if (this.data.productLinkPath == items.productLinkPath) { - this.setData({ - showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file, - titleName: items.name - }) - this.pubulicPlayFun() - console.log(index, 'index'); - let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩 - this.setData({ - selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩 - }); - } - }); - + if (item.selectType === "audio" || item.learnSelectType === "audio") { + this.data.threeLeveData.push(item); + } + }); + // console.log(this.data.threeLeveData); + this.data.threeLeveData.forEach((items, indexs) => { + if (this.data.productLinkPath == items.productLinkPath) { + selectedId = indexs; } + }) + if (selectedId !== -1) { + let datas = this.data.threeLeveData[selectedId]; - }) - this.data.threeLeveData.forEach((item) => { - // console.log(item.name); - }) - }) + if (this.data.formPath == 'jsek_cloudLearning') { + showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey); + } else { + console.log(datas); + 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) { - // console.log(e, 'e'); + // myAudio.destroy(); + this.setData({ myAudioCurrent: '00:00', myAudioPos: '', - - isplay: false }) const item = e.currentTarget.dataset.item - console.log(item, 'item0980'); if (this.data.showData != '') { - - this.setData({ titleName: item.name, selectId: item.id, selectedId: e.currentTarget.dataset.index, showData: '' }) - console.log(e.currentTarget.dataset.index, 'e.currentTarget.dataset.index'); - if (item.selectType == "audio") { - this.setData({ - showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file - }) - this.pubulicPlayFun() + + 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 { + console.log(item.file, 'item.file'); + console.log(item.freeFile, 'item.freeFile'); + + 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() + console.log(this.data.showData, 'showData'); + + } } } }, @@ -295,7 +368,6 @@ appRefCode: app.config.appRefCode }).then((res) => { // console.log(res); - this.setData({ topicId: res.id }) @@ -323,24 +395,23 @@ // 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: '璇峰~鍐欑瑪璁版爣棰�', @@ -356,6 +427,9 @@ this.setData({ dialogKey: false }); + + this.getNoteList() + }, onTextarea() { // console.log(this.data.textvalue); @@ -401,16 +475,13 @@ 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 + // loading: false }) // console.log('绗旇鍒楄〃', res.datas); }) @@ -422,9 +493,12 @@ submitType: "edit", textvalue: note.content, submitTitle: note.name, - noteId: note.id + + noteId: note.id, + dialogKey: true, }) - this.showDialog() + console.log(this.data.submitTitle); + // this.showDialog() }, // 鍒犻櫎绗旇 @@ -460,15 +534,15 @@ }, // 鏂板缓绗旇鎺ュ彛 async makeNote() { - const token = wx.getStorageSync('jsek-token') - if (!token) { - return wx.getUserProfile({ - desc: '鐢ㄦ埛鐧诲綍', - success: (res) => { - // console.log(res); - } - }) - } + // const token = wx.getStorageSync('jsek-token') + // if (!token) { + // return wx.getUserProfile({ + // desc: '鐢ㄦ埛鐧诲綍', + // success: (res) => { + // // console.log(res); + // } + // }) + // } let topicId await app.MG.ugc .getProductUserSubmitTopic({ @@ -546,13 +620,25 @@ }, // 鎾斁鍏叡浠g爜 pubulicPlayFun() { + + // debugger + console.log(myAudio.src, 'myAudio.src'); + console.log(this.data.showData, 'this.data.showData'); + this.setData({ + speed: 1.0, + }) + myAudio.playbackRate = this.data.speed; + myAudio.src = this.data.showData - console.log(myAudio.src); + + // console.log(myAudio.src); // 鍦╫nCanplay閲岃幏鍙栧苟璁剧疆闊抽鏃堕暱鍜屾挱鏀捐繘搴� myAudio.onCanplay(() => { - myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌銆傘�傘�� + + + + myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌 setTimeout(() => { - console.log(myAudio.duration, 'myAudio.duration'); this.setData({ myAudioDuration: this.format(myAudio.duration), myAudioCurrent: this.format(myAudio.currentTime) @@ -560,57 +646,53 @@ }, 100); }); - // myAudio.onSeeked(() => { - // this.setData({ - // myAudioDuration: this.format(myAudio.duration), - // myAudioCurrent: this.format(myAudio.currentTime) - // }) - // }) + console.log(this.data.myAudioDuration); + console.log(this.data.myAudioCurrent); + // 鎾斁瀹屾垚澶勭悊锛屾寜閽彉涓�涓� myAudio.onEnded((res) => { this.setData({ - isplay: false + isplay: true }) }); //杩涘害鏉″彉鍖� myAudio.onTimeUpdate(() => { + // console.log(this.format(myAudio.duration)); 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(this.data.myAudioCurrent); + console.log(this.data.myAudioDuration); + console.log(this.data.myAudioPos); + + myAudio.play(); }, //鎾斁 play() { - console.log(22222); myAudio.startTime = this.data.myAudioCurrent; //鑰冭檻鍒拌繘搴︽潯琚嫋鍔紝涓嶄竴瀹氫粠00:00:00寮�濮� myAudio.play(); this.setData({ - isplay: true + isplay: false }); - - }, // 鍋滄 stop() { + myAudio.pause(); + this.setData({ + isplay: true + }); + }, - myAudio.pause(); - this.setData({ - isplay: false - }); - }, - adsfhaewlf() { - myAudio.pause(); - this.setData({ - isplay: false - }); - }, //鍙冲垏鎹� onLeftSwitch() { @@ -623,14 +705,11 @@ this.changeItem(this.data.threeLeveData[index - 1]) this.setData({ selectedId: index - 1, - }) } else { console.log('宸茬粡鏄涓�棣栦簡'); } - }, - //鍙冲垏鎹� onRightSwitch() { this.setData({ @@ -643,7 +722,6 @@ this.changeItem(this.data.threeLeveData[index + 1]) this.setData({ selectedId: index + 1, - }) } else { console.log('宸茬粡鏄渶鍚庝竴棣栦簡'); @@ -663,7 +741,6 @@ titleName: item.name, selectId: item.id }) - if (item.selectType == "audio") { this.setData({ showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file @@ -701,6 +778,7 @@ this.setData({ myAudioPos: position, myAudioCurrent: this.format(currentTime) + }) }, @@ -750,5 +828,17 @@ // myAudio.startTime = this.data.myAudioDuration //寮�濮嬫椂闂� myAudio.playbackRate = this.data.speed; // 鎾斁閫熺巼 }, 200); + }, + // 浜戝涔犲鐞嗗凡璐拱姝e紡鏂囦欢 + handleFile() { + console.log(1111); + }, + // 浜戝涔犺瘯鐪嬪鐞� + handleFreeFile() { + console.log(2222); + }, + // 鍒ゆ柇璧勬簮鏄惁璐拱 + resourceIsBuy() { + console.log(333); } }) \ No newline at end of file -- Gitblit v1.9.1