1.1.34

pages/main/detail.js

@@ -36,7 +36,6 @@ var intervalSound = 0,
 var isCollecting = false;
 
 var isPlaying = false;
-var innerAudioContext;
 
 var timeoutPlayAudio;
 var tempPlayUrl = "";
@@ -74,16 +73,8 @@ Page({
       Color: main.getDetailColor(app.globalData.ColorIndex),
     });
 
+    this.audioCtx = wx.createAudioContext('myAudio'); 
     innerAudioContext1 = wx.createInnerAudioContext();
-    
-    innerAudioContext = wx.createInnerAudioContext();
-    innerAudioContext.onPlay(() => {
-      //console.log('开始播放');
-    });
-    innerAudioContext.onEnded(() => {
-      //console.log('结束播放');
-    });
-
 
     this.getList();
 
@@ -139,10 +130,6 @@ Page({
     clearInterval(intervalSound);
     clearTimeout(timeoutEveryCard);
     listTaskFinished = [];
-    if (innerAudioContext) {
-      innerAudioContext.stop();
-      isPlaying = false;
-    }
   },
   onPullDownRefresh: function () {
     this.onShowAnswer({
@@ -386,10 +373,6 @@ Page({
   //回到上一张题卡
   gotoPrev: function () {
     var that = this;
-    if (innerAudioContext) {
-      innerAudioContext.stop();
-      isPlaying = false;
-    }
 
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
@@ -445,11 +428,6 @@ Page({
   //进入下一张题卡
   gotoNext: function (e) {
     var that = this;
-    if (innerAudioContext) {
-      innerAudioContext.stop();
-      isPlaying = false;
-    }
-
     var btnnumber = e.currentTarget.dataset.btnnumber;
     var time = e.currentTarget.dataset.time;
 
@@ -712,9 +690,7 @@ Page({
       timeoutPlayAudio = setTimeout(function () {
         isPlaying = false;
       }, 60000);
-      if (innerAudioContext) {
-        innerAudioContext.stop();
-      }
+      
       wx.showLoading({
         title: '音频下载中',
         mask: true,
@@ -728,8 +704,8 @@ Page({
         success(res) {
           wx.hideLoading();
           if (res.statusCode === 200) {
-            innerAudioContext.src = res.tempFilePath;
-            innerAudioContext.play();
+            that.audioCtx.setSrc(res.tempFilePath);
+            that.audioCtx.play();
             tempPlayUrl = url;
           }
         },
@@ -739,12 +715,13 @@ Page({
       });
     }
     else {
-      if (innerAudioContext) {
-        innerAudioContext.stop();
-        isPlaying = false;
-      }
+      this.audioCtx.pause();
+      isPlaying = false;
     }
   },
+  audioBindEnded: function () {
+    isPlaying = false;
+  },
   getTaskTime: function () {
     var that = this;
     var url = "GetMiaoguoTaskTime?";

pages/main/detail.wxml

@@ -211,4 +211,6 @@
   </view>
 </view>
 
-<canvas class='Canvas' canvas-id="shareCanvas"></canvas>
+<canvas class='Canvas' canvas-id="shareCanvas"></canvas>
+
+<audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded"></audio>

pages/main/preview.js

@@ -32,15 +32,7 @@ Page({
     });
     console.log("MiaoguoCardID:" + id);
 
-    innerAudioContext = wx.createInnerAudioContext();
-    innerAudioContext.onPlay(() => {
-      console.log('开始播放');
-    });
-    innerAudioContext.onEnded(() => {
-      console.log('结束播放');
-      isPlaying = false;
-    });
-
+    this.audioCtx = wx.createAudioContext('myAudio');
 
     if (options.type == "show") {
       wx.setNavigationBarTitle({
@@ -129,10 +121,7 @@ Page({
         that.init();
   },
   onUnload: function () {
-    if (innerAudioContext) {
-      innerAudioContext.stop();
-      isPlaying = false;
-    }
+    isPlaying = false;
   },
   onPullDownRefresh: function () {
     var that = this;
@@ -243,10 +232,7 @@ Page({
       scrollTop: 0,
     });
 
-    if (innerAudioContext) {
-      innerAudioContext.stop();
-      isPlaying = false;
-    }
+    isPlaying = false;
   },
   practiceToday: function () {
     var that = this;
@@ -423,9 +409,6 @@ Page({
       timeoutPlayAudio = setTimeout(function () {
         isPlaying = false;
       }, 60000);
-      if (innerAudioContext) {
-        innerAudioContext.stop();
-      }
       wx.showLoading({
         title: '音频下载中',
         mask: true,
@@ -439,8 +422,8 @@ Page({
         success(res) {
           wx.hideLoading();
           if (res.statusCode === 200) {
-            innerAudioContext.src = res.tempFilePath;
-            innerAudioContext.play();
+            that.audioCtx.setSrc(res.tempFilePath);
+            that.audioCtx.play();
             tempPlayUrl=url;
           }
         },
@@ -450,12 +433,13 @@ Page({
       });
     }
     else {
-      if (innerAudioContext) {
-        innerAudioContext.stop();
-        isPlaying = false;
-      }
+      this.audioCtx.pause();
+      isPlaying = false;
     }
   },
+  audioBindEnded:function(){
+    isPlaying = false;
+  },
   getDetailInfo: function () {
     wx.navigateTo({
       url: './cardInfo?id=' + this.data.MiaoguoCardID,

pages/main/preview.wxml

@@ -101,4 +101,6 @@
     </view>
   </view>
   
-</view>
+</view>
+
+<audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded"></audio>

pages/main/searchCardList.js

@@ -39,11 +39,15 @@ Page({
       IsCollect = 1;
     }
 
+    var count=0;
+    if (options.count)
+      count=options.count;
+
     that.setData({
       IsCollect: IsCollect,
       Search: Search,
       IsToday: IsToday,
-      Count: options.count,
+      Count: count,
       Containnerheight: main.getWindowHeight(),
     });
   },

project.config.json

@@ -14,7 +14,7 @@
 		"checkInvalidKey": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.6.4",
+	"libVersion": "2.0.4",
 	"appid": "wx84b3feac6069eec3",
 	"projectname": "miaoguo_master",
 	"debugOptions": {