@x-edu/live-player 0.0.27 → 0.0.29

package/src/demo/List.jsx

@@ -27,7 +27,7 @@ export default function List() {
   const [refreshPage] = useState('0')
 
   const handleSubscribe = (data) => {
-    console.log(data, 444444)
+    console.log(data)
   }
 
   useEffect(() => {

package/src/list/ListItem/Action/index.jsx

@@ -63,7 +63,7 @@ export default function Action({
           handleLogin(data)
           return
         }
-        
+
         await openLiveSubscribe({
           liveId
         })
@@ -76,9 +76,15 @@ export default function Action({
         } else {
           setCurAction(4)
         }
-        onSubscribe({...data, is_subscribe:true})
+        onSubscribe({
+          ...data,
+          is_subscribe: true
+        })
       } catch (error) {
-        onSubscribe({...data, is_subscribe:false})
+        onSubscribe({
+          ...data,
+          is_subscribe: false
+        })
         if (error?.response?.data?.message === '直播开始前15分钟无法预约') {
           setCurAction(3)
         }

package/src/list/ListItem/img/like-fill.svg

@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_planar/web_icon_&#231;&#130;&#185;&#232;&#181;&#158;_fill">
+<g id="&#232;&#183;&#175;&#229;&#190;&#132;">
+<path d="M9.02622 2.08907L5.14744 5.96785C5.03377 6.08149 4.96989 6.23561 4.96986 6.39634V13.4182C4.96986 13.7529 5.2412 14.0242 5.57592 14.0242H12.1396C12.3852 14.0243 12.6066 13.8762 12.7002 13.6491L14.5759 9.09452C14.6361 8.948 14.667 8.7911 14.6668 8.6327V7.35755C14.6668 6.68812 14.1241 6.14543 13.4547 6.14543H9.57592L10.2747 3.39998C10.3654 3.04423 10.2332 2.66887 9.93956 2.44846L9.42259 2.06058C9.30181 1.97003 9.13281 1.98218 9.02622 2.08907Z" fill="#CCCCCC"/>
+<path d="M3.75774 6.75149H1.93956C1.60484 6.75149 1.3335 7.02283 1.3335 7.35755V13.4182C1.3335 13.7529 1.60484 14.0242 1.93956 14.0242H3.75774V6.75149Z" fill="#CCCCCC"/>
+</g>
+</g>
+</svg>

package/src/list/ListItem/img/view-fill.svg

@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_planar/web_icon_&#230;&#181;&#143;&#232;&#167;&#136;&#233;&#135;&#143;_fill">
+<g id="&#232;&#183;&#175;&#229;&#190;&#132;">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.0002 13C5.55571 13 3.37488 11.4573 1.46255 8.44367C1.29048 8.17291 1.29048 7.82709 1.46255 7.55633C3.37488 4.54267 5.55571 3 8.0002 3C10.4447 3 12.6255 4.54267 14.5379 7.55633C14.7099 7.82709 14.7099 8.17291 14.5379 8.44367C12.6255 11.4573 10.4447 13 8.0002 13ZM5.33352 8C5.33352 9.47276 6.52743 10.6667 8.00018 10.6667C9.47294 10.6667 10.6669 9.47276 10.6669 8C10.6669 6.52724 9.47294 5.33333 8.00018 5.33333C6.52743 5.33333 5.33352 6.52724 5.33352 8Z" fill="#CCCCCC"/>
+<path d="M9.34553 8C9.34553 8.73633 8.7432 9.33333 8.0002 9.33333C7.2572 9.33333 6.65487 8.73633 6.65487 8C6.65487 7.26367 7.2572 6.66667 8.0002 6.66667C8.7432 6.66667 9.34553 7.26367 9.34553 8Z" fill="#CCCCCC"/>
+</g>
+</g>
+</svg>

package/src/list/ListItem/index.jsx

@@ -1,16 +1,16 @@
 import React, { useEffect, useState } from 'react'
 import dayjs from 'dayjs'
 import classNames from 'classnames'
+import { find } from 'lodash'
 import Avatar from '@/component/Avatar'
 import Icon from '@/component/Icon'
 import { formatLikesCount, formatUVCount } from '@/util/liveCountUtil'
 import { getResourceLikes } from '@/service/like'
-import { find } from 'lodash'
 import Action from './Action'
 import DefaultCover from './img/live.png'
 import PlayImg from './img/play.svg'
-import dianZan from './img/dianzan.svg'
-import yiYue from './img/yiguankan.svg'
+import dianZan from './img/like-fill.svg'
+import yiYue from './img/view-fill.svg'
 import videoSvg from './img/video.svg'
 import style from './index.module.less'
 
@@ -23,6 +23,7 @@ const TagName = {
 
 export default function ListItem({
   data,
+  themeName,
   subscription,
   onDetailClick,
   handleLogin,
@@ -39,7 +40,7 @@ export default function ListItem({
   } = data
   const [liveExt, setLiveExt] = useState({})
   const [isSubscribe, setIsSubscribe] = useState(() => {
-    if (status===0) {
+    if (status === 0) {
       // 开播前15分钟之外
       const subscriptionItem = find(subscription, {
         live_id: liveId
@@ -76,7 +77,7 @@ export default function ListItem({
 
   return (
     <div
-      className={style.container}
+      className={classNames(style.container, themeName)}
       onClick={handleDetailClick}
     >
       <div className={style.right}>
@@ -104,7 +105,7 @@ export default function ListItem({
               </div>
             </div>
           </div>
-          
+
           <Action
             data={data}
             subscription={subscription}
@@ -115,7 +116,7 @@ export default function ListItem({
             setIsSubscribe={setIsSubscribe}
             status={status}
           />
-           
+
         </div>
       </div>
       <div className={style.left}>

package/src/list/ListItem/index.module.less

@@ -125,6 +125,12 @@
       }
     }
   }
+
+  &:global(.dark) {
+    .title {
+      color: #fff;
+    }
+  }
 }
 
 .container:hover {

package/src/list/index.jsx

@@ -1,12 +1,13 @@
 import React, { useEffect, useState } from 'react'
+import { getXEduThemeName } from '@x-edu/theme'
 import classNames from 'classnames'
 import { Tabs } from 'fish'
 import { OpenLiveSearchFront, getSubscription } from '@/service/live'
 import { setUC } from '@/util/auth/func'
 import config from '@/config/env'
 import Loading from '@/component/status/Loading'
-import Empty from './Empty'
 import Pagination from '@/component/Pagination'
+import Empty from './Empty'
 import ListItem from './ListItem'
 import style from './index.module.less'
 
@@ -77,7 +78,7 @@ export default function PublicLiveList({
         offset: (page - 1) * PageSize,
         limit: PageSize
       })
-  
+
       const { items, count } = data
       if (uc) {
         const curIsLogin = await uc.isLogin()
@@ -169,16 +170,19 @@ export default function PublicLiveList({
       //   }
       // ])
       // setTotal(1)
-      // setLoading(false) 
+      // setLoading(false)
     }
     getList()
-  }, [page, status,refreshPage])
+  }, [page, status, refreshPage])
+
+  const themeName = getXEduThemeName()
 
   return (
     <div
       className={classNames(
         containerClassName,
-        style.container
+        style.container,
+        themeName
       )}
     >
       <Tabs
@@ -201,6 +205,7 @@ export default function PublicLiveList({
                       <>
                         {list.map((listItem) => (
                           <ListItem
+                            themeName={themeName}
                             data={listItem}
                             key={listItem.live_id}
                             subscription={subscription}