.env

@@ -1,4 +1,4 @@
-EXPO_PUBLIC_API_URL=https://api.tiefen.fun
+EXPO_PUBLIC_API_URL=https://api.tiefen.space
 EXPO_PUBLIC_RSA_KEY=-----BEGIN PUBLIC KEY-----MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXPIjKV6CMi5O9tIXJWNIfnqXjqOZ1KmRByRAP073DU+gzMLygzEsrztJzbz/K/Julkz6XhheZ8vdz+boAl1HsCAwEAAQ==-----END PUBLIC KEY-----
-EXPO_PUBLIC_WEB_URL=https://tiefen.fun
+EXPO_PUBLIC_WEB_URL=https://tiefen.space
 EXPO_PUBLIC_WEBSOCKET_URL=wss://wsdebug.tiefen.fun

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "铁粉空间",
     "slug": "ironfans",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {
@@ -19,7 +19,7 @@
     ],
     "ios": {
       "supportsTablet": true,
-      "bundleIdentifier": "com.lanxing.ironfans",
+      "bundleIdentifier": "com.wangyue.ironfans",
       "infoPlist": {
         "NSPhotoLibraryUsageDescription": "当您授权允许访问相册后，您能够在APP中浏览相册中的图片，以便您选择合适的图片进行上传，用于头像或其他位置",
         "NSPhotoLibraryAddUsageDescription": "当您授权允许保存图片到相册后，您能够将APP内容保存到本地，以便您稍后在相册中继续查看"

components/ImageViewer/index.jsx

@@ -19,8 +19,10 @@ import MyModal from "../MyModal";
 import { Image } from "expo-image";
 import { Button } from "@rneui/themed";
 import { LinearGradient } from "expo-linear-gradient";
+import { generateSignature } from "../../utils/crypto";
+import baseRequest from "../../utils/baseRequest";
 
-//imageUrls      [{ url: string }]
+//imageUrls      [{ url: string , id: int }]  网络图片需要查看原图时才传id，其他情况不用
 //index          int
 //lockedStartIndex    int
 //onPressUnlockBtn  () => void
@@ -33,6 +35,7 @@ export function ImageViewer({
   index,
   lockedStartIndex,
   onPressUnlockBtn,
+  setImageViewerProps,
 }) {
   const tailwind = useTailwind();
   const insets = useSafeAreaInsets();
@@ -57,76 +60,6 @@ export function ImageViewer({
     return false;
   }, []);
 
-  const MenusComponent = useCallback(
-    ({ cancel, saveToLocal }) => (
-      <Modal
-        visible={true}
-        transparent={true}
-        statusBarTranslucent
-        animationType="fade"
-      >
-        <TouchableOpacity
-          onPress={cancel}
-          activeOpacity={1}
-          style={tailwind("flex flex-1 bg-[#00000080]")}
-        >
-          <TouchableOpacity
-            activeOpacity={1}
-            style={{
-              paddingBottom: insets.bottom,
-              paddingLeft: insets.left,
-              paddingRight: insets.right,
-              ...tailwind(
-                "absolute bottom-0 left-0 h-32 w-full bg-[#13121F] rounded-t-2xl"
-              ),
-            }}
-          >
-            <View style={tailwind("flex flex-1 flex-row items-center px-4")}>
-              <TouchableOpacity
-                onPress={async () => {
-                  const isVip = await checkRole();
-                  if (isVip) {
-                    saveToLocal();
-                    return;
-                  }
-                  closeImageViewer();
-                  navigation.navigate("WebWithoutHeader", {
-                    uri: process.env.EXPO_PUBLIC_WEB_URL + "/vip",
-                  });
-                }}
-                style={tailwind("flex flex-col items-center px-4")}
-              >
-                <Icon type="ionicon" name="image" size={30} color="white" />
-                <Text
-                  style={tailwind("text-sm text-[#FFFFFF80] font-medium mt-1")}
-                >
-                  保存(会员特权)
-                </Text>
-              </TouchableOpacity>
-              <TouchableOpacity
-                onPress={cancel}
-                style={tailwind("flex flex-col items-center px-4")}
-              >
-                <Icon
-                  type="ionicon"
-                  name="close-circle"
-                  size={30}
-                  color="white"
-                />
-                <Text
-                  style={tailwind("text-sm text-[#FFFFFF80] font-medium mt-1")}
-                >
-                  取消
-                </Text>
-              </TouchableOpacity>
-            </View>
-          </TouchableOpacity>
-        </TouchableOpacity>
-      </Modal>
-    ),
-    []
-  );
-
   const [isVipModalVisible, setIsVipModalVisible] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
   const hanldSaveImage = async (index) => {
@@ -141,6 +74,62 @@ export function ImageViewer({
     setIsSaving(false);
   };
 
+  //查看原图
+  const [isLoading, setIsLoading] = useState(false);
+  const handleCheckOriginalImage = async (index) => {
+    const isVip = await checkRole();
+    if (!isVip) {
+      setIsVipModalVisible(true);
+      return;
+    }
+    setIsLoading(true);
+    const apiUrl = process.env.EXPO_PUBLIC_API_URL;
+    try {
+      const base = await baseRequest();
+      const body = {
+        image_id: imageUrls[index].id,
+        ...base,
+      };
+      const signature = await generateSignature(body);
+      const _response = await fetch(
+        `${apiUrl}/api/previews/original_image?signature=${signature}`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(body),
+        }
+      );
+      const _data = await _response.json();
+      if (_data.ret === -1) {
+        Toast.show({
+          type: "error",
+          text1: _data.msg,
+          topOffset: 60,
+        });
+        return;
+      }
+      setImageViewerProps((prev) => {
+        let newImageViewerProps = prev;
+        newImageViewerProps.imageUrls[index] = {
+          id: imageUrls[index].id,
+          url: _data?.data?.urls[0],
+        };
+        return { ...newImageViewerProps };
+      });
+      Toast.show({
+        type: "success",
+        text1: "已切换至原图",
+        topOffset: 60,
+      });
+    } catch (error) {
+      console.error(error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
   return (
     <Modal visible={isVisible} statusBarTranslucent transparent={true}>
       <OriginImageViewer
@@ -189,32 +178,65 @@ export function ImageViewer({
           return <Image {...props} />;
         }}
         renderFooter={(index) => (
-          <TouchableOpacity
-            onPress={() => hanldSaveImage(index)}
-            style={{
-              marginLeft: 20,
-              marginBottom: insets.bottom,
-              ...tailwind(
-                "flex justify-center items-center w-12 h-12 bg-[#FFFFFF1A] rounded-full"
-              ),
-            }}
-          >
-            {isSaving && <ActivityIndicator size="small" />}
-            {!isSaving && (
-              <Icon
-                type="ionicon"
-                name="save-outline"
-                size={20}
-                color="white"
-              />
+          <View style={tailwind("flex flex-row items-center")}>
+            <TouchableOpacity
+              onPress={() => hanldSaveImage(index)}
+              style={{
+                marginLeft: 20,
+                marginBottom: insets.bottom,
+                ...tailwind(
+                  "flex justify-center items-center w-14 h-14 bg-[#FFFFFF1A] rounded-full"
+                ),
+              }}
+            >
+              {isSaving && <ActivityIndicator size="small" />}
+              {!isSaving && (
+                <Icon
+                  type="ionicon"
+                  name="save-outline"
+                  size={20}
+                  color="white"
+                />
+              )}
+              <Text
+                style={tailwind("text-xs text-[#FFFFFF80] font-medium mt-1")}
+              >
+                保存
+              </Text>
+            </TouchableOpacity>
+            {imageUrls[index]?.id && (
+              <TouchableOpacity
+                onPress={() => handleCheckOriginalImage(index)}
+                style={{
+                  marginLeft: 20,
+                  marginBottom: insets.bottom,
+                  ...tailwind(
+                    "flex justify-center items-center w-14 h-14 bg-[#FFFFFF1A] rounded-full"
+                  ),
+                }}
+              >
+                {isLoading && <ActivityIndicator size="small" />}
+                {!isLoading && (
+                  <Icon
+                    type="ionicon"
+                    name="image-outline"
+                    size={20}
+                    color="white"
+                  />
+                )}
+                <Text
+                  style={tailwind("text-xs text-[#FFFFFF80] font-medium mt-1")}
+                >
+                  原图
+                </Text>
+              </TouchableOpacity>
             )}
-          </TouchableOpacity>
+          </View>
         )}
         onSave={(url) => {
           saveImage(url);
         }}
-        saveToLocalByLongPress
-        menus={MenusComponent}
+        saveToLocalByLongPress={false}
         loadingRender={() => <ActivityIndicator size="large" />}
       />
       <Toast />
@@ -222,7 +244,7 @@ export function ImageViewer({
         visible={isVipModalVisible}
         setVisible={setIsVipModalVisible}
         title="是否开通会员？"
-        content="会员可无限制保存图片/视频，一次开通永久有效。"
+        content="会员可无限制保存图片、查看原图，一次开通永久有效。"
         cancel={() => {
           setIsVipModalVisible(false);
         }}

components/Post/index.jsx

@@ -257,9 +257,8 @@ export default function Post({ data }) {
 
 //媒体为图片时展示内容的组件
 function ImageDisplay({ media }) {
-  const navigation = useNavigation();
   const tailwind = useTailwind();
-  const images = media.map((item) => ({ url: item.urls[0] }));
+  const images = media.map((item) => ({ url: item.urls[0], id: item.id }));
 
   const { showImageViewer } = useImageViewer();
 

components/SpacePost/index.jsx

@@ -608,7 +608,7 @@ function ImageDisplay({
 
   const { showImageViewer } = useImageViewer();
   const images = displayMedia.map((item) => {
-    return { url: item?.urls[0] };
+    return { url: item?.urls[0], id: item?.id };
   });
 
   const [isCollapsed, setIsCollapsed] = useState(true);

context/ImageViewProvider.jsx

@@ -28,6 +28,7 @@ export const ImageViewerProvider = ({ children }) => {
           {...imageViewerProps}
           onClose={closeImageViewer}
           onChange={changeImageViewerIndex}
+          setImageViewerProps={setImageViewerProps}
         />
       )}
     </ImageViewerContext.Provider>

eas.json

@@ -8,9 +8,9 @@
       "distribution": "internal",
       "channel": "development",
       "env": {
-        "EXPO_PUBLIC_API_URL": "https://api.tiefen.fun",
+        "EXPO_PUBLIC_API_URL": "https://api.tiefen.space",
         "EXPO_PUBLIC_RSA_KEY": "-----BEGIN PUBLIC KEY-----MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXPIjKV6CMi5O9tIXJWNIfnqXjqOZ1KmRByRAP073DU+gzMLygzEsrztJzbz/K/Julkz6XhheZ8vdz+boAl1HsCAwEAAQ==-----END PUBLIC KEY-----",
-        "EXPO_PUBLIC_WEB_URL": "https://tiefen.fun"
+        "EXPO_PUBLIC_WEB_URL": "https://tiefen.space"
       }
     },
     "preview": {
@@ -20,9 +20,9 @@
       "distribution": "internal",
       "channel": "preview",
       "env": {
-        "EXPO_PUBLIC_API_URL": "https://api.tiefen.fun",
+        "EXPO_PUBLIC_API_URL": "https://api.tiefen.space",
         "EXPO_PUBLIC_RSA_KEY": "-----BEGIN PUBLIC KEY-----MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXPIjKV6CMi5O9tIXJWNIfnqXjqOZ1KmRByRAP073DU+gzMLygzEsrztJzbz/K/Julkz6XhheZ8vdz+boAl1HsCAwEAAQ==-----END PUBLIC KEY-----",
-        "EXPO_PUBLIC_WEB_URL": "https://tiefen.fun"
+        "EXPO_PUBLIC_WEB_URL": "https://tiefen.space"
       }
     },
     "production": {
@@ -31,9 +31,9 @@
       },
       "channel": "production",
       "env": {
-        "EXPO_PUBLIC_API_URL": "https://api.tiefen.fun",
+        "EXPO_PUBLIC_API_URL": "https://api.tiefen.space",
         "EXPO_PUBLIC_RSA_KEY": "-----BEGIN PUBLIC KEY-----MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMXPIjKV6CMi5O9tIXJWNIfnqXjqOZ1KmRByRAP073DU+gzMLygzEsrztJzbz/K/Julkz6XhheZ8vdz+boAl1HsCAwEAAQ==-----END PUBLIC KEY-----",
-        "EXPO_PUBLIC_WEB_URL": "https://tiefen.fun"
+        "EXPO_PUBLIC_WEB_URL": "https://tiefen.space"
       }
     }
   },

screeens/Setting/DeleteAccount/index.jsx

@@ -1,5 +1,5 @@
 import { View, Text, ScrollView } from "react-native";
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useContext } from "react";
 import { useTailwind } from "tailwind-rn";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Button } from "@rneui/themed";
@@ -7,6 +7,7 @@ import MyModal from "../../../components/MyModal";
 import Toast from "react-native-toast-message";
 import baseRequest from "../../../utils/baseRequest";
 import { generateSignature } from "../../../utils/crypto";
+import { AuthContext } from "../../../App";
 
 export default function DeleteAccount({ navigation, route }) {
   const tailwind = useTailwind();
@@ -17,6 +18,8 @@ export default function DeleteAccount({ navigation, route }) {
 
   const apiUrl = process.env.EXPO_PUBLIC_API_URL;
 
+  const { signOut } = useContext(AuthContext);
+
   //查询用户是否在注销中
   const checkAccountStatus = async () => {
     try {
@@ -82,10 +85,12 @@ export default function DeleteAccount({ navigation, route }) {
         });
         return;
       }
-      checkAccountStatus();
-      setIsModalVisible(false);
+      await checkAccountStatus();
+      signOut();
     } catch (error) {
       console.error(error);
+    } finally {
+      setIsModalVisible(false);
     }
   };
 
@@ -196,7 +201,9 @@ export default function DeleteAccount({ navigation, route }) {
         visible={isModalVisible}
         setVisible={setIsModalVisible}
         title={"您确认要注销此账号吗？"}
-        content={"注销后无法恢复，请仔细阅读《注销必看须知》后确认。"}
+        content={
+          "提交注销后，我们将在7个自然日后完全清除您的账号信息，在此期间若您再次登陆则视为放弃注销。请仔细阅读《注销必看须知》后确认。"
+        }
         confirm={handleDeleteAccount}
         confirmLeft
         highlightCancel

screeens/ShareSpace/index.jsx

@@ -1,11 +1,13 @@
 import { View, Text, TouchableOpacity, ScrollView } from "react-native";
-import React from "react";
+import React, { useState, useEffect } from "react";
 import { useTailwind } from "tailwind-rn";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import Toast from "react-native-toast-message";
 import MyDivider from "../../components/MyDivider";
 import { Icon } from "@rneui/themed";
 import * as Clipboard from "expo-clipboard";
+import baseRequest from "../../utils/baseRequest";
+import { generateSignature } from "../../utils/crypto";
 
 export default function ShareSpace({ navigation, route }) {
   const tailwind = useTailwind();
@@ -14,6 +16,38 @@ export default function ShareSpace({ navigation, route }) {
   const data = route.params.data;
   const webUrl = process.env.EXPO_PUBLIC_WEB_URL;
 
+  const [shareRedirectUrl, setShareRedirectUrl] = useState("");
+  useEffect(() => {
+    const getShareRedirectUrl = async () => {
+      const apiUrl = process.env.EXPO_PUBLIC_API_URL;
+      try {
+        const base = await baseRequest();
+        const body = {
+          ...base,
+        };
+        const signature = await generateSignature(body);
+        const _response = await fetch(
+          `${apiUrl}/api/config/cold_config?signature=${signature}`,
+          {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+            },
+            body: JSON.stringify(body),
+          }
+        );
+        const _data = await _response.json();
+        if (_data.ret === -1) {
+          return;
+        }
+        setShareRedirectUrl(_data.data.share_redirect_url);
+      } catch (error) {
+        console.error(error);
+      }
+    };
+    getShareRedirectUrl();
+  }, []);
+
   //保存内容到剪贴板
   const copy = async (_data) => {
     await Clipboard.setStringAsync(_data);
@@ -32,7 +66,7 @@ export default function ShareSpace({ navigation, route }) {
 
   //复制邀请链接
   const copyShareUrl = async () => {
-    const shareCode = `${webUrl}/zone/${data?.streamer_ext?.user_id}`;
+    const shareCode = `${shareRedirectUrl}/zone/${data?.streamer_ext?.user_id}`;
     await copy(shareCode);
   };
 

screeens/SpaceIntroduce/index.jsx

@@ -20,6 +20,7 @@ import SpaceIntroduceSkeleton from "./skeleton";
 import { usePreventScreenCapture } from "expo-screen-capture";
 import { useFocusEffect } from "@react-navigation/native";
 import { useImageViewer } from "../../context/ImageViewProvider";
+import MyModal from "../../components/MyModal";
 
 export default function SpaceIntroduce({ navigation, route }) {
   usePreventScreenCapture();
@@ -29,6 +30,8 @@ export default function SpaceIntroduce({ navigation, route }) {
 
   const { showImageViewer } = useImageViewer();
 
+  const [isWarnModalVisible, setIsWarnModalVisible] = useState(false);
+
   const [data, setData] = useState({});
   const [isLoading, setIsloading] = useState(true);
   const getData = async () => {
@@ -84,9 +87,8 @@ export default function SpaceIntroduce({ navigation, route }) {
   const images = data?.streamer_ext?.album?.images
     ?.slice(0, 5)
     ?.map((image) => {
-      return image?.urls[0];
+      return { url: image?.urls[0], id: image?.id };
     });
-  const imagesForImageViewer = images?.map((url) => ({ url }));
 
   //当空间价格为0时，直接加入空间
   const handleJoinFreeSpace = async () => {
@@ -285,7 +287,7 @@ export default function SpaceIntroduce({ navigation, route }) {
                   activeOpacity={1}
                   onPress={() => {
                     showImageViewer({
-                      imageUrls: imagesForImageViewer,
+                      imageUrls: images,
                       index: index,
                     });
                   }}
@@ -345,14 +347,7 @@ export default function SpaceIntroduce({ navigation, route }) {
             onPress={
               data?.admission_price === 0
                 ? handleJoinFreeSpace
-                : () =>
-                    navigation.navigate("WebWithoutHeader", {
-                      uri:
-                        process.env.EXPO_PUBLIC_WEB_URL +
-                        "/zone/pay/" +
-                        data?.id +
-                        "/h5_zone_admission/0",
-                    })
+                : () => setIsWarnModalVisible(true)
             }
             style={tailwind(
               "flex flex-row items-center justify-center h-12 rounded-full px-10 bg-[#FF669E]"
@@ -393,6 +388,26 @@ export default function SpaceIntroduce({ navigation, route }) {
         setVisible={setShowVideo}
         url={data?.streamer_ext?.shorts?.videos[0]?.urls[0]}
       />
+      {/* 加入空间风险提示Modal */}
+      <MyModal
+        visible={isWarnModalVisible}
+        setVisible={setIsWarnModalVisible}
+        title="提醒"
+        content="本空间内容为达人创建并维护，属于虚拟服务，不可退款，请再次确认是否付费加入"
+        cancel={() => {
+          setIsWarnModalVisible(false);
+        }}
+        confirm={() => {
+          setIsWarnModalVisible(false);
+          navigation.navigate("WebWithoutHeader", {
+            uri:
+              process.env.EXPO_PUBLIC_WEB_URL +
+              "/zone/pay/" +
+              data?.id +
+              "/h5_zone_admission/0",
+          });
+        }}
+      />
     </View>
   );
 }

screeens/StreamerProfile/index.jsx

@@ -245,8 +245,10 @@ export default function StreamerProfile({ navigation, route }) {
 
     const { showImageViewer } = useImageViewer();
 
-    const images = data?.album?.images?.map((image) => image?.urls[0]);
-    const imagesForImageViewer = images?.map((url) => ({ url }));
+    const images = data?.album?.images?.map((image) => ({
+      url: image?.urls[0],
+      id: image?.id,
+    }));
     return (
       <>
         <Swiper
@@ -297,7 +299,7 @@ export default function StreamerProfile({ navigation, route }) {
                     <TouchableWithoutFeedback
                       onPress={() => {
                         showImageViewer({
-                          imageUrls: imagesForImageViewer,
+                          imageUrls: images,
                           index: index - 1,
                         });
                       }}

screeens/StreamerSpace/index.jsx

@@ -215,6 +215,42 @@ export default function StreamerSpace({ navigation, route }) {
   //bottom sheet组件相关
   const snapPoints = useMemo(() => ["73%", "100%"], []);
 
+  //刷新铁粉身份（解决主播降价导致的进度满100但未成为铁粉）
+  const handleFansIdentityRefresh = async () => {
+    const apiUrl = process.env.EXPO_PUBLIC_API_URL;
+    try {
+      const base = await baseRequest();
+      const body = {
+        zid: data?.id,
+        ...base,
+      };
+      const signature = await generateSignature(body);
+      const _response = await fetch(
+        `${apiUrl}/api/zone_moment/fans_identity_refresh?signature=${signature}`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(body),
+        }
+      );
+      const _data = await _response.json();
+      if (_data.ret === -1) {
+        Toast.show({
+          type: "error",
+          text1: _data.msg,
+          topOffset: 60,
+        });
+        return;
+      }
+      await getData();
+      setIsIronFanModalVisible(false);
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
   //成为铁粉Modal组件
   const [isIronFanModalVisible, setIsIronFanModalVisible] = useState(false);
   const ironFanProgress = useMemo(
@@ -283,6 +319,15 @@ export default function StreamerSpace({ navigation, route }) {
             >
               查看铁粉专享内容
             </Button>
+            <Text
+              onPress={handleFansIdentityRefresh}
+              style={{
+                textDecorationLine: "underline",
+                ...tailwind("text-sm font-medium text-[#FF669E] mt-2"),
+              }}
+            >
+              进度已满但还未成为铁粉？
+            </Text>
           </TouchableOpacity>
         </TouchableOpacity>
       </Modal>