Merge pull request '完善空间功能；完善MyModal组件；部分统一卡片填充色' (#5) from zone into main

Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/tiefen_space_app/pulls/5

app.json

@@ -21,8 +21,8 @@
       "supportsTablet": true,
       "bundleIdentifier": "com.jueweijue.ironfans",
       "infoPlist": {
-        "NSPhotoLibraryUsageDescription": "允许铁粉空间访问您的相册",
+        "NSPhotoLibraryUsageDescription": "当您授权允许访问相册后，您能够在APP中浏览相册中的图片，以便您选择合适的图片进行上传，用于头像或其他位置",
-        "NSPhotoLibraryAddUsageDescription": "允许铁粉空间保存图片到相册"
+        "NSPhotoLibraryAddUsageDescription": "当您授权允许保存图片到相册后，您能够将APP内容保存到本地，以便您稍后在相册中继续查看"
       }
     },
     "android": {
@@ -52,8 +52,8 @@
       [
         "expo-media-library",
         {
-          "photosPermission": "允许铁粉空间访问您的相册，以便您选择合适的图片进行上传",
+          "photosPermission": "当您授权允许访问相册后，您能够在APP中浏览相册中的图片，以便您选择合适的图片进行上传，用于头像或其他位置",
-          "savePhotosPermission": "允许铁粉空间保存图片到相册，以便您稍后在相册中继续查看",
+          "savePhotosPermission": "当您授权允许保存图片到相册后，您能够将APP内容保存到本地，以便您稍后在相册中继续查看",
           "isAccessMediaLocationEnabled": true
         }
       ],

components/CreatePostModal/index.jsx

@@ -73,7 +73,7 @@ export default function CreatePostModal({ visible, setVisible }) {
         <TouchableOpacity
           activeOpacity={1}
           style={tailwind(
-            "flex flex-col mt-auto mb-2 h-48 bg-[#17171A] rounded-3xl"
+            "flex flex-col mt-auto mb-2 h-48 bg-[#17161A] rounded-3xl"
           )}
         >
           <View

components/GetWechatModal/index.jsx

@@ -10,9 +10,6 @@ import baseRequest from "../../utils/baseRequest";
 import Toast from "react-native-toast-message";
 import { generateSignature } from "../../utils/crypto";
 
-//todo:每次回来重新获取数据刷新余额、如果是本人则直接展示微信
-//todo:等待接口上线，完善样式，测试
-
 export default function GetWechatModal({ visible, setVisible, streamerMid }) {
   const tailwind = useTailwind();
   const blurhash = "LcKUTa%gOYWBYRt6xuoJo~s8V@fk";

components/MediaPickerModal/index.jsx

@@ -54,7 +54,13 @@ export default function MediaPickerModal({
           setPermissionStatus("granted");
           return;
         }
-        setRequestModalVisible(true);
+        if (status === "undetermined") {
+          setRequestModalVisible(true);
+          return;
+        }
+        if (status === "denied") {
+          requestMediaLibraryPermissions();
+        }
       }
       checkMediaLibraryPermissions();
     }
@@ -276,9 +282,9 @@ export default function MediaPickerModal({
               video: ImagePickerVideo,
             }}
             onSave={async (assets) => {
-              setVisible(false);
               const editedAssets = await changeToLocalUri(assets);
               setAssets(editedAssets);
+              setVisible(false);
             }}
             onCancel={() => {
               setVisible(false);
@@ -300,20 +306,18 @@ export default function MediaPickerModal({
         title="权限申请"
         content="该功能需要开启存储权限，用于选择上传媒体文件"
         confirmText="继续"
-        cancel={() => {
+        custom={() => {
-          setRequestModalVisible(false);
-        }}
-        confirm={() => {
           setRequestModalVisible(false);
           requestMediaLibraryPermissions();
         }}
+        customText="继续"
       />
       <MyModal
         visible={overlayVisible}
         setVisible={setOverlayVisible}
-        title="您还未打开媒体权限"
+        title="未获得相册权限"
-        content="是否前往设置开启权限？"
+        content="请先前往设置打开相关权限后重试"
-        confirmText="继续"
+        confirmText="去设置"
         cancel={() => {
           setOverlayVisible(false);
         }}

components/MyModal/index.jsx

@@ -8,8 +8,11 @@ export default function MyModal({
   title,
   content,
   confirm,
+  custom,
+  customText,
   confirmText,
   cancelText,
+  confirmLeft = false,
 }) {
   const tailwind = useTailwind();
   return (
@@ -41,32 +44,77 @@ export default function MyModal({
             {content}
           </Text>
           <View style={tailwind("flex-row justify-around")}>
-            <TouchableOpacity
+            {custom ? (
-              onPress={() => setVisible(false)}
+              <TouchableOpacity
-              style={tailwind(
+                onPress={custom}
-                "border-r-2 border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center"
-              )}
-            >
-              <Text
                 style={tailwind(
-                  "text-[#FFFFFF80] text-base font-medium text-center"
+                  "border-t-2 border-[#2c2b2f] w-full pt-1 justify-center items-center"
                 )}
               >
-                {cancelText ? cancelText : "取消"}
+                <Text
-              </Text>
+                  style={tailwind(
-            </TouchableOpacity>
+                    "text-white text-base font-medium text-center"
-            <TouchableOpacity
+                  )}
-              onPress={confirm}
+                >
-              style={tailwind(
+                  {customText ? customText : "确认"}
-                "border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center"
+                </Text>
-              )}
+              </TouchableOpacity>
-            >
+            ) : (
-              <Text
+              <>
-                style={tailwind("text-white text-base font-medium text-center")}
+                {confirmLeft && (
-              >
+                  <TouchableOpacity
-                {confirmText ? confirmText : "确认"}
+                    onPress={confirm}
-              </Text>
+                    style={tailwind(
-            </TouchableOpacity>
+                      "border-r-2 border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center"
+                    )}
+                  >
+                    <Text
+                      style={tailwind(
+                        "text-white text-base font-medium text-center"
+                      )}
+                    >
+                      {confirmText ? confirmText : "确认"}
+                    </Text>
+                  </TouchableOpacity>
+                )}
+                <TouchableOpacity
+                  onPress={() => setVisible(false)}
+                  style={
+                    confirmLeft
+                      ? tailwind(
+                          "border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center"
+                        )
+                      : tailwind(
+                          "border-r-2 border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center"
+                        )
+                  }
+                >
+                  <Text
+                    style={tailwind(
+                      "text-[#FFFFFF80] text-base font-medium text-center"
+                    )}
+                  >
+                    {cancelText ? cancelText : "取消"}
+                  </Text>
+                </TouchableOpacity>
+                {!confirmLeft && (
+                  <TouchableOpacity
+                    onPress={confirm}
+                    style={tailwind(
+                      "border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center"
+                    )}
+                  >
+                    <Text
+                      style={tailwind(
+                        "text-white text-base font-medium text-center"
+                      )}
+                    >
+                      {confirmText ? confirmText : "确认"}
+                    </Text>
+                  </TouchableOpacity>
+                )}
+              </>
+            )}
           </View>
         </View>
       </View>

components/SpacePost/index.jsx

@@ -285,7 +285,11 @@ export default function SpacePost({ data }) {
                         ...tailwind("text-sm font-medium"),
                       }}
                     >
-                      {data.is_ironfan_visible === 1 ? "铁粉" : "超粉"}免费查看
+                      {data.is_ironfan_visible === 1
+                        ? "铁粉免费查看"
+                        : data.is_superfanship_enabled === 1
+                        ? "超粉免费查看"
+                        : "付费解锁"}
                     </Text>
                     <Icon
                       type="ionicon"

screeens/CreateImagePost/index.jsx

@@ -19,7 +19,6 @@ import baseRequest from "../../utils/baseRequest";
 import { generateSignature } from "../../utils/crypto";
 import MyModal from "../../components/MyModal";
 
-//todo:使用更新后的MyModal组件，禁止关闭弹窗
 export default function CreateImagePost({ navigation, route }) {
   const tailwind = useTailwind();
   const insets = useSafeAreaInsets();
@@ -250,16 +249,14 @@ export default function CreateImagePost({ navigation, route }) {
         setVisible={setIsBlockModalVisible}
         title="当前无法发帖"
         content="您当前审核未通过动态过多，请修改后再试"
-        cancel={() => {
+        custom={() => {
-          setIsBlockModalVisible(false);
-        }}
-        confirm={() => {
           setIsBlockModalVisible(false);
           setTimeout(
             () => navigation.replace("VisibleToOneselfSpacePosts"),
             500
           );
         }}
+        customText="去修改"
       />
       <View style={tailwind("p-4")}>
         <View style={tailwind("mb-4")}>
@@ -335,7 +332,7 @@ export default function CreateImagePost({ navigation, route }) {
                 style={{
                   gap: 8,
                   ...tailwind(
-                    "flex flex-col mt-auto mb-2 bg-[#17171A] rounded-3xl"
+                    "flex flex-col mt-auto mb-2 bg-[#17161A] rounded-3xl"
                   ),
                 }}
               >

screeens/CreateVideoPost/index.jsx

@@ -19,7 +19,6 @@ import baseRequest from "../../utils/baseRequest";
 import { generateSignature } from "../../utils/crypto";
 import MyModal from "../../components/MyModal";
 
-//todo:使用更新后的MyModal组件，禁止关闭弹窗
 export default function CreateVideoPost({ navigation, route }) {
   const tailwind = useTailwind();
   const insets = useSafeAreaInsets();
@@ -226,16 +225,14 @@ export default function CreateVideoPost({ navigation, route }) {
         setVisible={setIsBlockModalVisible}
         title="当前无法发帖"
         content="您当前审核未通过动态过多，请修改后再试"
-        cancel={() => {
+        custom={() => {
-          setIsBlockModalVisible(false);
-        }}
-        confirm={() => {
           setIsBlockModalVisible(false);
           setTimeout(
             () => navigation.replace("VisibleToOneselfSpacePosts"),
             500
           );
         }}
+        customText="去修改"
       />
       <View style={tailwind("p-4")}>
         <View style={tailwind("mb-4")}>
@@ -311,7 +308,7 @@ export default function CreateVideoPost({ navigation, route }) {
                 style={{
                   gap: 8,
                   ...tailwind(
-                    "flex flex-col mt-auto mb-2 bg-[#17171A] rounded-3xl"
+                    "flex flex-col mt-auto mb-2 bg-[#17161A] rounded-3xl"
                   ),
                 }}
               >

screeens/SpaceSetting/AgencySetting/index.jsx

@@ -367,7 +367,7 @@ export default function AgencySetting({ navigation, route }) {
               style={{
                 gap: 12,
                 ...tailwind(
-                  "flex flex-col w-full bg-[#17171A] rounded-3xl px-4 py-6"
+                  "flex flex-col w-full bg-[#17161A] rounded-3xl px-4 py-6"
                 ),
               }}
             >

screeens/SpaceSetting/CollaboratorSetting/index.jsx

@@ -350,24 +350,49 @@ export default function CollaboratorSetting({ navigation, route }) {
       (item) => item.collaborator_mid === selfMid
     );
     return (
-      <View
+      <ScrollView
         style={{
-          gap: 8,
+          paddingBottom: insets.bottom,
-          ...tailwind(
+          paddingLeft: insets.left,
-            "flex flex-col border border-2 border-[#2c2b2f] rounded-2xl p-4 w-full mt-6"
+          paddingRight: insets.right,
-          ),
+          ...tailwind("flex-1"),
         }}
       >
-        <Text style={tailwind("text-white text-base font-medium")}>
+        <View style={tailwind("px-4")}>
-          合伙人昵称：{selfData.collaborator_account.name}
+          <View
-        </Text>
+            style={{
-        <Text style={tailwind("text-white text-base font-medium")}>
+              gap: 8,
-          ID：{selfData.collaborator_account.user_id}
+              ...tailwind(
-        </Text>
+                "flex flex-col border border-2 border-[#2c2b2f] rounded-2xl p-4 w-full mt-6"
-        <Text style={tailwind("text-white text-base font-medium")}>
+              ),
-          分成比例：{data.sharing_ratio * 100}%
+            }}
-        </Text>
+          >
-      </View>
+            <Text style={tailwind("text-white text-base font-medium")}>
+              合伙人昵称：{selfData[0]?.collaborator_account?.name}
+            </Text>
+            <Text style={tailwind("text-white text-base font-medium")}>
+              ID：{selfData[0]?.collaborator_account?.user_id}
+            </Text>
+            <Text style={tailwind("text-white text-base font-medium")}>
+              分成比例：{selfData[0]?.sharing_ratio * 100}%
+            </Text>
+          </View>
+          <View style={tailwind("mt-8")}>
+            <Text style={tailwind("text-[#FFFFFF80] text-base font-medium")}>
+              注意事项：
+            </Text>
+            <Text style={tailwind("text-[#FFFFFF80] text-sm")}>
+              1、总分成比例由当前空间主人设置，您的个人分成比例由代运营进行设置；
+            </Text>
+            <Text style={tailwind("text-[#FFFFFF80] text-sm")}>
+              2、您的个人收益计算公式为：空间收益x个人分成比例=个人收益，收益将以钻石形式发放至您的钱包；
+            </Text>
+            <Text style={tailwind("text-[#FFFFFF80] text-sm")}>
+              3、若您对收益情况存在任何疑问，请联系人工客服。
+            </Text>
+          </View>
+        </View>
+      </ScrollView>
     );
   }
 
@@ -451,7 +476,7 @@ export default function CollaboratorSetting({ navigation, route }) {
               style={{
                 gap: 12,
                 ...tailwind(
-                  "flex flex-col w-full bg-[#17171A] rounded-3xl px-4 py-6"
+                  "flex flex-col w-full bg-[#17161A] rounded-3xl px-4 py-6"
                 ),
               }}
             >

screeens/SpaceSetting/SelectSpaceSettingItem/index.jsx

@@ -16,7 +16,6 @@ import baseRequest from "../../../utils/baseRequest";
 import { generateSignature } from "../../../utils/crypto";
 import Toast from "react-native-toast-message";
 
-//todo:修改MyModal组件，让确认按钮摆在左边
 export default function SelectSpaceSettingItem({ navigation, route, data }) {
   const blurhash = "LcKUTa%gOYWBYRt6xuoJo~s8V@fk";
 
@@ -211,6 +210,7 @@ export default function SelectSpaceSettingItem({ navigation, route, data }) {
           setIsExitSpaceModalVisible(false);
           handleExitSpace();
         }}
+        confirmLeft
       />
     </View>
   );