@x-edu/live-player 0.0.19 → 0.0.21

package/src/component/VideoBase/utils.js

@@ -1,81 +1,81 @@
-export function srt2webvtt(data) {
-  // remove dos newlines
-  let srt = data.replace(/\r+/g, '')
-  // trim white space start and end
-  srt = srt.replace(/^\s+|\s+$/g, '')
-
-  // get cues
-  const cuelist = srt.split('\n\n')
-  let result = ''
-
-  if (cuelist.length > 0) {
-    result += 'WEBVTT\n\n'
-    for (let i = 0; i < cuelist.length; i += 1) {
-      result += convertSrtCue(cuelist[i])
-    }
-  }
-
-  return result
-}
-
-function convertSrtCue(caption) {
-  let cue = ''
-  const s = caption.split(/\n/)
-
-  // concatenate muilt-line string separated in array into one
-  while (s.length > 3) {
-    for (let i = 3; i < s.length; i++) {
-      s[2] += `\n${s[i]}`
-    }
-    s.splice(3, s.length - 3)
-  }
-
-  let line = 0
-
-  // detect identifier
-  if (!s[0].match(/\d+:\d+:\d+/) && s[1].match(/\d+:\d+:\d+/)) {
-    cue += `${s[0].match(/\w+/)}\n`
-    line += 1
-  }
-
-  // get time strings
-  if (s[line].match(/\d+:\d+:\d+/)) {
-    // convert time string
-    const m = s[1].match(
-      /(\d+):(\d+):(\d+)(?:,(\d+))?\s*--?>\s*(\d+):(\d+):(\d+)(?:,(\d+))?/
-    )
-    if (m) {
-      cue += `${m[1]}:${m[2]}:${m[3]}.${m[4]} --> ${m[5]}:${m[6]}:${m[7]}.${m[8]}\n`
-      line += 1
-    } else {
-      // Unrecognized timestring
-      return ''
-    }
-  } else {
-    // file format error or comment lines
-    return ''
-  }
-
-  // get cue text
-  if (s[line]) {
-    cue += `${s[line]}\n\n`
-  }
-
-  return cue
-}
-
-export function string2buffer(str) {
-  // 首先将字符串转为16进制
-  let val = ''
-  for (let i = 0; i < str.length; i++) {
-    if (val === '') {
-      val = str.charCodeAt(i).toString(16)
-    } else {
-      val += `,${str.charCodeAt(i).toString(16)}`
-    }
-  }
-  // 将16进制转化为ArrayBuffer
-  return new Uint8Array(
-    val.match(/[\da-f]{2}/gi).map((h) => parseInt(h, 16))
-  ).buffer
-}
+export function srt2webvtt(data) {
+  // remove dos newlines
+  let srt = data.replace(/\r+/g, '')
+  // trim white space start and end
+  srt = srt.replace(/^\s+|\s+$/g, '')
+
+  // get cues
+  const cuelist = srt.split('\n\n')
+  let result = ''
+
+  if (cuelist.length > 0) {
+    result += 'WEBVTT\n\n'
+    for (let i = 0; i < cuelist.length; i += 1) {
+      result += convertSrtCue(cuelist[i])
+    }
+  }
+
+  return result
+}
+
+function convertSrtCue(caption) {
+  let cue = ''
+  const s = caption.split(/\n/)
+
+  // concatenate muilt-line string separated in array into one
+  while (s.length > 3) {
+    for (let i = 3; i < s.length; i++) {
+      s[2] += `\n${s[i]}`
+    }
+    s.splice(3, s.length - 3)
+  }
+
+  let line = 0
+
+  // detect identifier
+  if (!s[0].match(/\d+:\d+:\d+/) && s[1].match(/\d+:\d+:\d+/)) {
+    cue += `${s[0].match(/\w+/)}\n`
+    line += 1
+  }
+
+  // get time strings
+  if (s[line].match(/\d+:\d+:\d+/)) {
+    // convert time string
+    const m = s[1].match(
+      /(\d+):(\d+):(\d+)(?:,(\d+))?\s*--?>\s*(\d+):(\d+):(\d+)(?:,(\d+))?/
+    )
+    if (m) {
+      cue += `${m[1]}:${m[2]}:${m[3]}.${m[4]} --> ${m[5]}:${m[6]}:${m[7]}.${m[8]}\n`
+      line += 1
+    } else {
+      // Unrecognized timestring
+      return ''
+    }
+  } else {
+    // file format error or comment lines
+    return ''
+  }
+
+  // get cue text
+  if (s[line]) {
+    cue += `${s[line]}\n\n`
+  }
+
+  return cue
+}
+
+export function string2buffer(str) {
+  // 首先将字符串转为16进制
+  let val = ''
+  for (let i = 0; i < str.length; i++) {
+    if (val === '') {
+      val = str.charCodeAt(i).toString(16)
+    } else {
+      val += `,${str.charCodeAt(i).toString(16)}`
+    }
+  }
+  // 将16进制转化为ArrayBuffer
+  return new Uint8Array(
+    val.match(/[\da-f]{2}/gi).map((h) => parseInt(h, 16))
+  ).buffer
+}

package/src/component/mixin.less

@@ -1,10 +1,10 @@
-.ellipsis() {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.bgCompact(@url) {
-  background-image: url(@url);
-  background-repeat: no-repeat;
+.ellipsis() {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.bgCompact(@url) {
+  background-image: url(@url);
+  background-repeat: no-repeat;
 }

package/src/component/status/403.jsx

@@ -1,15 +1,15 @@
-import React from 'react'
-import { useHistory } from 'react-router-dom'
-
-export default function Error403() {
-  const history = useHistory()
-
-  return (
-    <div>
-      您没有权限访问此页面!
-      <a href="#" onClick={history.goBack}>
-        ❮ 返回
-      </a>
-    </div>
-  )
-}
+import React from 'react'
+import { useHistory } from 'react-router-dom'
+
+export default function Error403() {
+  const history = useHistory()
+
+  return (
+    <div>
+      您没有权限访问此页面!
+      <a href="#" onClick={history.goBack}>
+        ❮ 返回
+      </a>
+    </div>
+  )
+}

package/src/component/status/404/index.jsx

@@ -1,73 +1,73 @@
-import React, { useEffect, useState } from 'react'
-import { Link, useLocation } from 'react-router-dom'
-import classNames from 'classnames'
-import Cookies from 'js-cookie'
-import Image from '@/component/Image'
-import { getAreaSiteList, getSiteInfo } from '@/service/area-site'
-import Area from '@/page/area'
-
-import style from './index.module.less'
-
-const errorImg = '@/component/status/404/img/404.png'
-
-const Error404 = ({ className, tip = '服务器开小差了，请稍后再试试', isBack = true }) => {
-  const { pathname, search } = useLocation()
-  const [loading, setLoading] = useState(true)
-  const [microAreaSite, setMicroAreaSite] = useState(null)
-  const [microAreaSiteList, setMicroAreaSiteList] = useState(null)
-
-  useEffect(() => {
-    async function load() {
-      try {
-        let siteList = window.areaSiteList
-        if (!siteList) {
-          // TODO: 后续可能做本地持久化优化，以及子站路由地址优化
-          siteList = await getAreaSiteList()
-        }
-        const skipAreaSiteList = search.includes('_skip_area_sitelist=1') || !!Cookies.get('skipAreaSiteList') || false
-        if (skipAreaSiteList) {
-          // 有很多页面是新页面打开，会话cookie是在浏览器关闭时才会清除，所以要用会话cookie 存储 skipAreaSiteList
-          Cookies.set('skipAreaSiteList', '1')
-        }
-        setMicroAreaSiteList(siteList)
-        if (siteList || skipAreaSiteList) {
-          window.areaSiteList = siteList
-          const code = window.location.pathname.split('/')[1]
-          const site = siteList.find((t) => t.code === code)
-          if ((site && site.domain) || skipAreaSiteList) {
-            const siteInfo = await getSiteInfo(code)
-            setMicroAreaSite(siteInfo)
-            setLoading(false)
-            // window.location.replace(site.domain + window.location.pathname.replace(code, 'area') + window.location.search + window.location.hash)
-          } else {
-            setLoading(false)
-          }
-        }
-      } catch (e) {
-        setLoading(false)
-      }
-    }
-    setLoading(true)
-    load()
-  }, [pathname, search])
-
-  if (loading) {
-    return null
-  }
-
-  if (microAreaSite) {
-    return (
-      <Area siteList={microAreaSiteList} site={microAreaSite} />
-    )
-  }
-
-  return (
-    <div className={classNames(style.error, className)}>
-      <Image src={errorImg} />
-      <div className={style.text}>{tip}</div>
-      {isBack && <Link className={style.back} to="/">返回首页</Link>}
-    </div>
-  )
-}
-
-export default Error404
+import React, { useEffect, useState } from 'react'
+import { Link, useLocation } from 'react-router-dom'
+import classNames from 'classnames'
+import Cookies from 'js-cookie'
+import Image from '@/component/Image'
+import { getAreaSiteList, getSiteInfo } from '@/service/area-site'
+import Area from '@/page/area'
+
+import style from './index.module.less'
+
+const errorImg = '@/component/status/404/img/404.png'
+
+const Error404 = ({ className, tip = '服务器开小差了，请稍后再试试', isBack = true }) => {
+  const { pathname, search } = useLocation()
+  const [loading, setLoading] = useState(true)
+  const [microAreaSite, setMicroAreaSite] = useState(null)
+  const [microAreaSiteList, setMicroAreaSiteList] = useState(null)
+
+  useEffect(() => {
+    async function load() {
+      try {
+        let siteList = window.areaSiteList
+        if (!siteList) {
+          // TODO: 后续可能做本地持久化优化，以及子站路由地址优化
+          siteList = await getAreaSiteList()
+        }
+        const skipAreaSiteList = search.includes('_skip_area_sitelist=1') || !!Cookies.get('skipAreaSiteList') || false
+        if (skipAreaSiteList) {
+          // 有很多页面是新页面打开，会话cookie是在浏览器关闭时才会清除，所以要用会话cookie 存储 skipAreaSiteList
+          Cookies.set('skipAreaSiteList', '1')
+        }
+        setMicroAreaSiteList(siteList)
+        if (siteList || skipAreaSiteList) {
+          window.areaSiteList = siteList
+          const code = window.location.pathname.split('/')[1]
+          const site = siteList.find((t) => t.code === code)
+          if ((site && site.domain) || skipAreaSiteList) {
+            const siteInfo = await getSiteInfo(code)
+            setMicroAreaSite(siteInfo)
+            setLoading(false)
+            // window.location.replace(site.domain + window.location.pathname.replace(code, 'area') + window.location.search + window.location.hash)
+          } else {
+            setLoading(false)
+          }
+        }
+      } catch (e) {
+        setLoading(false)
+      }
+    }
+    setLoading(true)
+    load()
+  }, [pathname, search])
+
+  if (loading) {
+    return null
+  }
+
+  if (microAreaSite) {
+    return (
+      <Area siteList={microAreaSiteList} site={microAreaSite} />
+    )
+  }
+
+  return (
+    <div className={classNames(style.error, className)}>
+      <Image src={errorImg} />
+      <div className={style.text}>{tip}</div>
+      {isBack && <Link className={style.back} to="/">返回首页</Link>}
+    </div>
+  )
+}
+
+export default Error404

package/src/component/status/404/index.module.less

@@ -1,36 +1,36 @@
-.error {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  background: #FFFFFF;
-  border-radius: 8px;
-  padding: 80px 0;
-  min-height: 70vh;
-
-  img {
-    width: 254px;
-    height: 174px;
-  }
-
- .text {
-    font-size: 16px;
-    color: #666666;
-    line-height: 24px;
-    margin-top: 38px;
-  }
-  
-  .back {
-    margin-top: 24px;
-    width: 119px;
-    background: #EAEEFD;
-    height: 38px;
-    line-height: 38px;
-    border-radius: 20px;
-    font-size: 16px;
-    color: #206CED;
-    text-align: center;
-  }
-}
+.error {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background: #FFFFFF;
+  border-radius: 8px;
+  padding: 80px 0;
+  min-height: 70vh;
+
+  img {
+    width: 254px;
+    height: 174px;
+  }
+
+ .text {
+    font-size: 16px;
+    color: #666666;
+    line-height: 24px;
+    margin-top: 38px;
+  }
+  
+  .back {
+    margin-top: 24px;
+    width: 119px;
+    background: #EAEEFD;
+    height: 38px;
+    line-height: 38px;
+    border-radius: 20px;
+    font-size: 16px;
+    color: #206CED;
+    text-align: center;
+  }
+}

package/src/component/status/Error/error.module.less

@@ -1,14 +1,14 @@
-.error-wrap {
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-
-  :global {
-    .fish-collapse > .fish-collapse-item > .fish-collapse-header {
-      padding-top: 5px;
-      padding-bottom: 5px;
-    }
-  }
+.error-wrap {
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+
+  :global {
+    .fish-collapse > .fish-collapse-item > .fish-collapse-header {
+      padding-top: 5px;
+      padding-bottom: 5px;
+    }
+  }
 }

package/src/component/status/Error/index.jsx

@@ -1,47 +1,47 @@
-import React from 'react'
-import { Collapse } from 'fish'
-import Image from '@/component/Image'
-
-import style from './error.module.less'
-
-const { Panel } = Collapse
-const errorImg = '@/component/status/Error/img/error.png'
-
-export default function Error({
-  title,
-  desc,
-  error
-}) {
-  let displayTitle = title
-  // 此类错误 toast已经拦截
-  if (error && error.isAxiosError) {
-    if (!title) {
-      displayTitle = '很抱歉，网络开小差了，请重试'
-    }
-  }
-  return (
-    <div className={style['error-wrap']}>
-      <Image src={errorImg} alt="" />
-      <h2>
-        {displayTitle || '加载组件时发生了一些异常'}
-      </h2>
-      { desc ? <span>{desc}</span> : null }
-      {
-        error ? (
-          <>
-            <Collapse>
-              <Panel header="错误信息" key="1">
-                <pre style={{
-                  color: 'red'
-                }}
-                >
-                  { error && error.stack}
-                </pre>
-              </Panel>
-            </Collapse>
-          </>
-        ) : null
-      }
-    </div>
-  )
-}
+import React from 'react'
+import { Collapse } from 'fish'
+import Image from '@/component/Image'
+
+import style from './error.module.less'
+
+const { Panel } = Collapse
+const errorImg = '@/component/status/Error/img/error.png'
+
+export default function Error({
+  title,
+  desc,
+  error
+}) {
+  let displayTitle = title
+  // 此类错误 toast已经拦截
+  if (error && error.isAxiosError) {
+    if (!title) {
+      displayTitle = '很抱歉，网络开小差了，请重试'
+    }
+  }
+  return (
+    <div className={style['error-wrap']}>
+      <Image src={errorImg} alt="" />
+      <h2>
+        {displayTitle || '加载组件时发生了一些异常'}
+      </h2>
+      { desc ? <span>{desc}</span> : null }
+      {
+        error ? (
+          <>
+            <Collapse>
+              <Panel header="错误信息" key="1">
+                <pre style={{
+                  color: 'red'
+                }}
+                >
+                  { error && error.stack}
+                </pre>
+              </Panel>
+            </Collapse>
+          </>
+        ) : null
+      }
+    </div>
+  )
+}