From f0e9893eace82f9683fc24616f82356d7a740b70 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 18 Feb 2023 19:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=84=E8=AE=BA=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                       |  4 ++--
 package.json                            |  2 +-
 src/plugins/sync/log.js                 |  1 -
 src/screens/Comment/CommentNew.tsx      |  2 +-
 src/screens/Comment/components/List.tsx | 26 +++++++++++++++----------
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a1193c..cca5477 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "lx-music-mobile",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "lx-music-mobile",
-      "version": "1.0.0-beta.1",
+      "version": "1.0.0-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@craftzdog/react-native-buffer": "^6.0.5",
diff --git a/package.json b/package.json
index a7478a7..82c1ce2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lx-music-mobile",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "versionCode": 53,
   "private": true,
   "scripts": {
diff --git a/src/plugins/sync/log.js b/src/plugins/sync/log.js
index 9fd1ad3..16f5102 100644
--- a/src/plugins/sync/log.js
+++ b/src/plugins/sync/log.js
@@ -11,7 +11,6 @@ export default {
     writeLog.error(...args)
   },
   info(...args) {
-    console.log(args)
     if (global.lx.isEnableSyncLog) writeLog.info(...args)
   },
   warn(...args) {
diff --git a/src/screens/Comment/CommentNew.tsx b/src/screens/Comment/CommentNew.tsx
index 9130b65..4c4f958 100644
--- a/src/screens/Comment/CommentNew.tsx
+++ b/src/screens/Comment/CommentNew.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef } from 'react'
 import { filterList, getNewComment } from './utils'
 import music from '@/utils/musicSdk'
-import List, { ListType } from './components/List'
+import List, { type ListType } from './components/List'
 const limit = 15
 
 export default ({ musicInfo, onUpdateTotal }: {
diff --git a/src/screens/Comment/components/List.tsx b/src/screens/Comment/components/List.tsx
index ea2b711..828bf75 100644
--- a/src/screens/Comment/components/List.tsx
+++ b/src/screens/Comment/components/List.tsx
@@ -69,7 +69,6 @@ const List = forwardRef<ListType, ListProps>(({
     let label: FooterLabel
     switch (status) {
       case 'refreshing': return null
-      case 'idle':
       case 'loading':
         label = 'list_loading'
         break
@@ -79,6 +78,9 @@ const List = forwardRef<ListType, ListProps>(({
       case 'error':
         label = 'list_error'
         break
+      case 'idle':
+        label = null
+        break
     }
     return <Footer label={label} onLoadMore={onLoadMore} />
   }, [onLoadMore, status])
@@ -88,12 +90,12 @@ const List = forwardRef<ListType, ListProps>(({
       ref={flatListRef}
       style={styles.list}
       data={currentList}
-      onEndReachedThreshold={0.6}
-      maxToRenderPerBatch={4}
+      onEndReachedThreshold={0.5}
+      // maxToRenderPerBatch={4}
       // updateCellsBatchingPeriod={80}
-      windowSize={8}
-      removeClippedSubviews={true}
-      initialNumToRender={12}
+      // windowSize={8}
+      removeClippedSubviews={false}
+      // initialNumToRender={12}
       renderItem={renderItem}
       keyExtractor={getkey}
       // onRefresh={onRefresh}
@@ -105,7 +107,7 @@ const List = forwardRef<ListType, ListProps>(({
   )
 })
 
-type FooterLabel = 'list_loading' | 'list_end' | 'list_error'
+type FooterLabel = 'list_loading' | 'list_end' | 'list_error' | null
 const Footer = ({ label, onLoadMore }: {
   label: FooterLabel
   onLoadMore: () => void
@@ -117,9 +119,13 @@ const Footer = ({ label, onLoadMore }: {
     onLoadMore()
   }
   return (
-    <View>
-      <Text onPress={handlePress} style={styles.footer} color={theme['c-font-label']}>{t(label)}</Text>
-    </View>
+    label
+      ? (
+          <View>
+            <Text onPress={handlePress} style={styles.footer} color={theme['c-font-label']}>{t(label)}</Text>
+          </View>
+        )
+      : null
   )
 }