From 35d2442eac524e5e54447016701640ffecbf89f1 Mon Sep 17 00:00:00 2001 From: czy0729 <402731062@qq.com> Date: Fri, 30 Aug 2024 06:11:09 +0800 Subject: [PATCH] - fixed #184 --- .../home/v2/component/grid/item/index.tsx | 10 ++++++-- .../v2/component/grid/item/opacity/index.tsx | 5 ++-- .../home/v2/component/grid/item/styles.ts | 4 ++-- src/screens/home/v2/component/grid/styles.ts | 4 ++-- src/screens/home/v2/component/item/ds.ts | 22 ++--------------- src/screens/home/v2/component/item/index.tsx | 5 ++-- .../home/v2/component/item/progress/index.tsx | 9 ++++--- src/screens/home/v2/component/item/types.ts | 24 +++++++++++++++++++ 8 files changed, 47 insertions(+), 36 deletions(-) create mode 100644 src/screens/home/v2/component/item/types.ts diff --git a/src/screens/home/v2/component/grid/item/index.tsx b/src/screens/home/v2/component/grid/item/index.tsx index ad6090b3b..a34104d8d 100755 --- a/src/screens/home/v2/component/grid/item/index.tsx +++ b/src/screens/home/v2/component/grid/item/index.tsx @@ -2,7 +2,7 @@ * @Author: czy0729 * @Date: 2019-10-20 17:49:25 * @Last Modified by: czy0729 - * @Last Modified time: 2024-03-27 05:42:48 + * @Last Modified time: 2024-08-30 06:06:43 */ import React from 'react' import { View } from 'react-native' @@ -46,7 +46,13 @@ function Item({ subject = {}, subjectId = 0, epStatus }: Props, { $ }: Ctx) { - {!isGame && } + {!isGame && ( + + )} {homeGridTitle && ( {cnjp(subject.name_cn, subject.name)} diff --git a/src/screens/home/v2/component/grid/item/opacity/index.tsx b/src/screens/home/v2/component/grid/item/opacity/index.tsx index 6c61b1812..425f581bb 100644 --- a/src/screens/home/v2/component/grid/item/opacity/index.tsx +++ b/src/screens/home/v2/component/grid/item/opacity/index.tsx @@ -2,7 +2,7 @@ * @Author: czy0729 * @Date: 2022-11-21 02:56:42 * @Last Modified by: czy0729 - * @Last Modified time: 2024-04-12 17:20:36 + * @Last Modified time: 2024-08-30 06:05:25 */ import React from 'react' import { View } from 'react-native' @@ -13,8 +13,7 @@ import { styles } from './styles' function Opacity({ subjectId, children }, { $ }: Ctx) { const { subject_id: current } = $.state.grid || {} - const isActive = current === subjectId - return {children} + return {children} } export default obc(Opacity, COMPONENT) diff --git a/src/screens/home/v2/component/grid/item/styles.ts b/src/screens/home/v2/component/grid/item/styles.ts index 6ae70d3ed..04aa2751b 100644 --- a/src/screens/home/v2/component/grid/item/styles.ts +++ b/src/screens/home/v2/component/grid/item/styles.ts @@ -2,7 +2,7 @@ * @Author: czy0729 * @Date: 2022-06-20 15:48:01 * @Last Modified by: czy0729 - * @Last Modified time: 2024-03-27 05:26:40 + * @Last Modified time: 2024-08-30 05:56:15 */ import { _ } from '@stores' @@ -20,7 +20,7 @@ export const memoStyles = _.memoStyles(() => { opacity: 0.5 }, title: { - paddingHorizontal: _.sm, + paddingHorizontal: 2, marginTop: _.sm, marginBottom: _.xs } diff --git a/src/screens/home/v2/component/grid/styles.ts b/src/screens/home/v2/component/grid/styles.ts index 81eb22a8e..299e625a6 100644 --- a/src/screens/home/v2/component/grid/styles.ts +++ b/src/screens/home/v2/component/grid/styles.ts @@ -2,7 +2,7 @@ * @Author: czy0729 * @Date: 2022-06-19 19:22:46 * @Last Modified by: czy0729 - * @Last Modified time: 2024-07-10 17:26:46 + * @Last Modified time: 2024-08-30 06:02:01 */ import { _ } from '@stores' @@ -28,7 +28,7 @@ export const memoStyles = _.memoStyles(() => { height: '100%' }, contentContainerStyle: { - paddingTop: 16, + paddingTop: 20, paddingBottom: _.tabBarHeight + _.lg + height, paddingLeft: _.wind - _.sm - 2, overflow: 'hidden' diff --git a/src/screens/home/v2/component/item/ds.ts b/src/screens/home/v2/component/item/ds.ts index e773754e1..703b58eff 100644 --- a/src/screens/home/v2/component/item/ds.ts +++ b/src/screens/home/v2/component/item/ds.ts @@ -2,10 +2,10 @@ * @Author: czy0729 * @Date: 2024-01-20 09:11:26 * @Last Modified by: czy0729 - * @Last Modified time: 2024-03-26 18:04:54 + * @Last Modified time: 2024-08-30 05:21:35 */ import { rc } from '@utils/dev' -import { Override, Subject, SubjectId } from '@types' +import { Subject, SubjectId } from '@types' import { TabsLabel } from '../../types' import { COMPONENT as PARENT } from '../ds' @@ -24,24 +24,6 @@ export const WEEK_DAY_MAP = { 7: '日' } as const -/** index.tsx */ -export type Props = { - index: number - subjectId: SubjectId - subject: Override< - Subject, - { - /** 收藏时间 (游戏才有) */ - time?: string - } - > - title?: TabsLabel - - /** 看到多少集 */ - epStatus: string | number -} - -/** item.tsx */ export const DEFAULT_PROPS = { index: 0 as number, title: '' as TabsLabel, diff --git a/src/screens/home/v2/component/item/index.tsx b/src/screens/home/v2/component/item/index.tsx index 44a0a14dd..b81ef751b 100755 --- a/src/screens/home/v2/component/item/index.tsx +++ b/src/screens/home/v2/component/item/index.tsx @@ -2,13 +2,14 @@ * @Author: czy0729 * @Date: 2021-08-09 08:04:06 * @Last Modified by: czy0729 - * @Last Modified time: 2024-01-20 09:48:04 + * @Last Modified time: 2024-08-30 05:21:55 */ import React from 'react' import { obc } from '@utils/decorators' import { Ctx } from '../../types' import Item from './item' -import { COMPONENT, Props } from './ds' +import { COMPONENT } from './ds' +import { Props } from './types' function ItemWrap( { index = 0, subjectId = 0, subject = {}, title, epStatus = '' }: Props, diff --git a/src/screens/home/v2/component/item/progress/index.tsx b/src/screens/home/v2/component/item/progress/index.tsx index 07cee657d..6a9099d2d 100755 --- a/src/screens/home/v2/component/item/progress/index.tsx +++ b/src/screens/home/v2/component/item/progress/index.tsx @@ -2,7 +2,7 @@ * @Author: czy0729 * @Date: 2021-01-21 16:01:56 * @Last Modified by: czy0729 - * @Last Modified time: 2024-01-20 07:43:28 + * @Last Modified time: 2024-08-30 05:32:29 */ import React from 'react' import { OnairProgress } from '@_' @@ -33,10 +33,9 @@ function Progress( return ( ) diff --git a/src/screens/home/v2/component/item/types.ts b/src/screens/home/v2/component/item/types.ts new file mode 100644 index 000000000..0fa8821a2 --- /dev/null +++ b/src/screens/home/v2/component/item/types.ts @@ -0,0 +1,24 @@ +/* + * @Author: czy0729 + * @Date: 2024-08-30 05:21:26 + * @Last Modified by: czy0729 + * @Last Modified time: 2024-08-30 05:21:26 + */ +import { Override, Subject, SubjectId } from '@types' +import { TabsLabel } from '../../types' + +export type Props = { + index: number + subjectId: SubjectId + subject: Override< + Subject, + { + /** 收藏时间 (游戏才有) */ + time?: string + } + > + title?: TabsLabel + + /** 看到多少集 */ + epStatus: string | number +}