bug fixes

learnOnline/apiService/ChapterApi.js

@@ -83,21 +83,20 @@ const getChapterList = (cur_course_id, cur_semester_id, cur_video_id, callback)
   })
 }
 /* 获取对应某个章节的详细信息 */
-const getCurrentChapterDetail = (sid, vid, videoType,callback) => {
+const getCurrentChapterDetail = (sid, vid, cid,callback) => {
   // CC视频请求数据接口
-  let _url = null;
-  if(videoType == 3){
-    _url = util.config.URL_PATH1 + '/v2/education/aliyun-video-streaming'
-  }else{
-    _url = util.config.URL_PATH1 + '/v2/education/video-streaming'
-  }
-
+  const uid = wx.getStorageSync('uid')
   util.requestApi({
-    url: _url,
+    url: util.config.URL_PATH1 + '/v2/education/aliyun-video-streaming',
     method: 'POST',
     data: {
       semester_id: sid,
-      vid: vid
+      vid: vid,
+      uid: wx.getStorageSync('uid'),
+      sid: wx.getStorageSync('sid'),
+      c: cid,
+      s: sid,
+      v: vid
     },
     callback: function (res) {
       // 进入视频，开始读取视频时，存储 vid、log_key
@@ -126,6 +125,7 @@ const getCurrentChapterDetail = (sid, vid, videoType,callback) => {
 /* 结束时，调用接口 */
 const endVideo = (obj) => {
   let json = wx.getStorageSync('video_001') || { semester_id: '', vid: '', log_key: '' }
+  if (json.vid !== '') {
     json.uid = wx.getStorageSync('uid')
     json.sid = wx.getStorageSync('sid')
     json.d = obj.did
@@ -133,7 +133,6 @@ const endVideo = (obj) => {
     json.c = obj.cid
     json.s = json.semester_id
     json.v = json.vid
-  if (json.vid !== '') {
     util.requestApi({
       url: util.config.URL_PATH1 + '/v2/education/end-aliyun-video-streaming',
       method: 'POST',

learnOnline/config.js

@@ -3,13 +3,13 @@ const env = 'production'
 
 if (env === 'production') {
   module.exports = {
-    appVersion: 'sofia_v3.2.3',
+    appVersion: 'sofia_v3.2.4',
     apiBaseURL: 'https://wechat-api.ezijing.com', // 接口请求地址
     tenant: 'sofia'
   }
 } else {
   module.exports = {
-    appVersion: 'sofia_v3.2.3',
+    appVersion: 'sofia_v3.2.4',
     apiBaseURL: 'https://wechat-api2.ezijing.com', // 接口请求地址
     tenant: 'sofia'
   }

learnOnline/pages/videoPlayer/contentAudio/contentAudio.wxml

 <template name='contentAudio'>
-  <view class='content-audio' wx:if="{{status.isAudio}}">
+  <view class='content-audio' 
+    style='{{status.isSet && status.isAudio ? "display: none;" : "" }} {{status.isImages && status.isAudio ? "display: none;" : "" }} {{status.isVideo ? "display: none;" : "" }}'
+  >
     <image src='./contentAudio/icons/loading_small.gif' class='loading-image {{status.imagesLoaded && "none"}}' mode='aspectFit'/>
     <image wx:if='{{image.imgUrls[image.current]}}' src='{{image.imgUrls[image.current]}}' class='slide-image' mode='aspectFill' bindload='imagesLoaded'/>
     <view wx:if='{{!image.imgUrls[image.current]}}' class='slide-image'>本课程暂无PPT</view>

learnOnline/pages/videoPlayer/contentVideo/contentVideo.wxml

 <template name='contentVideo'>
-<!-- 这里加 这么多判断原因，video组件在真机上测试，一定在最上层，其他任何元素都挡不住，只能先隐藏，需要时再显示 -->
-  <view class='content-video' wx:if="{{status.isVideo}}">
+  <!-- 这里加 这么多判断原因，video组件在真机上测试，一定在最上层，其他任何元素都挡不住，只能先隐藏，需要时再显示 -->
+    <view class='content-video' 
+      style='{{status.isSet && status.isVideo ? "display: none;" : "" }} {{status.isImages && status.isVideo ? "display: none;" : "" }} {{status.isAudio ? "display: none;" : "" }} {{chapterList.isShow && status.isVideo ? "display: none;" : "" }} {{ status.isLoading ? "display: none": "" }}'
+    >
       <video id='my-video' class='my-video' src='{{video.src}}' show-center-play-btn='{{false}}' controls='{{false}}' bindtimeupdate='timeUpdate' bindfullscreenchange='beginAndOutFullScreen' bindpause='beginPauseVA' bindplay='beginPlayVA' binderror='playError' bindended='playEnded' autoplay='{{true}}'></video>
     </view>
-</template>
+  </template>
\ No newline at end of file

learnOnline/pages/videoPlayer/show.js

@@ -131,6 +131,7 @@ Page({
     this.setData({ ctrlBar: this._cache })
     /* 一定会 存在值 */
     if (res) {
+      console.log('set res', res)
       let tempVid = wx.getStorageSync('videoCacheCtrlBar').vid
       if (vid == tempVid) {
         this._cache = wx.getStorageSync('videoCacheCtrlBar') || {}
@@ -169,16 +170,20 @@ Page({
     let cid = this.data.options.cid,
       sid = this.data.options.sid,
       did = 'jjhz92fn0.le2a6c06c9g0.thhg7ekb1f8'
-    ChapterApi.getChapterList(cid, sid, vid, (json) => {
+    ChapterApi.getChapterList(cid, sid, vid, json => {
       this.setData({ chapterList: json })
     })
     // CC视频走这个接口
-    ChapterApi.getCurrentChapterDetail(sid, vid, videoType, (json) => {
+    ChapterApi.getCurrentChapterDetail(sid, vid, videoType, json => {
       // 播放的视频数据
       this.setData({ video: json.video })
       this.setData({ audio: json.audio })
       this.setData({ image: json.image })
-      ChapterApi.getProgress(vid, did, sid, (res) => {
+      ChapterApi.getProgress(vid, did, sid, res => {
+        console.log('get', res)
+        if (!res) {
+          wx.showToast({ title: '获取视频进度失败', icon: 'none' })
+        }
         res.did = did
         res.vid = vid
         res.cid = cid
@@ -266,7 +271,7 @@ Page({
     wx.showModal({
       title: '提示',
       content: obj.content,
-      success: (res) => {
+      success: res => {
         if (res.confirm) {
           // wx.setStorageSync(obj.setStorage, obj.getStorage)
           let cache = wx.getStorageSync(obj.getStorage)
@@ -434,8 +439,7 @@ Page({
   },
   /* controlBar页面 - 点击进度条跳到某个位置播放 - bindtouchstart事件 */
   tapToSeek: function (e) {
-    let pLine =
-        wx.getSystemInfoSync().windowWidth - e.currentTarget.offsetLeft * 2,
+    let pLine = wx.getSystemInfoSync().windowWidth - e.currentTarget.offsetLeft * 2,
       pos = e.touches[0].pageX,
       _data = this.data,
       _status = _data.status,
@@ -489,8 +493,7 @@ Page({
     }
     /* iphone6 8.4.1 首次初始化时，不能直接 设置进度并播放 */
     if (this.isFirstInitAndSwitchVideo) {
-      if (!this._cache)
-        this._cache = wx.getStorageSync('videoCacheCtrlBar') || {}
+      if (!this._cache) this._cache = wx.getStorageSync('videoCacheCtrlBar') || {}
       this.seekVA(this._cache.initial_time)
       this.isFirstInitAndSwitchVideo = false
     }
@@ -506,6 +509,7 @@ Page({
   playError: function (e) {},
   /* VideoOrAudio标签 - 视频播放发生变化时 - bindtimeupdate事件 */
   timeUpdate: function (e) {
+    console.log('timeupdate', e)
     let _data = this.data,
       _status = _data.status,
       _detail = e.detail,
@@ -521,13 +525,11 @@ Page({
     this.setData({
       'ctrlBar.totalTime': util.durationToTimeString(_obj.totalTime)
     })
+    console.log(_obj.currentTime, _obj.totalTime)
     /* 实时改变 当前的PPT当前页 */
     let arr = this.data.image.timeArr
     for (let i = 0; i < arr.length; i++) {
-      if (
-        _obj.currentTime >= arr[i] &&
-        (i + 1 < arr.length ? _obj.currentTime < arr[i + 1] : 1)
-      ) {
+      if (_obj.currentTime >= arr[i] && (i + 1 < arr.length ? _obj.currentTime < arr[i + 1] : 1)) {
         this.setData({ 'image.current': i })
         break
       }
@@ -550,6 +552,7 @@ Page({
     clearInterval(this.heartbeat)
 
     this.heartbeat = setInterval(() => {
+      console.log(this.data.initVAFlag)
       /* 如果是初始加载状态，就不计算时间状态 和 提交进度了 */
       if (this.data.initVAFlag) return
       let arr = _data.ctrlBar.currentTime.split(':'),

learnOnline/project.config.json

@@ -13,7 +13,7 @@
     "autoAudits": false,
     "showShadowRootInWxmlPanel": true,
     "scopeDataCheck": false,
-    "uglifyFileName": false,
+    "uglifyFileName": true,
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
@@ -87,6 +87,13 @@
         {
           "name": "pages/learnSystem/my/my",
           "pathName": "pages/learnSystem/my/my",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/videoPlayer/show",
+          "pathName": "pages/videoPlayer/show",
+          "query": "cid=6549489626027917312&sid=6552021107166150656&vid=6414742983802880000&type=3",
           "scene": null
         }
       ]

learnOnline/utils/util.js

@@ -6,14 +6,14 @@ const url_test = {
   URL_PATH2: 'https://wechat-api2.ezijing.com/api', // 正式域名 - 由于项目变动域名
   outSiteLink: 'https://e-learning.ezijing.com', // 正式外链
   tenant: 'sofia',
-  version: '3.2.3'
+  version: '3.2.4'
 }
 const url_online = {
   URL_PATH1: 'https://wechat-api.ezijing.com/api/lms', // 正式域名 - 由于项目变动域名
   URL_PATH2: 'https://wechat-api.ezijing.com/api', // 正式域名 - 由于项目变动域名
   outSiteLink: 'https://e-learning.ezijing.com', // 正式外链
   tenant: 'sofia',
-  version: '3.2.3'
+  version: '3.2.4'
 }
 let config = url_online
 /* 请求接口统一 重定义 */