@x-edu/live-player 0.0.19 → 0.0.21

package/src/util/auth/func.js

@@ -1,57 +1,57 @@
-import buildURL from 'axios/lib/helpers/buildURL'
-
-let uc
-let userInfo
-
-export function getUCInstance() {
-  return uc
-}
-
-export function setUC(currentUC, _userInfo) {
-  if (!uc) {
-    uc = currentUC
-  }
-  userInfo = _userInfo
-}
-
-export function getAvatarURL(userId) {
-  return uc.getAvatarURL({
-    userId
-  })
-}
-
-export async function logout() {
-  try {
-    await uc.logout()
-  } catch {
-    uc._ucToken.clearToken()
-  }
-}
-
-export async function getSessionUserInfo() {
-  const account = uc.getCurrentAccount()
-  if (account) {
-    const curUserInfo = await account.getAccountInfo({
-      force: true
-    })
-    return curUserInfo
-  }
-}
-
-export async function getAuthHeader(c) {
-  const hasLogin = !!userInfo
-  if (hasLogin) {
-    const {
-      url: _url,
-      method,
-      params,
-      paramsSerializer
-    } = c
-    const url = buildURL(_url, params, paramsSerializer).replace(/@/g, '%40').replace(/'/g, '%27')
-    const auth = await uc.getAuthHeaderAsync({
-      url,
-      method
-    })
-    return auth
-  }
-}
+import buildURL from 'axios/lib/helpers/buildURL'
+
+let uc
+let userInfo
+
+export function getUCInstance() {
+  return uc
+}
+
+export function setUC(currentUC, _userInfo) {
+  if (!uc) {
+    uc = currentUC
+  }
+  userInfo = _userInfo
+}
+
+export function getAvatarURL(userId) {
+  return uc.getAvatarURL({
+    userId
+  })
+}
+
+export async function logout() {
+  try {
+    await uc.logout()
+  } catch {
+    uc._ucToken.clearToken()
+  }
+}
+
+export async function getSessionUserInfo() {
+  const account = uc.getCurrentAccount()
+  if (account) {
+    const curUserInfo = await account.getAccountInfo({
+      force: true
+    })
+    return curUserInfo
+  }
+}
+
+export async function getAuthHeader(c) {
+  const hasLogin = !!userInfo
+  if (hasLogin) {
+    const {
+      url: _url,
+      method,
+      params,
+      paramsSerializer
+    } = c
+    const url = buildURL(_url, params, paramsSerializer).replace(/@/g, '%40').replace(/'/g, '%27')
+    const auth = await uc.getAuthHeaderAsync({
+      url,
+      method
+    })
+    return auth
+  }
+}

package/src/util/date.js

@@ -1,53 +1,53 @@
-import dayjs from 'dayjs'
-
-export const formatTimeDisplay = (timeKey) => {
-  const time = dayjs(timeKey)
-  const dayInWeekTexts = ['周天', '周一', '周二', '周三', '周四', '周五', '周六']
-  const dayInWeek = dayInWeekTexts[time.day()]
-
-  // 如果是同一天则显示今天 + 周几
-  if (time.isSame(dayjs(), 'day')) {
-    return `今天 ${dayInWeek}`
-  }
-  if (time.isSame(dayjs(), 'year')) {
-    return `${time.format('MM月DD日')} ${dayInWeek}`
-  }
-  return `${time.format('YYYY年MM月DD日')} ${dayInWeek}`
-}
-
-export function formatSeconds(value) {
-  let theTime = parseInt(value, 10) // 需要转换的时间秒
-  let theTime1 = 0 // 分
-  let theTime2 = 0 // 小时
-  if (theTime > 60) {
-    theTime1 = parseInt(theTime / 60, 10)
-    theTime = parseInt(theTime % 60, 10)
-    if (theTime1 > 60) {
-      theTime2 = parseInt(theTime1 / 60, 10)
-      theTime1 = parseInt(theTime1 % 60, 10)
-    }
-  }
-  let result = `${theTime1.toString().padStart(2, 0)}:${theTime.toString().padStart(2, 0)}`
-  if (theTime2 > 0) {
-    result = `${theTime2.toString().padStart(2, 0)}:${result}`
-  }
-  return result
-}
-
-export const parseAdapter = (option, dayjsClass) => {
-  const proto = dayjsClass.prototype
-  const oldParse = proto.parse
-  proto.parse = function parse(cfg) {
-    const { date } = cfg
-    const params = {
-      ...cfg
-    }
-    // ie 2019-03-13T13:33:00.000+0000 下解析有问题，全部转化下
-    if (date && typeof date === 'string') {
-      const validDate = date.replace(/(\+\d{2})(\d{2})$/, '$1:$2')
-      params.date = validDate
-      params.args[0] = validDate
-    }
-    oldParse.call(this, params)
-  }
-}
+import dayjs from 'dayjs'
+
+export const formatTimeDisplay = (timeKey) => {
+  const time = dayjs(timeKey)
+  const dayInWeekTexts = ['周天', '周一', '周二', '周三', '周四', '周五', '周六']
+  const dayInWeek = dayInWeekTexts[time.day()]
+
+  // 如果是同一天则显示今天 + 周几
+  if (time.isSame(dayjs(), 'day')) {
+    return `今天 ${dayInWeek}`
+  }
+  if (time.isSame(dayjs(), 'year')) {
+    return `${time.format('MM月DD日')} ${dayInWeek}`
+  }
+  return `${time.format('YYYY年MM月DD日')} ${dayInWeek}`
+}
+
+export function formatSeconds(value) {
+  let theTime = parseInt(value, 10) // 需要转换的时间秒
+  let theTime1 = 0 // 分
+  let theTime2 = 0 // 小时
+  if (theTime > 60) {
+    theTime1 = parseInt(theTime / 60, 10)
+    theTime = parseInt(theTime % 60, 10)
+    if (theTime1 > 60) {
+      theTime2 = parseInt(theTime1 / 60, 10)
+      theTime1 = parseInt(theTime1 % 60, 10)
+    }
+  }
+  let result = `${theTime1.toString().padStart(2, 0)}:${theTime.toString().padStart(2, 0)}`
+  if (theTime2 > 0) {
+    result = `${theTime2.toString().padStart(2, 0)}:${result}`
+  }
+  return result
+}
+
+export const parseAdapter = (option, dayjsClass) => {
+  const proto = dayjsClass.prototype
+  const oldParse = proto.parse
+  proto.parse = function parse(cfg) {
+    const { date } = cfg
+    const params = {
+      ...cfg
+    }
+    // ie 2019-03-13T13:33:00.000+0000 下解析有问题，全部转化下
+    if (date && typeof date === 'string') {
+      const validDate = date.replace(/(\+\d{2})(\d{2})$/, '$1:$2')
+      params.date = validDate
+      params.args[0] = validDate
+    }
+    oldParse.call(this, params)
+  }
+}

package/src/util/env.js

@@ -1,9 +1,9 @@
-const ua = window.navigator.userAgent.toLowerCase()
-
-export function isInWX() {
-  return ua.indexOf('micromessenger') > -1
-}
-
-// 判断是否在electron环境中
-export const { xElectron } = window
-export const isInElectron = !!xElectron
+const ua = window.navigator.userAgent.toLowerCase()
+
+export function isInWX() {
+  return ua.indexOf('micromessenger') > -1
+}
+
+// 判断是否在electron环境中
+export const { xElectron } = window
+export const isInElectron = !!xElectron

package/src/util/getTimestamp.js

@@ -1,10 +1,10 @@
-/**
- * 获取时间戳
- * @param {number} second 时间间隔，以秒为单位，超过
- * @returns {string} 时间戳
- */
-export function getTimestamp(second) {
-  // 转换毫秒
-  const now = Math.floor(Date.now() / 1000)
-  return Math.floor(now / second) * second
-}
+/**
+ * 获取时间戳
+ * @param {number} second 时间间隔，以秒为单位，超过
+ * @returns {string} 时间戳
+ */
+export function getTimestamp(second) {
+  // 转换毫秒
+  const now = Math.floor(Date.now() / 1000)
+  return Math.floor(now / second) * second
+}

package/src/util/hof.js

@@ -1,105 +1,105 @@
-import MutexLock from 'mutex-lock'
-
-/**
- * 并发fn
- * @param {(...args: any[]) => Promise<any>} fn
- * @param {any} context
- * @returns
- */
-export function withCo(fn, context) {
-  const lock = new MutexLock()
-  const newFn = async (...args) => {
-    const lockId = await lock.request()
-    let result
-    try {
-      result = await context
-        ? await fn.bind(context)(...args)
-        : await fn(...args)
-    } catch (e) {
-      lock.release(lockId)
-      throw e
-    }
-    lock.release(lockId)
-    return result
-  }
-  return newFn
-}
-
-/**
- * once 支持Asynchronous并发
- * @param {(...args: any[]) => Promise<any>} fn
- * @param {object?} option
- * @param {any?} option.context 执行context
- * @param {(...args) => string} option.getKey 从args中获取mutexlock key
- * @returns
- */
-export function withOnce(fn, {
-  context,
-  getKey,
-  timeout
-} = {}) {
-  const cacheObject = createCacheObject()
-  const lockPool = createLockPool()
-  const newFn = async (...args) => {
-    const key = getKey
-      ? getKey(...args)
-      : '__internal__key'
-    if (!cacheObject.hasKey(key)) {
-      const lock = lockPool.getLock(key)
-      const lockId = await lock.request()
-      if (!cacheObject.hasKey(key)) {
-        let result
-        try {
-          result = context
-            ? await fn.bind(context)(...args)
-            : await fn(...args)
-        } catch (e) {
-          lock.release(lockId)
-          throw e
-        }
-        cacheObject.set(key, result, timeout)
-      }
-      lock.release(lockId)
-    }
-    return cacheObject.get(key)
-  }
-  return newFn
-}
-
-/**
- * lock池，根据key返回对应的lock
- */
-function createLockPool() {
-  const lockObject = {}
-  return {
-    getLock(key) {
-      if (!lockObject[key]) {
-        lockObject[key] = new MutexLock()
-      }
-      return lockObject[key]
-    }
-  }
-}
-
-/**
- *  key/value缓存对象
- */
-function createCacheObject() {
-  const cacheObject = {}
-  return {
-    hasKey(key) {
-      return Object.prototype.hasOwnProperty.call(cacheObject, key)
-    },
-    set(key, value, timeout) {
-      cacheObject[key] = value
-      if (timeout) {
-        setTimeout(() => {
-          delete cacheObject[key]
-        }, timeout)
-      }
-    },
-    get(key) {
-      return cacheObject[key]
-    }
-  }
-}
+import MutexLock from 'mutex-lock'
+
+/**
+ * 并发fn
+ * @param {(...args: any[]) => Promise<any>} fn
+ * @param {any} context
+ * @returns
+ */
+export function withCo(fn, context) {
+  const lock = new MutexLock()
+  const newFn = async (...args) => {
+    const lockId = await lock.request()
+    let result
+    try {
+      result = await context
+        ? await fn.bind(context)(...args)
+        : await fn(...args)
+    } catch (e) {
+      lock.release(lockId)
+      throw e
+    }
+    lock.release(lockId)
+    return result
+  }
+  return newFn
+}
+
+/**
+ * once 支持Asynchronous并发
+ * @param {(...args: any[]) => Promise<any>} fn
+ * @param {object?} option
+ * @param {any?} option.context 执行context
+ * @param {(...args) => string} option.getKey 从args中获取mutexlock key
+ * @returns
+ */
+export function withOnce(fn, {
+  context,
+  getKey,
+  timeout
+} = {}) {
+  const cacheObject = createCacheObject()
+  const lockPool = createLockPool()
+  const newFn = async (...args) => {
+    const key = getKey
+      ? getKey(...args)
+      : '__internal__key'
+    if (!cacheObject.hasKey(key)) {
+      const lock = lockPool.getLock(key)
+      const lockId = await lock.request()
+      if (!cacheObject.hasKey(key)) {
+        let result
+        try {
+          result = context
+            ? await fn.bind(context)(...args)
+            : await fn(...args)
+        } catch (e) {
+          lock.release(lockId)
+          throw e
+        }
+        cacheObject.set(key, result, timeout)
+      }
+      lock.release(lockId)
+    }
+    return cacheObject.get(key)
+  }
+  return newFn
+}
+
+/**
+ * lock池，根据key返回对应的lock
+ */
+function createLockPool() {
+  const lockObject = {}
+  return {
+    getLock(key) {
+      if (!lockObject[key]) {
+        lockObject[key] = new MutexLock()
+      }
+      return lockObject[key]
+    }
+  }
+}
+
+/**
+ *  key/value缓存对象
+ */
+function createCacheObject() {
+  const cacheObject = {}
+  return {
+    hasKey(key) {
+      return Object.prototype.hasOwnProperty.call(cacheObject, key)
+    },
+    set(key, value, timeout) {
+      cacheObject[key] = value
+      if (timeout) {
+        setTimeout(() => {
+          delete cacheObject[key]
+        }, timeout)
+      }
+    },
+    get(key) {
+      return cacheObject[key]
+    }
+  }
+}

package/src/util/live/index.js

@@ -1,42 +1,42 @@
-import dayjs from 'dayjs'
-import { PUBLIC_LIVE_STATUS, LIVING_STATUS_ADVANCE } from '@/config/publicLive'
-
-// 获取录播状态
-export const getRecordLiveStatus = (originStatus, visitTime, beginTime, endTime) => {
-  const current = dayjs(visitTime).valueOf()
-  const begin = dayjs(beginTime).valueOf()
-  const end = dayjs(endTime).valueOf()
-  if (originStatus === PUBLIC_LIVE_STATUS.COMPLETEED || originStatus === PUBLIC_LIVE_STATUS.OFFLINE) {
-    return originStatus
-  }
-  if (current < begin) {
-    return PUBLIC_LIVE_STATUS.NOSTARTED
-  }
-  if (begin <= current && end > current) {
-    return PUBLIC_LIVE_STATUS.LIVEING
-  }
-  return PUBLIC_LIVE_STATUS.COMPLETEED
-}
-
-// 我的公开课堂本地状态，直播前60分钟可以发起直播
-export const getTeacherLiveLocalStatus = (originStatus, beginTime) => {
-  if (originStatus === PUBLIC_LIVE_STATUS.COMPLETEED || originStatus === PUBLIC_LIVE_STATUS.OFFLINE) {
-    return originStatus
-  }
-  const current = dayjs()
-  const advanceTime = dayjs(beginTime).subtract(LIVING_STATUS_ADVANCE, 'minute')
-  return current.isBefore(advanceTime) ? PUBLIC_LIVE_STATUS.NOSTARTED : PUBLIC_LIVE_STATUS.LIVEING
-}
-
-export const getLocalHlsLiveStatus = (visitTime, beginTime, endTime) => {
-  const current = dayjs(visitTime).valueOf()
-  const begin = dayjs(beginTime).valueOf()
-  const end = dayjs(endTime).valueOf()
-  if (current < begin) {
-    return PUBLIC_LIVE_STATUS.NOSTARTED
-  }
-  if (begin <= current && end > current) {
-    return PUBLIC_LIVE_STATUS.LIVEING
-  }
-  return PUBLIC_LIVE_STATUS.COMPLETEED
-}
+import dayjs from 'dayjs'
+import { PUBLIC_LIVE_STATUS, LIVING_STATUS_ADVANCE } from '@/config/publicLive'
+
+// 获取录播状态
+export const getRecordLiveStatus = (originStatus, visitTime, beginTime, endTime) => {
+  const current = dayjs(visitTime).valueOf()
+  const begin = dayjs(beginTime).valueOf()
+  const end = dayjs(endTime).valueOf()
+  if (originStatus === PUBLIC_LIVE_STATUS.COMPLETEED || originStatus === PUBLIC_LIVE_STATUS.OFFLINE) {
+    return originStatus
+  }
+  if (current < begin) {
+    return PUBLIC_LIVE_STATUS.NOSTARTED
+  }
+  if (begin <= current && end > current) {
+    return PUBLIC_LIVE_STATUS.LIVEING
+  }
+  return PUBLIC_LIVE_STATUS.COMPLETEED
+}
+
+// 我的公开课堂本地状态，直播前60分钟可以发起直播
+export const getTeacherLiveLocalStatus = (originStatus, beginTime) => {
+  if (originStatus === PUBLIC_LIVE_STATUS.COMPLETEED || originStatus === PUBLIC_LIVE_STATUS.OFFLINE) {
+    return originStatus
+  }
+  const current = dayjs()
+  const advanceTime = dayjs(beginTime).subtract(LIVING_STATUS_ADVANCE, 'minute')
+  return current.isBefore(advanceTime) ? PUBLIC_LIVE_STATUS.NOSTARTED : PUBLIC_LIVE_STATUS.LIVEING
+}
+
+export const getLocalHlsLiveStatus = (visitTime, beginTime, endTime) => {
+  const current = dayjs(visitTime).valueOf()
+  const begin = dayjs(beginTime).valueOf()
+  const end = dayjs(endTime).valueOf()
+  if (current < begin) {
+    return PUBLIC_LIVE_STATUS.NOSTARTED
+  }
+  if (begin <= current && end > current) {
+    return PUBLIC_LIVE_STATUS.LIVEING
+  }
+  return PUBLIC_LIVE_STATUS.COMPLETEED
+}

package/src/util/liveCountUtil.js

@@ -0,0 +1,52 @@
+/**
+ *  格式化数值8
+ * @param {*} count
+ * @param {*} digit 上限位数
+ * @returns
+ */
+export function formatCount(count, digit) {
+  const countStr = count.toString()
+  if (countStr.length < 5) {
+    return countStr
+  } else if (countStr.length < digit) {
+    // 四舍五入w
+    const decimal = (count / 10000).toFixed(1)
+    return `${
+      decimal.endsWith('.0')
+        ? decimal.substr(0, decimal.length - 2)
+        : decimal
+    }万`
+  } else {
+    return `${
+      '1'.padEnd(digit - 4, '0')
+    }万${
+      countStr === '1'.padEnd(digit, '0')
+        ? ''
+        : '+'
+    }`
+  }
+}
+
+/**
+ * 格式化点赞数
+ * a. < 10000 => 原样输出
+ * b. >= 10000 => 以万（w）为单位，保留一位小数 10000-10999 => 1w+ 11000-11999 => 1.1w+
+ * c. >= 1000000 => 100w+
+ * @param {number} count 点赞数量
+ * @return {string} 格式化后的点赞数
+ */
+export function formatLikesCount(count) {
+  return formatCount(count, 7)
+}
+
+/**
+ * 格式化UV数
+ * a. < 10000 => 原样输出
+ * b. >= 10000 => 以万（w）为单位，保留一位小数 10000-10999 => 1w+ 11000-11999 => 1.1w+
+ * c. >= 10000000 => 1000w+
+ * @param {number} count 点赞数量
+ * @return {string} 格式化后的点赞数
+ */
+export function formatUVCount(count) {
+  return formatCount(count, 8)
+}

package/src/util/netUrl.js

@@ -1,35 +1,35 @@
-import memoize from 'lodash/memoize'
-
-export const isSupportWebp = memoize(() => {
-  try {
-    return document.createElement('canvas').toDataURL('image/webp', 0.5).indexOf('data:image/webp') === 0
-  } catch (err) {
-    return false
-  }
-})
-
-export default (src, size) => {
-  if (!src) {
-    return ''
-  }
-  // TODO 是否一定要encode，如果未来出问题，移除encodeURI
-  let imageSrc = src.indexOf('%') === -1
-    ? encodeURI(decodeURI(src))
-    : src
-  const linkStr = imageSrc.indexOf('?') !== -1 ? '&' : '?'
-  const type = isSupportWebp() ? 'auto' : null
-  if (size) {
-    const preStr = `${linkStr}x-bce-process=image${type ? `/format,f_${type}` : ''}/resize,limit_1,m_lfit,`
-    const sizeString = {
-      1080: `${preStr}w_1080`,
-      720: `${preStr}w_720`,
-      480: `${preStr}w_480`,
-      360: `${preStr}w_360`,
-      240: `${preStr}w_240`
-    }[size] || ''
-    imageSrc += sizeString
-  } else if (type) {
-    imageSrc += `${linkStr}x-bce-process=image/format,f_${type}`
-  }
-  return imageSrc
-}
+import memoize from 'lodash/memoize'
+
+export const isSupportWebp = memoize(() => {
+  try {
+    return document.createElement('canvas').toDataURL('image/webp', 0.5).indexOf('data:image/webp') === 0
+  } catch (err) {
+    return false
+  }
+})
+
+export default (src, size) => {
+  if (!src) {
+    return ''
+  }
+  // TODO 是否一定要encode，如果未来出问题，移除encodeURI
+  let imageSrc = src.indexOf('%') === -1
+    ? encodeURI(decodeURI(src))
+    : src
+  const linkStr = imageSrc.indexOf('?') !== -1 ? '&' : '?'
+  const type = isSupportWebp() ? 'auto' : null
+  if (size) {
+    const preStr = `${linkStr}x-bce-process=image${type ? `/format,f_${type}` : ''}/resize,limit_1,m_lfit,`
+    const sizeString = {
+      1080: `${preStr}w_1080`,
+      720: `${preStr}w_720`,
+      480: `${preStr}w_480`,
+      360: `${preStr}w_360`,
+      240: `${preStr}w_240`
+    }[size] || ''
+    imageSrc += sizeString
+  } else if (type) {
+    imageSrc += `${linkStr}x-bce-process=image/format,f_${type}`
+  }
+  return imageSrc
+}