From 0f54d89f5d6ca96def4a53d92170a57335ae360c Mon Sep 17 00:00:00 2001
From: czy0729 <402731062@qq.com>
Date: Sun, 5 Nov 2023 13:40:29 +0800
Subject: [PATCH] - fixed

---
 app.json                                         |  4 ++--
 packages/android/package.json                    |  3 +--
 packages/ios/package.json                        |  3 ++-
 src/screens/discovery/tags/header/index.tsx      | 10 ++++++----
 src/screens/discovery/tags/rec-segment/index.tsx | 11 ++++-------
 src/screens/home/typerank/header/index.tsx       |  1 +
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app.json b/app.json
index 4aa42fc03..8e66d3469 100755
--- a/app.json
+++ b/app.json
@@ -1,9 +1,9 @@
 {
   "expo": {
     "description": "A React Native App for https://bgm.tv, tinygrail plugin 4.5.1",
-    "version": "8.3.0",
+    "version": "8.3.1",
     "android": {
-      "versionCode": 83000,
+      "versionCode": 83010,
       "package": "com.czy0729.bangumi",
       "adaptiveIcon": {
         "foregroundImage": "./src/assets/images/foreground.png",
diff --git a/packages/android/package.json b/packages/android/package.json
index be21144b4..e62f92444 100644
--- a/packages/android/package.json
+++ b/packages/android/package.json
@@ -11,7 +11,6 @@
     "k": "sudo purge",
     "clean": "cd android && ./gradlew clean",
     "build": "cd android && ./gradlew assembleRelease && cd .. && node web/rename.js",
-    "clean": "cd android && ./gradlew clean",
     "open": "open ./android/app/build/outputs/apk/release/",
     "open:win": "start .\\android\\app\\build\\outputs\\apk\\release\\"
   },
@@ -70,7 +69,7 @@
     "react-native-exception-handler": "^2.10.10",
     "react-native-fast-image": "^8.6.3",
     "react-native-fs": "^2.20.0",
-    "react-native-gesture-handler": "^2.12.0",
+    "react-native-gesture-handler": "2.13.4",
     "react-native-hold-menu": "0.1.1",
     "react-native-image-zoom-viewer": "2.2.26",
     "react-native-modal-popover": "0.0.12",
diff --git a/packages/ios/package.json b/packages/ios/package.json
index 6b504b985..4b74c8311 100755
--- a/packages/ios/package.json
+++ b/packages/ios/package.json
@@ -14,7 +14,8 @@
     "top": "top -s 4 -o rsize",
     "mv": "sudo yarn k && mv ios ios_ && mv android android_",
     "pub": "sudo expo publish",
-    "re": "sudo mv ios_ ios && mv android_ android && yarn k"
+    "re": "sudo mv ios_ ios && mv android_ android && yarn k",
+    "open:win": "start .\\android\\app\\build\\outputs\\apk\\release\\"
   },
   "resolutions": {
     "@types/react": "17.0.2",
diff --git a/src/screens/discovery/tags/header/index.tsx b/src/screens/discovery/tags/header/index.tsx
index e35d0d5a5..a1cc18254 100644
--- a/src/screens/discovery/tags/header/index.tsx
+++ b/src/screens/discovery/tags/header/index.tsx
@@ -5,7 +5,7 @@
  * @Last Modified time: 2023-11-04 15:39:13
  */
 import React from 'react'
-import { Header as CompHeader, Heatmap } from '@components'
+import { Flex, Header as CompHeader, Heatmap } from '@components'
 import { getSPAParams, open } from '@utils'
 import { t } from '@utils/fetch'
 import { obc } from '@utils/decorators'
@@ -19,14 +19,16 @@ const DATA = [TEXT_BROWSER]
 if (!STORYBOOK) DATA.push(TEXT_SPA)
 
 function Header(props, { $ }: Ctx) {
+  const { rec } = $.state
   return (
     <CompHeader
       title='标签'
       alias='标签索引'
       hm={[$.url, 'Tags']}
+      headerTitleAlign='left'
       headerRight={() => (
-        <>
-          <RecSegement />
+        <Flex>
+          <RecSegement value={rec} onValueChange={$.onValueChange} />
           <CompHeader.Popover
             data={DATA}
             onSelect={key => {
@@ -44,7 +46,7 @@ function Header(props, { $ }: Ctx) {
           >
             <Heatmap id='标签索引.右上角菜单' />
           </CompHeader.Popover>
-        </>
+        </Flex>
       )}
     />
   )
diff --git a/src/screens/discovery/tags/rec-segment/index.tsx b/src/screens/discovery/tags/rec-segment/index.tsx
index 522ce15f6..2657e6191 100755
--- a/src/screens/discovery/tags/rec-segment/index.tsx
+++ b/src/screens/discovery/tags/rec-segment/index.tsx
@@ -6,23 +6,20 @@
  */
 import React from 'react'
 import { SegmentedControl } from '@components'
-import { obc } from '@utils/decorators'
 import { styles } from './styles'
-import { Ctx } from '../types'
 
 const DS = ['数量', '排名'] as const
 
-function RecSegement(props, { $ }: Ctx) {
-  const { rec } = $.state
+function RecSegement({ value, onValueChange }) {
   return (
     <SegmentedControl
       style={styles.segment}
       size={11}
       values={DS}
-      selectedIndex={rec ? 1 : 0}
-      onValueChange={$.onValueChange}
+      selectedIndex={value ? 1 : 0}
+      onValueChange={onValueChange}
     />
   )
 }
 
-export default obc(RecSegement)
+export default RecSegement
diff --git a/src/screens/home/typerank/header/index.tsx b/src/screens/home/typerank/header/index.tsx
index eb0ca506c..b7f2c039a 100644
--- a/src/screens/home/typerank/header/index.tsx
+++ b/src/screens/home/typerank/header/index.tsx
@@ -18,6 +18,7 @@ function Header(props, { $ }: Ctx) {
         $.tag
       } (${$.ids.length})`}
       hm={['typerank', 'Typerank']}
+      headerTitleAlign='left'
     />
   )
 }