@x-edu/live-player 0.0.28 → 0.0.30

package/src/util/type.js

@@ -1,17 +1,17 @@
-export function isFunction(v) {
-  return typeof v === 'function'
-}
-
-export function isIE() {
-  return /msie|trident/.test(window.navigator.userAgent.toLowerCase())
-}
-
-export function isWin7() {
-  return navigator.userAgent.indexOf('Windows NT 6.1') >= 0
-}
-
-export function isH5() {
-  return window.navigator.userAgent.match(
-    /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
-  )
-}
+export function isFunction(v) {
+  return typeof v === 'function'
+}
+
+export function isIE() {
+  return /msie|trident/.test(window.navigator.userAgent.toLowerCase())
+}
+
+export function isWin7() {
+  return navigator.userAgent.indexOf('Windows NT 6.1') >= 0
+}
+
+export function isH5() {
+  return window.navigator.userAgent.match(
+    /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+  )
+}

package/src/util/url.js

@@ -1,203 +1,203 @@
-import queryString from 'query-string'
-import { isInElectron } from './env'
-// import config from '@/config/env'
-
-/**
- * 获取 url query 参数
- * 在 hash 模式下，如果 query 在 hash 后面 location.query 拿不到值
- * 因此通过 location.href 来获取
- */
-export function getUrlQuery(url) {
-  const query = (url ?? window.location.href).split('?')
-  if (query.length > 1) {
-    let params = {}
-    query.slice(1).forEach((item) => {
-      let parseString = item
-      if (item.indexOf('#') > -1) {
-        parseString = item.split(/\/?#/)[0]
-      }
-      params = {
-        ...queryString.parse(parseString),
-        ...params
-      }
-    })
-    return params
-  }
-  return {}
-}
-
-export function pathJoin(...args) {
-  return args.join('/').replace(/\/{2,}/g, '/')
-}
-
-export function queryJoin(url, query) {
-  return `${url}${url.indexOf('?') === -1 ? '?' : '&'}${queryString.stringify(query)}`
-}
-
-export function getPageName(pathname) {
-  const map = {
-    '/': '首页',
-    '/syncClassroom': '课程教学',
-    '/syncClassroom/textBook/:courseId': '课本',
-    '/syncClassroom/classActivity': '课时活动',
-    '/sedu': '德育',
-    '/content/detail': '内容详情',
-    '/sedu/:id/catalog': '栏目页',
-    '/schoolService': '课后服务',
-    '/schoolService/:id/catalog': '栏目页',
-    '/family': '家庭教育',
-    '/family/:id/catalog': '栏目页',
-    '/teacherTrainingNav': '教师研修',
-    '/teacherTraining': '教师研修',
-    '/teacherTraining/courseDetail': '教师研修',
-    '/lecturer': '讲师',
-    '/eduReform': '教改经验',
-    '/eduReform/catalog': '栏目页'
-  }
-  const matchKey = Object.keys(map).find((key) => {
-    const route = key.split('/')
-    const cur = pathname.split('/')
-    let flag = true
-    if (route.length !== cur.length) {
-      return false
-    }
-    for (let i = 0; i < route.length; i++) {
-      if (route[i].indexOf(':') !== 0 && route[i] !== cur[i]) {
-        flag = false
-        break
-      }
-    }
-    return flag
-  })
-  return matchKey ? map[matchKey] : ''
-}
-
-export function getValueByHost({ value, defaultValue }) {
-  const host = window.location.host.split(':')[0]
-  const pretest = [
-    'localhost',
-    // TODO：下一行等正式提交时删除，便于本地调试
-    '127.0.0.1',
-    'web-bd.ykt.eduyun.cn',
-    'xue-test.ykt.eduyun.cn',
-    'test3.ykt.eduyun.cn',
-    'test5.ykt.eduyun.cn',
-    'test6.ykt.eduyun.cn'
-  ]
-  if (pretest.indexOf(host) > -1) {
-    return value
-  }
-  return defaultValue
-}
-
-export function isTest() {
-  return (
-    window.location.href.indexOf('ykt.eduyun.cn') > -1
-    || window.location.href.indexOf('ndaeweb.com') > -1
-    || window.location.href.indexOf('101.com') > -1
-    || window.location.href.indexOf('localhost') > -1
-    || window.location.href.indexOf('127.0.0.1') > -1
-  )
-}
-
-// home 路径是被第三方嵌入的页面，所有点击跳转到智教云登录
-export function getLink(url = '') {
-  const inHome = window.location.pathname === '/home'
-  if (inHome) {
-    const clientId = 'O9b107EvSr98frNb48oI98KVr4Q17NrR'
-    let redirectUri
-    if (url.indexOf('http') === 0) {
-      redirectUri = url
-    } else {
-      redirectUri = `https://${window.location.host}${url}`
-    }
-    const state = btoa(redirectUri)
-    const uri = `https://auth.smartedu.cn/uias/app/view?client_id=${clientId}&state=${state}`
-    return uri
-  } else {
-    return url
-  }
-}
-// 异步用window.open打开，会有安全性弹窗，可使用setTimeout
-export function asyncWindowOpen(url) {
-  if (navigator.userAgent.indexOf('Firefox') > -1) {
-    setTimeout(() => {
-      window.open(url)
-    }, 0)
-  } else {
-    window.open(url)
-  }
-}
-
-/**
- * 在electron 中的 url 跳转, 用自带的默认浏览器打开
- * @param {string} url
- * @param {string} target
- */
-export function urlJumpInElectron(url, target = '_blank') {
-  if (!url) {
-    return
-  }
-  if (isInElectron) {
-    // electron环境下用自带浏览器打开
-    window.open(url, target, 'forceExternal')
-  } else {
-    window.open(url, target)
-  }
-}
-
-export function removeQueryFromUrl(paramKey) {
-  const url = window.location.href
-  const r = new URL(url)
-  r.searchParams.delete(paramKey)
-  const newUrl = r.href
-  window.history.replaceState({
-    path: newUrl
-  }, '', newUrl)
-}
-
-export function getPathnamePrefix(deep = 1) {
-  const pathnames = window.location.pathname.split('/')
-  const prefix = ['', pathnames[1] || 'area']
-
-  for (let _deep = 2; _deep <= deep; _deep++) {
-    if (_deep === 2) {
-      // todo: 这个地址有错
-      // eslint-disable-next-line no-undef
-      prefix.push(pathnames[2] || (isMicro ? 'micro' : 'site'))
-    } else {
-      prefix.push(pathnames[_deep] || '')
-    }
-  }
-
-  return prefix.join('/')
-}
-
-export function removeQueryInUrl(keys) {
-  const url = new URL(window.location.href)
-  keys.forEach((key) => {
-    url.searchParams.delete(key)
-  })
-  const urlStr = url.toString()
-  window.history.replaceState({}, '', urlStr)
-}
-
-export function getSdpQuery() {
-  const query = getUrlQuery()
-  const sdpOrgId = query.__org_id || query['sdp-org-id'] || ''
-  const sdpAppId = query['sdp-app-id']
-  return {
-    sdpOrgId,
-    sdpAppId
-  }
-}
-
-export function getNDRTestQuery() {
-  if (getUrlQuery()?._test_course_) {
-    window.localStorage.setItem('_test_course_', '1')
-    return true
-  }
-  if (window.localStorage.getItem('_test_course_')) {
-    return true
-  }
-}
+import queryString from 'query-string'
+import { isInElectron } from './env'
+// import config from '@/config/env'
+
+/**
+ * 获取 url query 参数
+ * 在 hash 模式下，如果 query 在 hash 后面 location.query 拿不到值
+ * 因此通过 location.href 来获取
+ */
+export function getUrlQuery(url) {
+  const query = (url ?? window.location.href).split('?')
+  if (query.length > 1) {
+    let params = {}
+    query.slice(1).forEach((item) => {
+      let parseString = item
+      if (item.indexOf('#') > -1) {
+        parseString = item.split(/\/?#/)[0]
+      }
+      params = {
+        ...queryString.parse(parseString),
+        ...params
+      }
+    })
+    return params
+  }
+  return {}
+}
+
+export function pathJoin(...args) {
+  return args.join('/').replace(/\/{2,}/g, '/')
+}
+
+export function queryJoin(url, query) {
+  return `${url}${url.indexOf('?') === -1 ? '?' : '&'}${queryString.stringify(query)}`
+}
+
+export function getPageName(pathname) {
+  const map = {
+    '/': '首页',
+    '/syncClassroom': '课程教学',
+    '/syncClassroom/textBook/:courseId': '课本',
+    '/syncClassroom/classActivity': '课时活动',
+    '/sedu': '德育',
+    '/content/detail': '内容详情',
+    '/sedu/:id/catalog': '栏目页',
+    '/schoolService': '课后服务',
+    '/schoolService/:id/catalog': '栏目页',
+    '/family': '家庭教育',
+    '/family/:id/catalog': '栏目页',
+    '/teacherTrainingNav': '教师研修',
+    '/teacherTraining': '教师研修',
+    '/teacherTraining/courseDetail': '教师研修',
+    '/lecturer': '讲师',
+    '/eduReform': '教改经验',
+    '/eduReform/catalog': '栏目页'
+  }
+  const matchKey = Object.keys(map).find((key) => {
+    const route = key.split('/')
+    const cur = pathname.split('/')
+    let flag = true
+    if (route.length !== cur.length) {
+      return false
+    }
+    for (let i = 0; i < route.length; i++) {
+      if (route[i].indexOf(':') !== 0 && route[i] !== cur[i]) {
+        flag = false
+        break
+      }
+    }
+    return flag
+  })
+  return matchKey ? map[matchKey] : ''
+}
+
+export function getValueByHost({ value, defaultValue }) {
+  const host = window.location.host.split(':')[0]
+  const pretest = [
+    'localhost',
+    // TODO：下一行等正式提交时删除，便于本地调试
+    '127.0.0.1',
+    'web-bd.ykt.eduyun.cn',
+    'xue-test.ykt.eduyun.cn',
+    'test3.ykt.eduyun.cn',
+    'test5.ykt.eduyun.cn',
+    'test6.ykt.eduyun.cn'
+  ]
+  if (pretest.indexOf(host) > -1) {
+    return value
+  }
+  return defaultValue
+}
+
+export function isTest() {
+  return (
+    window.location.href.indexOf('ykt.eduyun.cn') > -1
+    || window.location.href.indexOf('ndaeweb.com') > -1
+    || window.location.href.indexOf('101.com') > -1
+    || window.location.href.indexOf('localhost') > -1
+    || window.location.href.indexOf('127.0.0.1') > -1
+  )
+}
+
+// home 路径是被第三方嵌入的页面，所有点击跳转到智教云登录
+export function getLink(url = '') {
+  const inHome = window.location.pathname === '/home'
+  if (inHome) {
+    const clientId = 'O9b107EvSr98frNb48oI98KVr4Q17NrR'
+    let redirectUri
+    if (url.indexOf('http') === 0) {
+      redirectUri = url
+    } else {
+      redirectUri = `https://${window.location.host}${url}`
+    }
+    const state = btoa(redirectUri)
+    const uri = `https://auth.smartedu.cn/uias/app/view?client_id=${clientId}&state=${state}`
+    return uri
+  } else {
+    return url
+  }
+}
+// 异步用window.open打开，会有安全性弹窗，可使用setTimeout
+export function asyncWindowOpen(url) {
+  if (navigator.userAgent.indexOf('Firefox') > -1) {
+    setTimeout(() => {
+      window.open(url)
+    }, 0)
+  } else {
+    window.open(url)
+  }
+}
+
+/**
+ * 在electron 中的 url 跳转, 用自带的默认浏览器打开
+ * @param {string} url
+ * @param {string} target
+ */
+export function urlJumpInElectron(url, target = '_blank') {
+  if (!url) {
+    return
+  }
+  if (isInElectron) {
+    // electron环境下用自带浏览器打开
+    window.open(url, target, 'forceExternal')
+  } else {
+    window.open(url, target)
+  }
+}
+
+export function removeQueryFromUrl(paramKey) {
+  const url = window.location.href
+  const r = new URL(url)
+  r.searchParams.delete(paramKey)
+  const newUrl = r.href
+  window.history.replaceState({
+    path: newUrl
+  }, '', newUrl)
+}
+
+export function getPathnamePrefix(deep = 1) {
+  const pathnames = window.location.pathname.split('/')
+  const prefix = ['', pathnames[1] || 'area']
+
+  for (let _deep = 2; _deep <= deep; _deep++) {
+    if (_deep === 2) {
+      // todo: 这个地址有错
+      // eslint-disable-next-line no-undef
+      prefix.push(pathnames[2] || (isMicro ? 'micro' : 'site'))
+    } else {
+      prefix.push(pathnames[_deep] || '')
+    }
+  }
+
+  return prefix.join('/')
+}
+
+export function removeQueryInUrl(keys) {
+  const url = new URL(window.location.href)
+  keys.forEach((key) => {
+    url.searchParams.delete(key)
+  })
+  const urlStr = url.toString()
+  window.history.replaceState({}, '', urlStr)
+}
+
+export function getSdpQuery() {
+  const query = getUrlQuery()
+  const sdpOrgId = query.__org_id || query['sdp-org-id'] || ''
+  const sdpAppId = query['sdp-app-id']
+  return {
+    sdpOrgId,
+    sdpAppId
+  }
+}
+
+export function getNDRTestQuery() {
+  if (getUrlQuery()?._test_course_) {
+    window.localStorage.setItem('_test_course_', '1')
+    return true
+  }
+  if (window.localStorage.getItem('_test_course_')) {
+    return true
+  }
+}

package/src/util/video.js

@@ -1,26 +1,26 @@
-import { isIE, isWin7 } from './type'
-
-// 获取类型
-export const getType = (type) => {
-  if (['mp3', 'wav', 'ogg'].includes(type)) {
-    return `audio/${type}`
-  }
-
-  if (type === 'm3u8') {
-    return 'application/x-mpegURL'
-  }
-  return `video/${type}`
-}
-
-// 获取资源 url 的类型
-export const getUrlType = (url) => {
-  const video = (/.*\.(mp4|mp3|wav|webm|ogg|m3u8)/i).exec(url)
-  let type = ''
-  if (video?.[1]) {
-    type = video[1].toLowerCase()
-  }
-  return type
-}
-
-// win7-ie11下播放m3u8，提示用户视频无法播放
-export const showPlayerTip = (url) => isIE() && isWin7() && getUrlType(url) === 'm3u8'
+import { isIE, isWin7 } from './type'
+
+// 获取类型
+export const getType = (type) => {
+  if (['mp3', 'wav', 'ogg'].includes(type)) {
+    return `audio/${type}`
+  }
+
+  if (type === 'm3u8') {
+    return 'application/x-mpegURL'
+  }
+  return `video/${type}`
+}
+
+// 获取资源 url 的类型
+export const getUrlType = (url) => {
+  const video = (/.*\.(mp4|mp3|wav|webm|ogg|m3u8)/i).exec(url)
+  let type = ''
+  if (video?.[1]) {
+    type = video[1].toLowerCase()
+  }
+  return type
+}
+
+// win7-ie11下播放m3u8，提示用户视频无法播放
+export const showPlayerTip = (url) => isIE() && isWin7() && getUrlType(url) === 'm3u8'

package/test/setup.js

@@ -1,21 +1,21 @@
-const { Crypto } = require('@peculiar/webcrypto')
-const { TextEncoder } = require('util')
-
-global.crypto = new Crypto()
-global.TextEncoder = TextEncoder
-
-// uc sdk 会报 console.warn
-jest.spyOn(global.console, 'warn').mockImplementation(() => jest.fn())
-
-expect.extend({
-  toBeType(received, argument) {
-    const type = Array.isArray(received) ? 'array' : typeof received
-    return type === argument ? {
-      message: () => `expected ${received} to be type ${argument}`,
-      pass: true
-    } : {
-      message: () => `expected ${received} to be type ${argument}`,
-      pass: false
-    }
-  }
-})
+const { Crypto } = require('@peculiar/webcrypto')
+const { TextEncoder } = require('util')
+
+global.crypto = new Crypto()
+global.TextEncoder = TextEncoder
+
+// uc sdk 会报 console.warn
+jest.spyOn(global.console, 'warn').mockImplementation(() => jest.fn())
+
+expect.extend({
+  toBeType(received, argument) {
+    const type = Array.isArray(received) ? 'array' : typeof received
+    return type === argument ? {
+      message: () => `expected ${received} to be type ${argument}`,
+      pass: true
+    } : {
+      message: () => `expected ${received} to be type ${argument}`,
+      pass: false
+    }
+  }
+})

package/test/unit/component/header/logo.spec.jsx

@@ -1,8 +1,8 @@
-import React from 'react'
-import { renderWithRouter } from '../../helper'
-import Logo from '@/component/Header/Logo'
-
-test('component - header - logo', () => {
-  const { container } = renderWithRouter(<Logo />)
-  expect(container.querySelector('#logo')).toBeInTheDocument()
-})
+import React from 'react'
+import { renderWithRouter } from '../../helper'
+import Logo from '@/component/Header/Logo'
+
+test('component - header - logo', () => {
+  const { container } = renderWithRouter(<Logo />)
+  expect(container.querySelector('#logo')).toBeInTheDocument()
+})

package/test/unit/helper.jsx

@@ -1,25 +1,25 @@
-import { createMemoryHistory } from 'history'
-import React from 'react'
-import { Router } from 'react-router-dom'
-import { render } from '@testing-library/react'
-
-export function renderWithRouter(
-  ui,
-  { route = '/',
-    x,
-    history = createMemoryHistory({
-      initialEntries: [x ?? route]
-    }),
-    ...renderOptions } = {}
-) {
-  function Wrapper({ children }) {
-    return <Router history={history}>{children}</Router>
-  }
-  return {
-    ...render(ui, {
-      wrapper: Wrapper,
-      ...renderOptions
-    }),
-    history
-  }
-}
+import { createMemoryHistory } from 'history'
+import React from 'react'
+import { Router } from 'react-router-dom'
+import { render } from '@testing-library/react'
+
+export function renderWithRouter(
+  ui,
+  { route = '/',
+    x,
+    history = createMemoryHistory({
+      initialEntries: [x ?? route]
+    }),
+    ...renderOptions } = {}
+) {
+  function Wrapper({ children }) {
+    return <Router history={history}>{children}</Router>
+  }
+  return {
+    ...render(ui, {
+      wrapper: Wrapper,
+      ...renderOptions
+    }),
+    history
+  }
+}