anln_0000001_2.1 #34
3
.env
3
.env
|
|
@ -1,4 +1,5 @@
|
|||
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.space
|
||||
EXPO_PUBLIC_WEBSOCKET_URL=wss://ws.tiefen.space
|
||||
EXPO_PUBLIC_WEBSOCKET_URL=wss://ws.tiefen.space
|
||||
EXPO_PUBLIC_WEB_ASSETS_URL=https://levianderwinv01.tiefen.space/web_app_public
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 100 KiB |
|
|
@ -67,6 +67,7 @@
|
|||
"react-native-gesture-handler": "~2.16.1",
|
||||
"react-native-gifted-chat": "^2.4.0",
|
||||
"react-native-image-zoom-viewer": "^3.0.1",
|
||||
"react-native-modal": "^13.0.1",
|
||||
"react-native-pager-view": "6.3.0",
|
||||
"react-native-parsed-text": "^0.0.22",
|
||||
"react-native-picker-select": "^8.1.0",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { View, Text, TextInput } from "react-native";
|
||||
import { View, Text, TextInput, TouchableOpacity } from "react-native";
|
||||
import React, { useState, useContext, useEffect } from "react";
|
||||
import { useTailwind } from "tailwind-rn";
|
||||
import { Button, CheckBox } from "@rneui/themed";
|
||||
|
|
@ -11,6 +11,9 @@ import MyDivider from "../../../components/MyDivider";
|
|||
import baseRequest from "../../../utils/baseRequest";
|
||||
import { get, save, storeAppInfo } from "../../../utils/storeInfo";
|
||||
import MyModal from "../../../components/MyModal";
|
||||
import Modal from "react-native-modal";
|
||||
import { WebView } from "react-native-webview";
|
||||
import { Icon } from "@rneui/themed";
|
||||
export default function PasswordLogin() {
|
||||
const { signIn, checked, setChecked } = useContext(AuthContext);
|
||||
const navigation = useNavigation();
|
||||
|
|
@ -24,7 +27,41 @@ export default function PasswordLogin() {
|
|||
const [mobilePhone, setMobilePhone] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [isModalVisible, setIsModalVisible] = useState(false);
|
||||
|
||||
//协议Modal是否展示
|
||||
const [popVisible, setPopVisible] = useState({
|
||||
visible: false,
|
||||
data: {
|
||||
title: "",
|
||||
uri: "",
|
||||
},
|
||||
});
|
||||
//设置cookies
|
||||
const [cookies, setCookies] = useState();
|
||||
const setCookieScript = `
|
||||
document.cookie = "b_mid=${cookies?.b_mid} ;";
|
||||
document.cookie = "b_did=${cookies?.b_did} ;";
|
||||
document.cookie = "b_ver=${cookies?.b_ver} ;";
|
||||
document.cookie = "b_dt=${cookies?.b_dt} ;";
|
||||
document.cookie = "b_model=${cookies?.b_model} ;";
|
||||
document.cookie = "b_nt=${cookies?.b_nt} ;";
|
||||
document.cookie = "b_token=${cookies?.b_token} ;";
|
||||
true;
|
||||
`;
|
||||
useEffect(() => {
|
||||
async function getCookies() {
|
||||
const base = await baseRequest();
|
||||
setCookies({
|
||||
b_mid: base.b_mid,
|
||||
b_did: base.b_did,
|
||||
b_ver: base.b_ver,
|
||||
b_dt: base.b_dt,
|
||||
b_model: base.b_model,
|
||||
b_nt: base.b_nt,
|
||||
b_token: base.b_token,
|
||||
});
|
||||
}
|
||||
getCookies();
|
||||
}, []);
|
||||
//获取之前缓存的用户的手机号
|
||||
useEffect(() => {
|
||||
async function getMobilePhone() {
|
||||
|
|
@ -193,24 +230,30 @@ export default function PasswordLogin() {
|
|||
<Text style={tailwind("text-[#FFFFFF80] font-medium text-xs")}>
|
||||
我已阅读并同意
|
||||
<Text
|
||||
onPress={() =>
|
||||
navigation.navigate("WebWithHeader", {
|
||||
title: "用户协议",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/useragreement`,
|
||||
})
|
||||
}
|
||||
onPress={() => {
|
||||
setPopVisible({
|
||||
visible: true,
|
||||
data: {
|
||||
title: "用户协议",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/useragreement`,
|
||||
},
|
||||
});
|
||||
}}
|
||||
style={tailwind("text-[#FF669E] text-xs")}
|
||||
>
|
||||
《用户协议》
|
||||
</Text>
|
||||
、
|
||||
<Text
|
||||
onPress={() =>
|
||||
navigation.navigate("WebWithHeader", {
|
||||
title: "隐私政策",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/privatypolicy`,
|
||||
})
|
||||
}
|
||||
onPress={() => {
|
||||
setPopVisible({
|
||||
visible: true,
|
||||
data: {
|
||||
title: "隐私政策",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/privatypolicy`,
|
||||
},
|
||||
});
|
||||
}}
|
||||
style={tailwind("text-[#FF669E] text-xs")}
|
||||
>
|
||||
《隐私政策》
|
||||
|
|
@ -232,7 +275,40 @@ export default function PasswordLogin() {
|
|||
visible={isModalVisible}
|
||||
setVisible={setIsModalVisible}
|
||||
title="登录提示"
|
||||
content="为了更好保障你的合法权益，请阅读和同意《用户协议》和《隐私政策》。"
|
||||
content={
|
||||
<Text style={tailwind("text-[#FFFFFF80] font-medium text-base")}>
|
||||
为了更好保障你的合法权益，请阅读和同意
|
||||
<Text
|
||||
onPress={() => {
|
||||
setPopVisible({
|
||||
visible: true,
|
||||
data: {
|
||||
title: "用户协议",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/useragreement`,
|
||||
},
|
||||
});
|
||||
}}
|
||||
style={tailwind("text-[#FF669E] text-base")}
|
||||
>
|
||||
《用户协议》
|
||||
</Text>
|
||||
、
|
||||
<Text
|
||||
onPress={() => {
|
||||
setPopVisible({
|
||||
visible: true,
|
||||
data: {
|
||||
title: "隐私政策",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/privatypolicy`,
|
||||
},
|
||||
});
|
||||
}}
|
||||
style={tailwind("text-[#FF669E] text-base")}
|
||||
>
|
||||
《隐私政策》
|
||||
</Text>
|
||||
</Text>
|
||||
}
|
||||
cancel={() => {
|
||||
setIsModalVisible(false);
|
||||
}}
|
||||
|
|
@ -242,6 +318,92 @@ export default function PasswordLogin() {
|
|||
handleSubmit();
|
||||
}}
|
||||
/>
|
||||
{/* 协议通知弹窗 */}
|
||||
{popVisible.visible && (
|
||||
<Modal
|
||||
isVisible={popVisible.visible}
|
||||
// swipeDirection={["down"]}
|
||||
onBackdropPress={() =>
|
||||
setPopVisible({
|
||||
visible: false,
|
||||
data: {
|
||||
title: "",
|
||||
uri: "",
|
||||
},
|
||||
})
|
||||
}
|
||||
animationInTiming={500} // 打开动画时长
|
||||
animationOutTiming={1000} // 关闭动画时长
|
||||
animationIn="bounceInUp" // 打开动画类型
|
||||
animationOut="bounceInDown" // 关闭动画类型
|
||||
// scrollHorizontal={true}
|
||||
style={{
|
||||
height: 120,
|
||||
paddingBottom: 0,
|
||||
borderTopLeftRadius: 15,
|
||||
borderTopRightRadius: 15,
|
||||
margin: 0,
|
||||
justifyContent: "flex-end",
|
||||
}}
|
||||
>
|
||||
<View style={tailwind("flex flex-row items-center h-12")}>
|
||||
<Icon
|
||||
type="ionicon"
|
||||
name="chevron-back"
|
||||
size={32}
|
||||
color="white"
|
||||
onPress={() =>
|
||||
setPopVisible({
|
||||
visible: false,
|
||||
data: {
|
||||
title: "",
|
||||
uri: "",
|
||||
},
|
||||
})
|
||||
}
|
||||
/>
|
||||
<Text style={tailwind("text-base font-medium text-white")}>
|
||||
{popVisible.data.title}
|
||||
</Text>
|
||||
</View>
|
||||
<View
|
||||
style={{
|
||||
...tailwind("w-full"),
|
||||
backgroundColor: "#17161A",
|
||||
paddingBottom: 20,
|
||||
height: 620,
|
||||
}}
|
||||
>
|
||||
<WebView
|
||||
incognito
|
||||
source={{
|
||||
uri: popVisible.data.uri,
|
||||
}}
|
||||
userAgent="FromWebview"
|
||||
// onMessage={async (event) => {
|
||||
// const msg = JSON.parse(event.nativeEvent.data);
|
||||
// if (msg.type === "SAVE_IMAGE") {
|
||||
// saveImage(msg.data);
|
||||
// } else if (msg.type === "COPY_URL") {
|
||||
// copy(msg.data);
|
||||
// } else if (msg.type === "NAVIGATE") {
|
||||
// navigation.navigate(msg.data.page, { ...msg.data.params });
|
||||
// } else if (msg.type === "OPEN_BROWSER") {
|
||||
// openBrowser(msg.data);
|
||||
// }
|
||||
// }}
|
||||
injectedJavaScript={setCookieScript}
|
||||
originWhitelist={[
|
||||
"https://*",
|
||||
"http://*",
|
||||
"alipays://*",
|
||||
"alipay://*",
|
||||
"weixin://*",
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Modal>
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,10 @@ import MyDivider from "../../../components/MyDivider";
|
|||
import baseRequest from "../../../utils/baseRequest";
|
||||
import { get, save, storeAppInfo } from "../../../utils/storeInfo";
|
||||
import { generateSignature } from "../../../utils/crypto";
|
||||
|
||||
import Modal from "react-native-modal";
|
||||
import { WebView } from "react-native-webview";
|
||||
import { Icon } from "@rneui/themed";
|
||||
import MyModal from "../../../components/MyModal";
|
||||
export default function PhoneNumLogin() {
|
||||
const { signIn, inviterCode, checked, setChecked } = useContext(AuthContext);
|
||||
const navigation = useNavigation();
|
||||
|
|
@ -25,7 +28,42 @@ export default function PhoneNumLogin() {
|
|||
const [regionCode, setRegionCode] = useState("86");
|
||||
const [mobilePhone, setMobilePhone] = useState("");
|
||||
const [veriCode, setVeriCode] = useState("");
|
||||
|
||||
//协议Modal是否展示
|
||||
const [popVisible, setPopVisible] = useState({
|
||||
visible: false,
|
||||
data: {
|
||||
title: "",
|
||||
uri: "",
|
||||
},
|
||||
});
|
||||
//设置cookies
|
||||
const [cookies, setCookies] = useState();
|
||||
const [isModalVisible, setIsModalVisible] = useState(false);
|
||||
const setCookieScript = `
|
||||
document.cookie = "b_mid=${cookies?.b_mid} ;";
|
||||
document.cookie = "b_did=${cookies?.b_did} ;";
|
||||
document.cookie = "b_ver=${cookies?.b_ver} ;";
|
||||
document.cookie = "b_dt=${cookies?.b_dt} ;";
|
||||
document.cookie = "b_model=${cookies?.b_model} ;";
|
||||
document.cookie = "b_nt=${cookies?.b_nt} ;";
|
||||
document.cookie = "b_token=${cookies?.b_token} ;";
|
||||
true;
|
||||
`;
|
||||
useEffect(() => {
|
||||
async function getCookies() {
|
||||
const base = await baseRequest();
|
||||
setCookies({
|
||||
b_mid: base.b_mid,
|
||||
b_did: base.b_did,
|
||||
b_ver: base.b_ver,
|
||||
b_dt: base.b_dt,
|
||||
b_model: base.b_model,
|
||||
b_nt: base.b_nt,
|
||||
b_token: base.b_token,
|
||||
});
|
||||
}
|
||||
getCookies();
|
||||
}, []);
|
||||
//获取之前缓存的用户的手机号
|
||||
useEffect(() => {
|
||||
async function getMobilePhone() {
|
||||
|
|
@ -101,30 +139,14 @@ export default function PhoneNumLogin() {
|
|||
|
||||
//点击登录
|
||||
const handleSubmit = async () => {
|
||||
if (!checked) {
|
||||
Toast.show({
|
||||
type: "error",
|
||||
text1: "请先阅读并同意《用户协议》和《隐私政策》后登录",
|
||||
topOffset: 60,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!mobilePhone.match(/^1[3456789]\d{9}$/)) {
|
||||
Toast.show({
|
||||
type: "error",
|
||||
text1: "手机号码格式错误",
|
||||
topOffset: 60,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!veriCode) {
|
||||
Toast.show({
|
||||
type: "error",
|
||||
text1: "请输入验证码",
|
||||
topOffset: 60,
|
||||
});
|
||||
return;
|
||||
}
|
||||
// if (!checked) {
|
||||
// Toast.show({
|
||||
// type: "error",
|
||||
// text1: "请先阅读并同意《用户协议》和《隐私政策》后登录",
|
||||
// topOffset: 60,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
//重新获取设备和app信息
|
||||
await storeAppInfo();
|
||||
//对手机号进行RSA加密
|
||||
|
|
@ -194,6 +216,31 @@ export default function PhoneNumLogin() {
|
|||
console.error(error);
|
||||
}
|
||||
};
|
||||
//点击登录
|
||||
const handleCheck = async () => {
|
||||
if (!mobilePhone.match(/^1[3456789]\d{9}$/)) {
|
||||
Toast.show({
|
||||
type: "error",
|
||||
text1: "手机号码格式错误",
|
||||
topOffset: 60,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!veriCode) {
|
||||
Toast.show({
|
||||
type: "error",
|
||||
text1: "请输入验证码",
|
||||
topOffset: 60,
|
||||
});
|
||||
return;
|
||||
}
|
||||
//验证数据格式
|
||||
if (!checked) {
|
||||
setIsModalVisible(true);
|
||||
return;
|
||||
}
|
||||
handleSubmit();
|
||||
};
|
||||
return (
|
||||
<View style={tailwind("mt-14 flex-1 flex-col")}>
|
||||
<View style={tailwind("flex px-10 justify-center")}>
|
||||
|
|
@ -259,24 +306,30 @@ export default function PhoneNumLogin() {
|
|||
<Text style={tailwind("text-[#FFFFFF80] font-medium text-xs")}>
|
||||
我已阅读并同意
|
||||
<Text
|
||||
onPress={() =>
|
||||
navigation.navigate("WebWithHeader", {
|
||||
title: "用户协议",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/useragreement`,
|
||||
})
|
||||
}
|
||||
onPress={() => {
|
||||
setPopVisible({
|
||||
visible: true,
|
||||
data: {
|
||||
title: "用户协议",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/useragreement`,
|
||||
},
|
||||
});
|
||||
}}
|
||||
style={tailwind("text-[#FF669E] text-xs")}
|
||||
>
|
||||
《用户协议》
|
||||
</Text>
|
||||
、
|
||||
<Text
|
||||
onPress={() =>
|
||||
navigation.navigate("WebWithHeader", {
|
||||
title: "隐私政策",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/privatypolicy`,
|
||||
})
|
||||
}
|
||||
onPress={() => {
|
||||
setPopVisible({
|
||||
visible: true,
|
||||
data: {
|
||||
title: "隐私政策",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/privatypolicy`,
|
||||
},
|
||||
});
|
||||
}}
|
||||
style={tailwind("text-[#FF669E] text-xs")}
|
||||
>
|
||||
《隐私政策》
|
||||
|
|
@ -287,13 +340,146 @@ export default function PhoneNumLogin() {
|
|||
color="#FF669E"
|
||||
radius="999"
|
||||
size="md"
|
||||
onPress={handleSubmit}
|
||||
onPress={handleCheck}
|
||||
titleStyle={tailwind("text-base font-medium")}
|
||||
containerStyle={tailwind("mt-2")}
|
||||
>
|
||||
登录
|
||||
</Button>
|
||||
</View>
|
||||
<MyModal
|
||||
visible={isModalVisible}
|
||||
setVisible={setIsModalVisible}
|
||||
title="登录提示"
|
||||
content={
|
||||
<Text style={tailwind("text-[#FFFFFF80] font-medium text-base")}>
|
||||
为了更好保障你的合法权益，请阅读和同意
|
||||
<Text
|
||||
onPress={() => {
|
||||
setPopVisible({
|
||||
visible: true,
|
||||
data: {
|
||||
title: "用户协议",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/useragreement`,
|
||||
},
|
||||
});
|
||||
}}
|
||||
style={tailwind("text-[#FF669E] text-base")}
|
||||
>
|
||||
《用户协议》
|
||||
</Text>
|
||||
、
|
||||
<Text
|
||||
onPress={() => {
|
||||
setPopVisible({
|
||||
visible: true,
|
||||
data: {
|
||||
title: "隐私政策",
|
||||
uri: `${process.env.EXPO_PUBLIC_WEB_URL}/doc/privatypolicy`,
|
||||
},
|
||||
});
|
||||
}}
|
||||
style={tailwind("text-[#FF669E] text-base")}
|
||||
>
|
||||
《隐私政策》
|
||||
</Text>
|
||||
</Text>
|
||||
}
|
||||
cancel={() => {
|
||||
setIsModalVisible(false);
|
||||
}}
|
||||
confirm={() => {
|
||||
setIsModalVisible(false);
|
||||
toggleCheckbox();
|
||||
handleSubmit();
|
||||
}}
|
||||
/>
|
||||
{/* 协议通知弹窗 */}
|
||||
{popVisible.visible && (
|
||||
<Modal
|
||||
isVisible={popVisible.visible}
|
||||
// swipeDirection={["down"]}
|
||||
onBackdropPress={() =>
|
||||
setPopVisible({
|
||||
visible: false,
|
||||
data: {
|
||||
title: "",
|
||||
uri: "",
|
||||
},
|
||||
})
|
||||
}
|
||||
animationInTiming={500} // 打开动画时长
|
||||
animationOutTiming={1000} // 关闭动画时长
|
||||
animationIn="bounceInUp" // 打开动画类型
|
||||
animationOut="bounceInDown" // 关闭动画类型
|
||||
// scrollHorizontal={true}
|
||||
style={{
|
||||
height: 120,
|
||||
paddingBottom: 0,
|
||||
borderTopLeftRadius: 15,
|
||||
borderTopRightRadius: 15,
|
||||
margin: 0,
|
||||
justifyContent: "flex-end",
|
||||
}}
|
||||
>
|
||||
<View style={tailwind("flex flex-row items-center h-12")}>
|
||||
<Icon
|
||||
type="ionicon"
|
||||
name="chevron-back"
|
||||
size={32}
|
||||
color="white"
|
||||
onPress={() =>
|
||||
setPopVisible({
|
||||
visible: false,
|
||||
data: {
|
||||
title: "",
|
||||
uri: "",
|
||||
},
|
||||
})
|
||||
}
|
||||
/>
|
||||
<Text style={tailwind("text-base font-medium text-white")}>
|
||||
{popVisible.data.title}
|
||||
</Text>
|
||||
</View>
|
||||
<View
|
||||
style={{
|
||||
...tailwind("w-full"),
|
||||
backgroundColor: "#17161A",
|
||||
paddingBottom: 20,
|
||||
height: 620,
|
||||
}}
|
||||
>
|
||||
<WebView
|
||||
incognito
|
||||
source={{
|
||||
uri: popVisible.data.uri,
|
||||
}}
|
||||
userAgent="FromWebview"
|
||||
// onMessage={async (event) => {
|
||||
// const msg = JSON.parse(event.nativeEvent.data);
|
||||
// if (msg.type === "SAVE_IMAGE") {
|
||||
// saveImage(msg.data);
|
||||
// } else if (msg.type === "COPY_URL") {
|
||||
// copy(msg.data);
|
||||
// } else if (msg.type === "NAVIGATE") {
|
||||
// navigation.navigate(msg.data.page, { ...msg.data.params });
|
||||
// } else if (msg.type === "OPEN_BROWSER") {
|
||||
// openBrowser(msg.data);
|
||||
// }
|
||||
// }}
|
||||
injectedJavaScript={setCookieScript}
|
||||
originWhitelist={[
|
||||
"https://*",
|
||||
"http://*",
|
||||
"alipays://*",
|
||||
"alipay://*",
|
||||
"weixin://*",
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Modal>
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
import { View, Text } from "react-native";
|
||||
import React, { useState, useCallback, useEffect } from "react";
|
||||
import {
|
||||
GestureHandlerRootView,
|
||||
TouchableOpacity,
|
||||
} from "react-native-gesture-handler";
|
||||
export default function AutoAnswerBtn({ onSend, text }) {
|
||||
return (
|
||||
<TouchableOpacity
|
||||
onPress={() => {
|
||||
// console.log("log", item);
|
||||
onSend([{ text }]);
|
||||
}}
|
||||
style={{
|
||||
// ...tailwind("border rounded text-center px-4 py-1"),
|
||||
backgroundColor: "#3333331A",
|
||||
// borderWidth: 1,
|
||||
// borderColor: "black",
|
||||
borderRadius: 10,
|
||||
padding: 6,
|
||||
}}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
paddingHorizontal: 10,
|
||||
// height: 60,
|
||||
overflow: "hidden",
|
||||
}}
|
||||
>
|
||||
<Text>{text}</Text>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,113 @@
|
|||
import { View, Text } from "react-native";
|
||||
import React, { useState, useCallback, useEffect } from "react";
|
||||
import { Bubble } from "react-native-gifted-chat";
|
||||
import { useTailwind } from "tailwind-rn";
|
||||
import "dayjs/locale/zh-cn";
|
||||
import {
|
||||
GestureHandlerRootView,
|
||||
TouchableOpacity,
|
||||
} from "react-native-gesture-handler";
|
||||
import AutoAnswerBtn from "../AutoAnswerBtn";
|
||||
export default function OwnBubble({
|
||||
navigation,
|
||||
route,
|
||||
onSend,
|
||||
currentMessage,
|
||||
...props
|
||||
}) {
|
||||
const tailwind = useTailwind();
|
||||
const [currentHeight, setCurrentHeight] = useState(null);
|
||||
return (
|
||||
<Bubble
|
||||
{...props}
|
||||
height={currentHeight}
|
||||
wrapperStyle={{
|
||||
left: {
|
||||
...tailwind("bg-white p-1"),
|
||||
minHeight: currentHeight,
|
||||
// width: 100,
|
||||
flexShrink: 1,
|
||||
flexGrow: 0,
|
||||
// position: "relative", // 避免 absolute
|
||||
overflow: "hidden", // 允许内容溢出
|
||||
// justifyContent: "center",
|
||||
// height: "auto",
|
||||
},
|
||||
right: {
|
||||
...tailwind("p-1"),
|
||||
// minHeight: currentHeight,
|
||||
},
|
||||
}}
|
||||
currentMessage={{
|
||||
...currentMessage,
|
||||
text:
|
||||
currentMessage.mType === 1 ? (
|
||||
<View
|
||||
style={{ flexShrink: 1 }} // 防止内容被挤压
|
||||
onLayout={(event) => {
|
||||
const { height } = event.nativeEvent.layout;
|
||||
// 如果内容高度超过最小高度，动态更新气泡高度（可选）
|
||||
console.log("气泡高度:", height, currentMessage._id);
|
||||
// 设置气泡的高度
|
||||
// props.onLayout({ height });
|
||||
setCurrentHeight((prev) => height);
|
||||
// currentOwnHeight = height;
|
||||
// 动态设置气泡的高度
|
||||
}}
|
||||
>
|
||||
{/* <Text>{currentMessage.text}</Text> */}
|
||||
<AutoMessage
|
||||
{...props}
|
||||
message={currentMessage.text}
|
||||
messageData={currentMessage}
|
||||
mType={currentMessage.mType}
|
||||
height={currentHeight}
|
||||
onSend={onSend}
|
||||
/>
|
||||
</View>
|
||||
) : (
|
||||
currentMessage.text
|
||||
),
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
const AutoMessage = ({
|
||||
message = "",
|
||||
mType,
|
||||
height,
|
||||
currentMessage,
|
||||
|
||||
...props
|
||||
}) => {
|
||||
console.log("data", height);
|
||||
const tailwind = useTailwind();
|
||||
const test = message.split("|");
|
||||
const btns = test[1].split(",");
|
||||
return (
|
||||
<View
|
||||
{...props}
|
||||
style={{ marginTop: height, paddingVertical: 10, width: 200 }}
|
||||
>
|
||||
<View style={{ marginTop: 10 }}>
|
||||
<Text style={{ fontSize: 16 }}>{test[0]}</Text>
|
||||
</View>
|
||||
{/* <br /> */}
|
||||
<View style={{ marginTop: 10 }}>
|
||||
<Text>触发按钮：</Text>
|
||||
</View>
|
||||
<View
|
||||
style={{
|
||||
...tailwind("flex-row flex-wrap mt-2"),
|
||||
gap: 8,
|
||||
}}
|
||||
>
|
||||
{btns.map((item, index) => {
|
||||
return <AutoAnswerBtn key={index} text={item} {...props} />;
|
||||
})}
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
|
||||
// data.m_type===1?it?.text.split("|")it?.text
|
||||
};
|
||||
|
|
@ -5,7 +5,6 @@ import {
|
|||
Send,
|
||||
InputToolbar,
|
||||
Composer,
|
||||
Bubble,
|
||||
Day,
|
||||
LoadEarlier,
|
||||
} from "react-native-gifted-chat";
|
||||
|
|
@ -17,6 +16,8 @@ import { Image } from "expo-image";
|
|||
import { get } from "../../../utils/storeInfo";
|
||||
import Toast from "react-native-toast-message";
|
||||
import requireAPI from "../../../utils/requireAPI";
|
||||
import { GestureHandlerRootView } from "react-native-gesture-handler";
|
||||
import OwnBubble from "./components/OwnBubble";
|
||||
const blurhash = "LcKUTa%gOYWBYRt6xuoJo~s8V@fk";
|
||||
|
||||
/*
|
||||
|
|
@ -25,13 +26,12 @@ params格式：
|
|||
mid: item.mid,
|
||||
}
|
||||
*/
|
||||
|
||||
export default function MessageDetail({ navigation, route }) {
|
||||
const tailwind = useTailwind();
|
||||
const insets = useSafeAreaInsets();
|
||||
const params = route.params;
|
||||
const [messages, setMessages] = useState([]);
|
||||
|
||||
const [currentHeight, setCurrentHeight] = useState(null);
|
||||
//获取本地自身数据
|
||||
const [selfData, setSelfData] = useState({});
|
||||
useEffect(() => {
|
||||
|
|
@ -68,12 +68,12 @@ export default function MessageDetail({ navigation, route }) {
|
|||
return;
|
||||
}
|
||||
navigation.setOptions({
|
||||
title: detailData.data.streamer_ext.name,
|
||||
title: _data.data.streamer_ext.name,
|
||||
});
|
||||
await sendAutoMessages(
|
||||
detailData.data.streamer_ext?.name,
|
||||
detailData.data.streamer_ext?.avatar?.images[0]?.urls[0],
|
||||
detailData.data.streamer_ext?.auto_response_message
|
||||
_data.data.streamer_ext?.name,
|
||||
_data.data.streamer_ext?.avatar?.images[0]?.urls[0],
|
||||
_data.data.streamer_ext?.auto_response_message
|
||||
);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
|
|
@ -95,6 +95,7 @@ export default function MessageDetail({ navigation, route }) {
|
|||
_id: 1,
|
||||
text: content,
|
||||
createdAt: new Date(),
|
||||
|
||||
user: {
|
||||
_id: 1,
|
||||
name: name,
|
||||
|
|
@ -205,6 +206,7 @@ export default function MessageDetail({ navigation, route }) {
|
|||
_id: item.id,
|
||||
createdAt: new Date(item.ct * 1000).toISOString(),
|
||||
text: item.message,
|
||||
mType: item.m_type,
|
||||
user: {
|
||||
_id: account?.mid,
|
||||
name: account?.name,
|
||||
|
|
@ -216,6 +218,7 @@ export default function MessageDetail({ navigation, route }) {
|
|||
_id: item.id,
|
||||
createdAt: new Date(item.ct * 1000).toISOString(),
|
||||
text: item.message,
|
||||
mType: item.m_type,
|
||||
user: {
|
||||
_id: 0,
|
||||
name: "客服",
|
||||
|
|
@ -257,6 +260,7 @@ export default function MessageDetail({ navigation, route }) {
|
|||
_id: item.id,
|
||||
createdAt: new Date(item.ct * 1000).toISOString(),
|
||||
text: item.message,
|
||||
mType: item.m_type,
|
||||
user: {
|
||||
_id: account.mid,
|
||||
name: account.name,
|
||||
|
|
@ -268,6 +272,7 @@ export default function MessageDetail({ navigation, route }) {
|
|||
_id: item.id,
|
||||
createdAt: new Date(item.ct * 1000).toISOString(),
|
||||
text: item.message,
|
||||
mType: item.m_type,
|
||||
user: {
|
||||
_id: 1,
|
||||
name: "客服",
|
||||
|
|
@ -450,17 +455,12 @@ export default function MessageDetail({ navigation, route }) {
|
|||
}, []);
|
||||
|
||||
//气泡样式
|
||||
const renderBubble = useCallback((props) => {
|
||||
return (
|
||||
<Bubble
|
||||
{...props}
|
||||
wrapperStyle={{
|
||||
left: tailwind("bg-white p-1"),
|
||||
right: tailwind("p-1"),
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}, []);
|
||||
const renderBubble = useCallback(
|
||||
(props) => {
|
||||
return <OwnBubble {...props} />;
|
||||
},
|
||||
[currentHeight, sessionId]
|
||||
);
|
||||
|
||||
//加载更早信息样式
|
||||
const renderLoadEarlier = useCallback(
|
||||
|
|
@ -485,37 +485,43 @@ export default function MessageDetail({ navigation, route }) {
|
|||
...tailwind("flex-1 bg-[#13121F]"),
|
||||
}}
|
||||
>
|
||||
<View style={tailwind("flex-1")}>
|
||||
<GiftedChat
|
||||
placeholder={params?.mid === 1 ? "输入新消息" : "爱就大胆说出来！"}
|
||||
alwaysShowSend
|
||||
locale={"zh-cn"}
|
||||
keyboardShouldPersistTaps="never"
|
||||
alignTop={false}
|
||||
listViewProps={{
|
||||
contentContainerStyle: { flexGrow: 1, justifyContent: "flex-end" },
|
||||
}}
|
||||
onLoadEarlier={() => loadEarlierHistory()}
|
||||
showUserAvatar
|
||||
showAvatarForEveryMessage
|
||||
renderAvatarOnTop
|
||||
messagesContainerStyle={tailwind("bg-[#13121F] pb-4")}
|
||||
renderAvatar={renderAvatar}
|
||||
renderDay={renderDay}
|
||||
renderInputToolbar={renderInputToolbar}
|
||||
renderBubble={renderBubble}
|
||||
loadEarlier
|
||||
renderLoadEarlier={renderLoadEarlier}
|
||||
renderTime={renderTime}
|
||||
messages={messages}
|
||||
onSend={(messages) => onSend(messages)}
|
||||
user={{
|
||||
_id: selfData?.mid,
|
||||
name: selfData?.name,
|
||||
avatar: selfData?.avatar?.images[0]?.urls[0],
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
<GestureHandlerRootView>
|
||||
<View style={tailwind("flex-1")}>
|
||||
<GiftedChat
|
||||
placeholder={params?.mid === 1 ? "输入新消息" : "爱就大胆说出来！"}
|
||||
alwaysShowSend
|
||||
locale={"zh-cn"}
|
||||
keyboardShouldPersistTaps="never"
|
||||
alignTop={false}
|
||||
listViewProps={{
|
||||
contentContainerStyle: {
|
||||
flexGrow: 1,
|
||||
justifyContent: "flex-end",
|
||||
},
|
||||
}}
|
||||
onLoadEarlier={() => loadEarlierHistory()}
|
||||
showUserAvatar
|
||||
showAvatarForEveryMessage
|
||||
renderAvatarOnTop
|
||||
messagesContainerStyle={tailwind("bg-[#13121F] pb-4")}
|
||||
renderAvatar={renderAvatar}
|
||||
renderDay={renderDay}
|
||||
renderInputToolbar={renderInputToolbar}
|
||||
renderBubble={renderBubble}
|
||||
// renderMessageText={renderMessageText}
|
||||
loadEarlier
|
||||
renderLoadEarlier={renderLoadEarlier}
|
||||
renderTime={renderTime}
|
||||
messages={messages}
|
||||
onSend={(messages) => onSend(messages)}
|
||||
user={{
|
||||
_id: selfData?.mid,
|
||||
name: selfData?.name,
|
||||
avatar: selfData?.avatar?.images[0]?.urls[0],
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</GestureHandlerRootView>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { View, Text, RefreshControl, TouchableOpacity } from "react-native";
|
||||
import React, { useState, useCallback } from "react";
|
||||
import React, { useState, useCallback, useEffect } from "react";
|
||||
import { useTailwind } from "tailwind-rn";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import Toast from "react-native-toast-message";
|
||||
|
|
@ -18,23 +18,32 @@ export default function SpaceList() {
|
|||
const navigation = useNavigation();
|
||||
|
||||
const [data, setData] = useState([]);
|
||||
|
||||
const getData = async () => {
|
||||
const [more, setMore] = useState(true);
|
||||
const [offset, setOffset] = useState(0);
|
||||
const [currentUserId, setCurrentUserId] = useState(null);
|
||||
const getData = async (type, offset) => {
|
||||
if (!more && type !== "top") return;
|
||||
//防止重复加载
|
||||
if (data.length === 0 && type === "bottom") return;
|
||||
if (type === "bottom" && offset === 0) return;
|
||||
const apiUrl = process.env.EXPO_PUBLIC_API_URL;
|
||||
|
||||
const userId = await baseRequest();
|
||||
setCurrentUserId(userId?.b_mid);
|
||||
try {
|
||||
const base = await baseRequest();
|
||||
const signature = await generateSignature({
|
||||
...base,
|
||||
});
|
||||
const _response = await fetch(
|
||||
`${apiUrl}/api/zone/list_by_visitor_mid?signature=${signature}`,
|
||||
`${apiUrl}/api/zone/list_by_visitor_mid_v2?signature=${signature}`,
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
offset,
|
||||
limit: 6,
|
||||
...base,
|
||||
}),
|
||||
}
|
||||
|
|
@ -48,13 +57,17 @@ export default function SpaceList() {
|
|||
});
|
||||
return;
|
||||
}
|
||||
//在末尾添加元素以展示查看更多卡片
|
||||
if (_data.data.list.length !== 0) {
|
||||
const finalData = [..._data.data.list, { id: 999999, last: true }];
|
||||
setData(finalData);
|
||||
|
||||
setOffset(_data.data.offset);
|
||||
setMore(_data.data.more);
|
||||
if (offset === 0) {
|
||||
setData(_data.data.list);
|
||||
return;
|
||||
}
|
||||
setData(_data.data.list);
|
||||
//在末尾添加元素以展示查看更多卡片
|
||||
setData((prev) => {
|
||||
return [...prev, ..._data.data.list];
|
||||
});
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
|
@ -62,10 +75,15 @@ export default function SpaceList() {
|
|||
//每次focus都更新一次数据
|
||||
useFocusEffect(
|
||||
useCallback(() => {
|
||||
getData();
|
||||
(async () => {
|
||||
const userId = await baseRequest();
|
||||
if (currentUserId !== userId?.b_mid) {
|
||||
setCurrentUserId(userId?.b_mid);
|
||||
getData("top", 0);
|
||||
}
|
||||
})();
|
||||
}, [])
|
||||
);
|
||||
|
||||
const renderItem = ({ item }) => <SpaceCard data={item} />;
|
||||
|
||||
//数据为空时的组件
|
||||
|
|
@ -109,7 +127,7 @@ export default function SpaceList() {
|
|||
const [refreshing, setRefreshing] = useState(false);
|
||||
const handleRefresh = async () => {
|
||||
setRefreshing(true);
|
||||
await getData();
|
||||
await getData("top", 0);
|
||||
setRefreshing(false);
|
||||
};
|
||||
|
||||
|
|
@ -123,12 +141,16 @@ export default function SpaceList() {
|
|||
>
|
||||
<View style={tailwind("flex-1 px-2")}>
|
||||
<FlashList
|
||||
data={data}
|
||||
data={data.length === 0 ? [] : [...data, { id: 999999, last: true }]}
|
||||
keyExtractor={(item) => item.id}
|
||||
renderItem={renderItem}
|
||||
estimatedItemSize={166}
|
||||
initialNumToRender={12}
|
||||
numColumns={2}
|
||||
onEndReached={() => {
|
||||
getData("bottom", offset);
|
||||
}}
|
||||
drawDistance={10}
|
||||
refreshControl={
|
||||
<RefreshControl
|
||||
colors={["#FF669E"]}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import { usePreventScreenCapture } from "expo-screen-capture";
|
|||
import { useFocusEffect } from "@react-navigation/native";
|
||||
import { useImageViewer } from "../../context/ImageViewProvider";
|
||||
import MyModal from "../../components/MyModal";
|
||||
|
||||
import requireAPI from "../../utils/requireAPI";
|
||||
export default function SpaceIntroduce({ navigation, route }) {
|
||||
usePreventScreenCapture();
|
||||
const tailwind = useTailwind();
|
||||
|
|
@ -72,6 +72,7 @@ export default function SpaceIntroduce({ navigation, route }) {
|
|||
..._data.data.list[0],
|
||||
refund_enable: _data.data.refund_enable,
|
||||
refund_status: _data.data.refund_status,
|
||||
exit_status: _data.data.exit_status,
|
||||
});
|
||||
setIsloading(false);
|
||||
} catch (error) {
|
||||
|
|
@ -125,6 +126,27 @@ export default function SpaceIntroduce({ navigation, route }) {
|
|||
console.error(error);
|
||||
}
|
||||
};
|
||||
const handleReenterSpace = async () => {
|
||||
try {
|
||||
const body = {
|
||||
zid: data?.id,
|
||||
};
|
||||
const _data = await requireAPI("POST", "/api/zone/exit_reenter", {
|
||||
body,
|
||||
});
|
||||
if (_data.ret === -1) {
|
||||
Toast.show({
|
||||
type: "error",
|
||||
text1: _data.msg,
|
||||
topOffset: 60,
|
||||
});
|
||||
return;
|
||||
}
|
||||
navigation.replace("StreamerSpace", { mid: route.params.mid });
|
||||
} catch (error) {
|
||||
// console.error(error);
|
||||
}
|
||||
};
|
||||
|
||||
//点击查看微信按钮
|
||||
const [isAddWechatModalVisible, setIsAddWechatModalVisible] = useState(false);
|
||||
|
|
@ -345,7 +367,9 @@ export default function SpaceIntroduce({ navigation, route }) {
|
|||
>
|
||||
<TouchableOpacity
|
||||
onPress={
|
||||
data?.admission_price === 0
|
||||
data.exit_status === 1
|
||||
? handleReenterSpace
|
||||
: data?.admission_price === 0
|
||||
? handleJoinFreeSpace
|
||||
: () => setIsWarnModalVisible(true)
|
||||
}
|
||||
|
|
@ -353,18 +377,33 @@ export default function SpaceIntroduce({ navigation, route }) {
|
|||
"flex flex-row items-center justify-center h-12 rounded-full px-10 bg-[#FF669E]"
|
||||
)}
|
||||
>
|
||||
{data?.admission_price !== 0 && (
|
||||
<NativeImage
|
||||
style={tailwind("ml-2")}
|
||||
source={require("../../assets/icon/others/money_pink.png")}
|
||||
/>
|
||||
{data?.exit_status === 1 ? (
|
||||
<>
|
||||
<Text style={tailwind("text-base text-white font-medium ml-2")}>
|
||||
已解锁
|
||||
</Text>
|
||||
<NativeImage
|
||||
source={require("../../assets/icon/32DP/link.png")}
|
||||
/>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
{data?.admission_price !== 0 && (
|
||||
<NativeImage
|
||||
style={tailwind("ml-2")}
|
||||
source={require("../../assets/icon/others/money_pink.png")}
|
||||
/>
|
||||
)}
|
||||
<Text style={tailwind("text-base text-white font-medium ml-2")}>
|
||||
{data?.admission_price === 0
|
||||
? "免费加入"
|
||||
: `${data?.admission_price / 100}元立即加入`}
|
||||
</Text>
|
||||
<NativeImage
|
||||
source={require("../../assets/icon/32DP/link.png")}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
<Text style={tailwind("text-base text-white font-medium ml-2")}>
|
||||
{data?.admission_price === 0
|
||||
? "免费加入"
|
||||
: `${data?.admission_price / 100}元立即加入`}
|
||||
</Text>
|
||||
<NativeImage source={require("../../assets/icon/32DP/link.png")} />
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ export default function SpacePaymentSetting({ navigation, route }) {
|
|||
value={ironFanPrice}
|
||||
onChangeText={setIronFanPrice}
|
||||
keyboardType="numeric"
|
||||
placeholder="0~3888，仅支持整数"
|
||||
placeholder="1~3888，仅支持整数"
|
||||
placeholderTextColor="#FFFFFF80"
|
||||
underlineColorAndroid="transparent"
|
||||
style={{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import {
|
|||
useWindowDimensions,
|
||||
Animated,
|
||||
Easing,
|
||||
Modal,
|
||||
Modal as RNModal,
|
||||
} from "react-native";
|
||||
import React, { useState, useEffect, useCallback, useMemo } from "react";
|
||||
import { useTailwind } from "tailwind-rn";
|
||||
|
|
@ -29,8 +29,8 @@ import { LinearProgress, Button } from "@rneui/themed";
|
|||
import { LinearGradient } from "expo-linear-gradient";
|
||||
import { usePreventScreenCapture } from "expo-screen-capture";
|
||||
import { Svg, Path } from "react-native-svg";
|
||||
import MyModal from "../../components/MyModal";
|
||||
|
||||
import Modal from "react-native-modal";
|
||||
import requireAPI from "../../utils/requireAPI";
|
||||
export default function StreamerSpace({ navigation, route }) {
|
||||
usePreventScreenCapture();
|
||||
const blurhash = "LcKUTa%gOYWBYRt6xuoJo~s8V@fk";
|
||||
|
|
@ -44,6 +44,10 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
|
||||
//退款中Modal是否展示
|
||||
const [isRefundingModalVisible, setIsRefundingModalVisible] = useState(false);
|
||||
//消息通知Modal是否展示
|
||||
const [popVisible, setPopVisible] = useState(false);
|
||||
// 通知弹框数据
|
||||
const [noticesMaskInformation, setNoticesMaskInformation] = useState(false);
|
||||
|
||||
//获取空间数据并将该空间标为已读
|
||||
const [data, setData] = useState({});
|
||||
|
|
@ -122,6 +126,7 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
|
||||
useEffect(() => {
|
||||
getData();
|
||||
getNoticesMaskInformation();
|
||||
}, []);
|
||||
|
||||
//设置header右侧按钮功能
|
||||
|
|
@ -138,7 +143,6 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
),
|
||||
});
|
||||
}, [data]);
|
||||
|
||||
//点击查看微信按钮
|
||||
const [isAddWechatModalVisible, setIsAddWechatModalVisible] = useState(false);
|
||||
|
||||
|
|
@ -168,7 +172,44 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
}),
|
||||
[data]
|
||||
);
|
||||
const getNoticesMaskInformation = async () => {
|
||||
const userInfo = await baseRequest();
|
||||
if (userInfo?.b_mid != params_mid) return;
|
||||
try {
|
||||
const data = await requireAPI("POST", "/api/zone/pop_up", {
|
||||
body: {
|
||||
mid: params_mid,
|
||||
},
|
||||
});
|
||||
if (data.ret === -1) {
|
||||
Toast.show({
|
||||
type: "error",
|
||||
text1: data.msg,
|
||||
topOffset: 60,
|
||||
});
|
||||
return;
|
||||
}
|
||||
setPopVisible(!!data.data.enable);
|
||||
setNoticesMaskInformation(data.data);
|
||||
} catch (error) {
|
||||
// console.error(error);
|
||||
}
|
||||
};
|
||||
// 监听路有变化
|
||||
useEffect(() => {
|
||||
const unsubscribe = navigation.addListener("state", (e) => {
|
||||
const state = e.data.state;
|
||||
const currentRoute = state.routes[state.index];
|
||||
if (
|
||||
// action?.type === "GO_BACK" && // 返回动作
|
||||
currentRoute?.name === "StreamerSpace" // 当前路由为PageA
|
||||
) {
|
||||
getNoticesMaskInformation();
|
||||
}
|
||||
});
|
||||
|
||||
return unsubscribe;
|
||||
}, [navigation]);
|
||||
const renderIndicator = useCallback((props) => {
|
||||
const { position, navigationState, getTabWidth } = props;
|
||||
const inputRange = [0, 1];
|
||||
|
|
@ -259,7 +300,7 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
);
|
||||
const BecomeIronFanModal = useCallback(
|
||||
() => (
|
||||
<Modal
|
||||
<RNModal
|
||||
visible={isIronFanModalVisible}
|
||||
transparent={true}
|
||||
statusBarTranslucent
|
||||
|
|
@ -330,7 +371,7 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
</Text>
|
||||
</TouchableOpacity>
|
||||
</TouchableOpacity>
|
||||
</Modal>
|
||||
</RNModal>
|
||||
),
|
||||
[isIronFanModalVisible]
|
||||
);
|
||||
|
|
@ -608,34 +649,6 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
查看微信
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
{data?.is_superfanship_enabled === 1 && (
|
||||
<TouchableOpacity
|
||||
onPress={
|
||||
data?.is_superfanship_unlocked === 1
|
||||
? () => setIndex(2)
|
||||
: () =>
|
||||
navigation.navigate("WebWithoutHeader", {
|
||||
uri:
|
||||
process.env.EXPO_PUBLIC_WEB_URL +
|
||||
"/zone/pay/" +
|
||||
data?.id +
|
||||
"/h5_zone_superfanship/0",
|
||||
})
|
||||
}
|
||||
style={tailwind("flex flex-col items-center")}
|
||||
>
|
||||
<NativeImage
|
||||
source={require("../../assets/icon/others/chaofen.png")}
|
||||
/>
|
||||
<Text
|
||||
style={tailwind("text-white text-xs font-medium mt-0.5")}
|
||||
>
|
||||
{data?.is_superfanship_unlocked === 1
|
||||
? "尊贵超粉"
|
||||
: "成为超粉"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
<TouchableOpacity
|
||||
onPress={() => setIsIronFanModalVisible(true)}
|
||||
style={tailwind("flex flex-col items-center")}
|
||||
|
|
@ -664,6 +677,34 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
</Text>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
{data?.is_superfanship_enabled === 1 && (
|
||||
<TouchableOpacity
|
||||
onPress={
|
||||
data?.is_superfanship_unlocked === 1
|
||||
? () => setIndex(2)
|
||||
: () =>
|
||||
navigation.navigate("WebWithoutHeader", {
|
||||
uri:
|
||||
process.env.EXPO_PUBLIC_WEB_URL +
|
||||
"/zone/pay/" +
|
||||
data?.id +
|
||||
"/h5_zone_superfanship/0",
|
||||
})
|
||||
}
|
||||
style={tailwind("flex flex-col items-center")}
|
||||
>
|
||||
<NativeImage
|
||||
source={require("../../assets/icon/others/chaofen.png")}
|
||||
/>
|
||||
<Text
|
||||
style={tailwind("text-white text-xs font-medium mt-0.5")}
|
||||
>
|
||||
{data?.is_superfanship_unlocked === 1
|
||||
? "尊贵超粉"
|
||||
: "成为超粉"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
</View>
|
||||
)}
|
||||
{/* 点击成为铁粉Modal */}
|
||||
|
|
@ -688,7 +729,7 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
/>
|
||||
)}
|
||||
{/* 退款中禁止查看Modal */}
|
||||
<MyModal
|
||||
<RNModal
|
||||
visible={isRefundingModalVisible}
|
||||
setVisible={setIsRefundingModalVisible}
|
||||
title="当前空间正在退款中"
|
||||
|
|
@ -729,6 +770,142 @@ export default function StreamerSpace({ navigation, route }) {
|
|||
</Svg>
|
||||
</Animated.View>
|
||||
</TouchableOpacity>
|
||||
{/* 信息通知弹窗 */}
|
||||
{popVisible && (
|
||||
<Modal
|
||||
isVisible={popVisible}
|
||||
swipeDirection={["down"]}
|
||||
onSwipeComplete={() => setPopVisible(false)}
|
||||
onBackdropPress={() => setPopVisible(false)}
|
||||
animationInTiming={500} // 打开动画时长
|
||||
animationOutTiming={1000} // 关闭动画时长
|
||||
animationIn="bounceInUp" // 打开动画类型
|
||||
animationOut="bounceInDown" // 关闭动画类型
|
||||
style={{
|
||||
height: 120,
|
||||
paddingBottom: 0,
|
||||
borderTopLeftRadius: 15,
|
||||
borderTopRightRadius: 15,
|
||||
margin: 0,
|
||||
justifyContent: "flex-end",
|
||||
}}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
...tailwind("w-full"),
|
||||
backgroundColor: "#17161A",
|
||||
paddingBottom: 20,
|
||||
}}
|
||||
>
|
||||
<Image
|
||||
style={{
|
||||
height: 160,
|
||||
width: "100%",
|
||||
marginTop: -30,
|
||||
}}
|
||||
source={require("../../assets/images/newM.png")}
|
||||
placeholder={blurhash}
|
||||
contentFit="fill"
|
||||
transition={1000}
|
||||
cachePolicy="disk"
|
||||
/>
|
||||
{/* <NativeImage
|
||||
source={require("../../assets/icon/others/newM.png")}
|
||||
/> */}
|
||||
<View
|
||||
style={{
|
||||
...tailwind(
|
||||
"w-full flex justify-center items-center flex-col"
|
||||
),
|
||||
padding: 14,
|
||||
// marginTop: -30,
|
||||
}}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
color: "#FFFFFFB2",
|
||||
fontSize: 13,
|
||||
lineHeight: 18,
|
||||
marginBottom: 28,
|
||||
textAlign: "center",
|
||||
}}
|
||||
>
|
||||
{noticesMaskInformation.content}
|
||||
</Text>
|
||||
<View className="w-full">
|
||||
{noticesMaskInformation.action?.map((item, index) => {
|
||||
return (
|
||||
<View
|
||||
key={index}
|
||||
style={{
|
||||
...tailwind(
|
||||
"w-full flex-row justify-between items-center"
|
||||
),
|
||||
height: 56,
|
||||
borderRadius: 12,
|
||||
marginBottom: 10,
|
||||
padding: 14,
|
||||
backgroundColor: "#2F2E32",
|
||||
display: item.count > 0 ? "flex" : "none",
|
||||
}}
|
||||
>
|
||||
<View style={{ ...tailwind("flex-row items-center") }}>
|
||||
<Image
|
||||
source={
|
||||
process.env.EXPO_PUBLIC_WEB_ASSETS_URL +
|
||||
item?.icon_url
|
||||
}
|
||||
style={{ width: 28, height: 28, marginRight: 5 }}
|
||||
/>
|
||||
<Text
|
||||
style={tailwind("text-white text-base font-medium")}
|
||||
>
|
||||
{item.text} {item.count}
|
||||
</Text>
|
||||
</View>
|
||||
<TouchableOpacity
|
||||
onPress={() => {
|
||||
setPopVisible(false);
|
||||
const linkAndParams = item.app_url
|
||||
.split("/")
|
||||
.filter((item) => item);
|
||||
navigation.navigate(linkAndParams[0], {
|
||||
screen: linkAndParams[1],
|
||||
});
|
||||
}}
|
||||
style={tailwind(
|
||||
"flex-row items-center justify-center h-8 px-4 bg-[#FF669E] rounded-full"
|
||||
)}
|
||||
>
|
||||
<Text
|
||||
style={tailwind("text-white text-sm font-medium")}
|
||||
>
|
||||
前往处理
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
<TouchableOpacity
|
||||
onPress={() => setPopVisible(false)}
|
||||
style={{
|
||||
...tailwind(
|
||||
"flex items-center justify-center h-8 px-4 bg-[#FF669E] rounded-full"
|
||||
),
|
||||
height: 46,
|
||||
width: 221,
|
||||
marginTop: 41,
|
||||
}}
|
||||
>
|
||||
<Text style={tailwind("text-white text-sm font-medium")}>
|
||||
回到空间
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
</View>
|
||||
</Modal>
|
||||
)}
|
||||
</BottomSheetModalProvider>
|
||||
</GestureHandlerRootView>
|
||||
);
|
||||
|
|
|
|||
17
yarn.lock
17
yarn.lock
|
|
@ -6362,7 +6362,7 @@ prop-types@15.7.2:
|
|||
object-assign "^4.1.1"
|
||||
react-is "^16.8.1"
|
||||
|
||||
prop-types@15.8.1, prop-types@^15.5.10, prop-types@^15.7.2, prop-types@^15.7.x:
|
||||
prop-types@15.8.1, prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.7.x:
|
||||
version "15.8.1"
|
||||
resolved "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz"
|
||||
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
|
||||
|
|
@ -6482,6 +6482,13 @@ react-is@^17.0.1:
|
|||
resolved "https://registry.npmmirror.com/react-is/-/react-is-17.0.2.tgz"
|
||||
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
|
||||
|
||||
react-native-animatable@1.3.3:
|
||||
version "1.3.3"
|
||||
resolved "https://registry.npmjs.org/react-native-animatable/-/react-native-animatable-1.3.3.tgz#a13a4af8258e3bb14d0a9d839917e9bb9274ec8a"
|
||||
integrity sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w==
|
||||
dependencies:
|
||||
prop-types "^15.7.2"
|
||||
|
||||
react-native-communications@2.2.1:
|
||||
version "2.2.1"
|
||||
resolved "https://registry.npmmirror.com/react-native-communications/-/react-native-communications-2.2.1.tgz"
|
||||
|
|
@ -6541,6 +6548,14 @@ react-native-lightbox-v2@0.9.0:
|
|||
resolved "https://registry.npmmirror.com/react-native-lightbox-v2/-/react-native-lightbox-v2-0.9.0.tgz"
|
||||
integrity sha512-Fc5VFHFj2vokS+OegyTsANKb1CYoUlOtAv+EBH5wtpJn1b5cey6jVXH7136G5+8OC9JmKWSgKHc5thFwOoZTUg==
|
||||
|
||||
react-native-modal@^13.0.1:
|
||||
version "13.0.1"
|
||||
resolved "https://registry.npmjs.org/react-native-modal/-/react-native-modal-13.0.1.tgz#691f1e646abb96fa82c1788bf18a16d585da37cd"
|
||||
integrity sha512-UB+mjmUtf+miaG/sDhOikRfBOv0gJdBU2ZE1HtFWp6UixW9jCk/bhGdHUgmZljbPpp0RaO/6YiMmQSSK3kkMaw==
|
||||
dependencies:
|
||||
prop-types "^15.6.2"
|
||||
react-native-animatable "1.3.3"
|
||||
|
||||
react-native-pager-view@6.3.0:
|
||||
version "6.3.0"
|
||||
resolved "https://registry.npmmirror.com/react-native-pager-view/-/react-native-pager-view-6.3.0.tgz"
|
||||
|
|
|
|||
Loading…
Reference in New Issue