From b85999a68b8fe120e626bb0c0517067c4d1c9a9b Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Mon, 8 Jan 2024 02:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=92=8C=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=87=BA4=E4=B8=AA=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8D=A1=E7=89=87=E6=B8=B2=E6=9F=93=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=9B=E7=9B=B8=E5=86=8C=E8=87=B3=E5=B0=912=E5=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/StreamerCard/index.jsx             | 36 ++++++++++---------
 screeens/EditStreamerProfile/index.jsx        | 14 ++++++--
 screeens/Stream/FeedStream/index.jsx          |  4 +--
 screeens/Stream/FollowStream/index.jsx        | 14 ++++----
 .../StreamerVerificationForm/index.jsx        | 12 ++++++-
 5 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/components/StreamerCard/index.jsx b/components/StreamerCard/index.jsx
index fe55bc7..7684a8c 100644
--- a/components/StreamerCard/index.jsx
+++ b/components/StreamerCard/index.jsx
@@ -4,7 +4,7 @@ import {
   TouchableOpacity,
   Image as NativeImage,
 } from "react-native";
-import React, { memo, useContext } from "react";
+import React, { memo, useContext, useMemo } from "react";
 import { useTailwind } from "tailwind-rn";
 import { Image } from "expo-image";
 import { Video, ResizeMode } from "expo-av";
@@ -17,6 +17,8 @@ function StreamerCard({ data, screen }) {
   const showVideo = useContext(
     screen === "feed" ? FeedShowVideoContext : SameCityShowVideoContext
   );
+  const isPlaying = useMemo(() => showVideo.includes(data?.mid), [showVideo]);
+
   const tailwind = useTailwind();
   const blurhash = "LcKUTa%gOYWBYRt6xuoJo~s8V@fk";
 
@@ -56,7 +58,7 @@ function StreamerCard({ data, screen }) {
                   ),
                 }}
               >
-                {data?.gender === 0 ? (
+                {data?.gender === 1 ? (
                   <NativeImage
                     source={require("../../assets/icon/12DP/female.png")}
                   />
@@ -107,21 +109,23 @@ function StreamerCard({ data, screen }) {
               transition={1000}
               placeholder={blurhash}
               cachePolicy="disk"
-              style={tailwind("w-full h-full z-0")}
+              style={
+                isPlaying
+                  ? tailwind("w-full h-full z-0 absolute")
+                  : tailwind("w-full h-full z-20 absolute")
+              }
+            />
+            <Video
+              style={tailwind("z-10 w-full h-full")}
+              isLooping
+              shouldPlay={isPlaying}
+              isMuted
+              useNativeControls={false}
+              source={{
+                uri: data?.shorts?.videos[0]?.urls[0],
+              }}
+              resizeMode={ResizeMode.COVER}
             />
-            {showVideo.includes(data?.mid) && (
-              <Video
-                style={tailwind("z-10 absolute w-full h-full")}
-                isLooping
-                shouldPlay
-                isMuted
-                useNativeControls={false}
-                source={{
-                  uri: data?.shorts?.videos[0]?.urls[0],
-                }}
-                resizeMode={ResizeMode.COVER}
-              />
-            )}
           </View>
           <View style={tailwind("flex-col flex-1 ml-1")}>
             {data?.album?.images.map((item, index) => {
diff --git a/screeens/EditStreamerProfile/index.jsx b/screeens/EditStreamerProfile/index.jsx
index 42a728b..0b10bc4 100644
--- a/screeens/EditStreamerProfile/index.jsx
+++ b/screeens/EditStreamerProfile/index.jsx
@@ -365,7 +365,7 @@ export default function EditStreamerProfile({ navigation, route }) {
             if (photos.length === 0 && oldPhotos.length === 0) {
               Toast.show({
                 type: "error",
-                text1: "请确保相册中至少有一张图片",
+                text1: "请确保相册中至少有2张图片",
                 topOffset: 60,
               });
               return;
@@ -383,6 +383,16 @@ export default function EditStreamerProfile({ navigation, route }) {
             const album = {
               image_ids: [...oldPhotosIds, ...newPhotosIds?.image_ids],
             };
+            //相册不得低于2张
+            if (album.image_ids.length < 2) {
+              Toast.show({
+                type: "error",
+                text1: "相册至少需要上传2张照片哦！",
+                topOffset: 60,
+              });
+              setIsSubmitting(false);
+              return;
+            }
             //相册不得超过9张
             if (album.image_ids.length > 9) {
               Toast.show({
@@ -804,7 +814,7 @@ export default function EditStreamerProfile({ navigation, route }) {
                     <Text
                       style={tailwind("text-xs text-[#FFFFFF80] font-medium")}
                     >
-                      将在“主页”展示（最多9张）
+                      将在“主页”展示（2～9张）
                     </Text>
                   </View>
                   <View style={tailwind("flex-row flex-wrap")}>
diff --git a/screeens/Stream/FeedStream/index.jsx b/screeens/Stream/FeedStream/index.jsx
index 990e179..5ca12d3 100644
--- a/screeens/Stream/FeedStream/index.jsx
+++ b/screeens/Stream/FeedStream/index.jsx
@@ -60,7 +60,7 @@ export default function FeedStream() {
   //查询的起始索引
   const [startIndex, setStartIndex] = useState(0);
   // 定义每次取多少个用户ID
-  const batchSize = 10;
+  const batchSize = 4;
   //获取新数据
   const [data, setData] = useState([]);
   const [isEnd, setIsEnd] = useState(true);
@@ -188,7 +188,7 @@ export default function FeedStream() {
           data={data}
           renderItem={renderItem}
           estimatedItemSize={352}
-          initialNumToRender={10}
+          initialNumToRender={4}
           refreshControl={
             <RefreshControl
               colors={["#FF669E"]}
diff --git a/screeens/Stream/FollowStream/index.jsx b/screeens/Stream/FollowStream/index.jsx
index 0adb0bf..e662183 100644
--- a/screeens/Stream/FollowStream/index.jsx
+++ b/screeens/Stream/FollowStream/index.jsx
@@ -21,8 +21,8 @@ export default function FollowStream() {
       const account = await get("account");
       const signature = await generateSignature({
         mid: account.mid,
-        offset: offset,
-        limit: 10,
+        offset: 0,
+        limit: 100,
         ...base,
       });
       //查关注mid
@@ -35,8 +35,8 @@ export default function FollowStream() {
           },
           body: JSON.stringify({
             mid: account.mid,
-            offset: offset,
-            limit: 10,
+            offset: 0,
+            limit: 100,
             ...base,
           }),
         }
@@ -70,7 +70,7 @@ export default function FollowStream() {
       const signature = await generateSignature({
         mids: followMids,
         offset: offset,
-        limit: 10,
+        limit: 4,
         ...base,
       });
       //查关注主播展示资料
@@ -84,7 +84,7 @@ export default function FollowStream() {
           body: JSON.stringify({
             mids: followMids,
             offset: offset,
-            limit: 10,
+            limit: 4,
             ...base,
           }),
         }
@@ -145,7 +145,7 @@ export default function FollowStream() {
           data={data}
           renderItem={renderItem}
           estimatedItemSize={352}
-          initialNumToRender={10}
+          initialNumToRender={4}
           refreshControl={
             <RefreshControl
               colors={["#FF669E"]}
diff --git a/screeens/StreamerVerification/StreamerVerificationForm/index.jsx b/screeens/StreamerVerification/StreamerVerificationForm/index.jsx
index 020b4fa..cdf4ddd 100644
--- a/screeens/StreamerVerification/StreamerVerificationForm/index.jsx
+++ b/screeens/StreamerVerification/StreamerVerificationForm/index.jsx
@@ -298,6 +298,16 @@ export default function StreamerVerificationForm({ navigation, route }) {
                 text1: "上传失败，请联系客服进行上传",
                 topOffset: 60,
               });
+              setIsSubmitting(false);
+              return;
+            }
+            if (album.image_ids.length < 2) {
+              Toast.show({
+                type: "error",
+                text1: "相册至少需要上传2张照片哦！",
+                topOffset: 60,
+              });
+              setIsSubmitting(false);
               return;
             }
 
@@ -818,7 +828,7 @@ export default function StreamerVerificationForm({ navigation, route }) {
                     <Text
                       style={tailwind("text-xs text-[#FFFFFF80] font-medium")}
                     >
-                      将在“主页”展示（最多9张）
+                      将在“主页”展示（2～9张）
                     </Text>
                   </View>
                   <MediaPicker