-

package.json

@@ -74,7 +74,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@react-native/eslint-config": "^0.74.0",
-    "@tingyuan/react-native-tailwindcss": "^0.0.16",
+    "@tingyuan/react-native-tailwindcss": "^0.0.18",
     "@types/he": "^1.2.3",
     "@types/react": "~18.2.14",
     "@types/spark-md5": "^3.0.4",
@@ -91,6 +91,8 @@
     "eslint-plugin-simple-import-sort": "^12.0.0",
     "eslint-plugin-sonarjs": "^0.24.0",
     "open": "8.4.2",
+    "postcss": "^8.4.38",
+    "postcss-custom-properties": "^13.3.6",
     "prettier": "^3.1.1",
     "rimraf": "^5.0.5",
     "semver": "^7.5.1",

src/components/Image2.tsx

@@ -16,7 +16,7 @@ function Image2(
   >(null)
 
   let style: ImageProps['style'] = React.useMemo(() => {
-    const imgStyle = StyleSheet.flatten(props.style)
+    const imgStyle = StyleSheet.flatten(props.style) || {}
 
     if (sourceInfo) {
       const aspectRatio =

src/components/ImagesView.tsx

@@ -94,14 +94,14 @@ function ImagesView() {
                   initWidth={96}
                   initHeight={96}
                   style={{ width: imgWidth, height: imgHeight }}
-                  placeholder={require('../../assets/loading.png')}
+                  placeholder={require('../../assets/loading.gif')}
                 />
               )
               imageView = imageCompCache.current[v.url]
             } else {
               imageView = (
                 <Image
-                  source={require('../../assets/loading.png')}
+                  source={require('../../assets/loading.gif')}
                   className="w-24 h-24"
                 />
               )

src/components/ReplyList.tsx

@@ -39,8 +39,13 @@ export default function ReplyList() {
       isVisible={!!repliesInfo}>
       <View className="h-[68vh] bg-neutral-100 dark:bg-neutral-700">
         <View className="py-2 px-3 flex-row items-center border-gray-500 justify-between">
-          <Text className="text-lg font-semibold">
-            评论详情{typeof allCount === 'number' ? `（${allCount}条）` : ''}
+          <Text className="text-base font-semibold">
+            评论详情
+            {typeof allCount === 'number'
+              ? `（${allCount}条）`
+              : isLoading
+                ? '...'
+                : ''}
           </Text>
           <Icon
             name="close"

src/routes/Dynamic/Header.tsx

@@ -38,7 +38,7 @@ export function HeaderLeft(props: { scrollTop: () => void }) {
       })
     }
   }
-  const level = dynamicUser?.level ? 'ᴸⱽ' + levelList[dynamicUser.level] : ''
+  const level = dynamicUser?.level ? levelList[dynamicUser.level] : ''
   const userName = dynamicUser?.name || '' // ? dynamicUser.name + level : ''
   const sex =
     dynamicUser?.sex === '男' ? '♂️' : dynamicUser?.sex === '女' ? '♀️' : ''
@@ -96,7 +96,7 @@ export function HeaderLeft(props: { scrollTop: () => void }) {
             props.scrollTop()
           }}>
           {userName}
-          <Text className="text-sm">{level + '   '}</Text>
+          <Text className="text-lg">{level + '  '}</Text>
         </Text>
         {fans ? (
           <Text

src/routes/Play/Player.tsx

@@ -4,7 +4,6 @@ import {
   useNavigation,
   useRoute,
 } from '@react-navigation/native'
-import { Icon } from '@rneui/themed'
 import * as KeepAwake from 'expo-keep-awake'
 import React from 'react'
 import {
@@ -19,14 +18,14 @@ import {
 import WebView, { type WebViewMessageEvent } from 'react-native-webview'
 
 import { usePlayUrl } from '@/api/play-url'
+import Image2 from '@/components/Image2'
 import { UA } from '@/constants'
 import { colors } from '@/constants/colors.tw'
 import { useMarkVideoWatched } from '@/store/actions'
 import type { NavigationProps, RootStackParamList } from '@/types'
 
 import { useVideoInfo } from '../../api/video-info'
 import { useAppStateChange } from '../../hooks/useAppState'
-import useMounted from '../../hooks/useMounted'
 import { useStore } from '../../store'
 import { parseDuration, parseImgUrl, showToast } from '../../utils'
 import { INJECTED_JAVASCRIPT } from './inject-play'
@@ -95,11 +94,11 @@ function Player(props: { currentPage: number; currentCid?: number }) {
       KeepAwake.deactivateKeepAwake('PLAY')
     }
   })
-  useMounted(() => {
-    if (!isWifi) {
-      showToast('注意流量')
-    }
-  })
+  // useMounted(() => {
+  //   if (!isWifi) {
+  //     showToast('注意流量')
+  //   }
+  // })
   const navigation = useNavigation<NavigationProps['navigation']>()
 
   useFocusEffect(
@@ -271,16 +270,16 @@ function Player(props: { currentPage: number; currentCid?: number }) {
             source={{ uri: parseImgUrl(videoInfo.cover, 500, 312) }}
             resizeMode="cover"
             className="flex-1 justify-center items-center">
-            <Icon
-              name="television-play"
-              type="material-community"
-              size={60}
-              color={'white'}
+            <Image2
+              source={require('../../../assets/play.png')}
+              className="w-20"
             />
             <View className="absolute bottom-2 left-2 flex-row gap-2">
-              <Text className="rounded bg-gray-900/60 py-[2px] px-2 text-white font-bold">
-                {parseDuration(videoInfo?.duration)}
-              </Text>
+              {videoInfo?.duration ? (
+                <Text className="rounded bg-gray-900/60 py-[2px] px-2 text-white font-bold">
+                  {parseDuration(videoInfo?.duration)}
+                </Text>
+              ) : null}
               <Text className="rounded bg-gray-900/60 py-[2px] px-2 text-white font-bold">
                 播放将消耗流量
               </Text>

src/routes/SearchVideos/index.tsx

@@ -1,3 +1,4 @@
+import { useBackHandler } from '@react-native-community/hooks'
 import React from 'react'
 import type { SearchBarCommands } from 'react-native-screens'
 
@@ -11,6 +12,15 @@ function SearchVideos() {
   const searchBarRef = React.useRef<SearchBarCommands | null>(null)
   const blackColor = tw(colors.black.text).color
   const [searchKeyWord, setSearchKeyWord] = React.useState('')
+  useBackHandler(() => {
+    if (searchKeyWord) {
+      searchBarRef.current?.blur()
+      searchBarRef.current?.setText('')
+      setSearchKeyWord('')
+      return true
+    }
+    return false
+  })
   useUpdateNavigationOptions(
     React.useMemo(() => {
       return {