From 27c88e26ffc947ffd89bf5473e9a648e78ed619b Mon Sep 17 00:00:00 2001 From: al Date: Thu, 23 Jan 2025 17:31:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=90=E5=8F=B7?= =?UTF-8?q?=E5=88=87=E6=8D=A2=EF=BC=8C=E6=BB=9A=E5=8A=A8=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/MessageList/index.jsx | 235 ++++++++++-------- .../components/ScrollNotice/index.js | 63 +++-- screeens/Refund/RefundDetail/index.jsx | 3 +- screeens/Refund/RefundList/Reviewed/index.jsx | 3 +- 4 files changed, 163 insertions(+), 141 deletions(-) diff --git a/screeens/NoticeDetail/components/MessageList/index.jsx b/screeens/NoticeDetail/components/MessageList/index.jsx index 98504b5..05e1d89 100644 --- a/screeens/NoticeDetail/components/MessageList/index.jsx +++ b/screeens/NoticeDetail/components/MessageList/index.jsx @@ -3,6 +3,9 @@ import { TouchableOpacity, Image as NativeImage, Text, + Platform, + ScrollView, + KeyboardAvoidingView, } from "react-native"; import React, { useState, @@ -20,14 +23,17 @@ import requireAPI from "../../../../utils/requireAPI"; import { Image } from "expo-image"; import { connect } from "react-redux"; import dayjs from "dayjs"; +import { useFocusEffect } from "@react-navigation/native"; import ScrollNotice from "../ScrollNotice"; import { goToPage } from "../../../../utils/tools"; +import { get } from "../../../../utils/storeInfo"; const MessageList = ({ navigation, noticeCount, refInstance }) => { const dispatch = useDispatch(); const [data, setData] = useState([]); const [scollNotice, setScollNotice] = useState({}); const tailwind = useTailwind(); const insets = useSafeAreaInsets(); + const [account, setAccount] = useState(null); const [infoItems, setInfoItems] = useState([ { title: "系统通知", @@ -100,10 +106,17 @@ const MessageList = ({ navigation, noticeCount, refInstance }) => { } }, })); + useFocusEffect(() => { + const getAccount = async () => { + const account = await get("account"); + setAccount(account?.mid); + }; + getAccount(); + }); useEffect(() => { getData(); getActiveNotice(); - }, [noticeCount]); + }, [noticeCount, account]); const getData = async () => { try { const base = await baseRequest(); @@ -129,6 +142,7 @@ const MessageList = ({ navigation, noticeCount, refInstance }) => { return; } const noticeObj = _data.data.result; + const noticeCount = Object.values(noticeObj).reduce( (acc, cur) => acc + cur.unread_cnt, 0 @@ -146,6 +160,9 @@ const MessageList = ({ navigation, noticeCount, refInstance }) => { ); newInfoItems[parseInt(it)]["subtitle"] = noticeObj[it].most_recent_notif.title; + } else { + newInfoItems[parseInt(it)]["time"] = ""; + newInfoItems[parseInt(it)]["subtitle"] = "暂无新消息"; } }); return newInfoItems; @@ -262,120 +279,130 @@ const MessageList = ({ navigation, noticeCount, refInstance }) => { // }), // }); return ( - - {/* 广告轮播 */} - {!!scollNotice?.content && ( - { - const links = scollNotice?.hyperlinks; - let link = null; - if (links.length > 1) { - link = links.filter((it) => it.action === "inward")[0]?.url; - } else { - link = links[0]?.url; - } - const linkAndParams = goToPage({ - action: links[0]?.action, - url: link, - }); - return linkAndParams; - })()} - action={scollNotice?.hyperlinks[0]?.action} - /> - )} - - {/* 官方消息 */} - - {infoItems.map((it, index) => renderSystemItem(it, index, navigation))} - - {/* 私聊消息 */} - - - navigation.navigate("MessageDetail", { - mid: 1, - }) - } - style={{ - ...tailwind("flex flex-row items-center py-4 mb-2 rounded-xl"), - }} - > - - + + {/* 广告轮播 */} + {!!scollNotice?.content && ( + { + const links = scollNotice?.hyperlinks; + let link = null; + if (links.length > 1) { + link = links.filter((it) => it.action === "inward")[0]?.url; + } else { + link = links[0]?.url; + } + const linkAndParams = goToPage({ + action: links[0]?.action, + url: link, + }); + return linkAndParams; + })()} + action={scollNotice?.hyperlinks[0]?.action} /> - + )} + + {/* 官方消息 */} - - - - 铁粉空间官网 - - - 官方 + {infoItems.map((it, index) => + renderSystemItem(it, index, navigation) + )} + + {/* 私聊消息 */} + + + navigation.navigate("MessageDetail", { + mid: 1, + }) + } + style={{ + ...tailwind("flex flex-row items-center py-4 mb-2 rounded-xl"), + }} + > + + + + + + + + 铁粉空间官网 + + + 官方 + + + + {data?.recent_contact_cs_msg || "暂无新消息"} + + + + + {!!data.contact_cs_urc && ( + + 99 ? "99+" : data.contact_cs_urc + } + // containerStyle={{ position: "absolute", top: 0, right: 40 }} + badgeStyle={{ + borderWidth: 0, + backgroundColor: "#FF669E", + }} + /> + + )} - - {data?.recent_contact_cs_msg || "暂无新消息"} - - - - - {!!data.contact_cs_urc && ( - - 99 ? "99+" : data.contact_cs_urc - } - // containerStyle={{ position: "absolute", top: 0, right: 40 }} - badgeStyle={{ borderWidth: 0, backgroundColor: "#FF669E" }} - /> - - )} - + - - - + + + ); }; diff --git a/screeens/NoticeDetail/components/ScrollNotice/index.js b/screeens/NoticeDetail/components/ScrollNotice/index.js index 1805c11..e907711 100644 --- a/screeens/NoticeDetail/components/ScrollNotice/index.js +++ b/screeens/NoticeDetail/components/ScrollNotice/index.js @@ -19,13 +19,13 @@ export default function ScrollNotice({ action, }) { const tailwind = useTailwind(); - const [fadeAnim] = useState(new Animated.Value(300)); // 透明度初始值为0 + const [fadeAnim] = useState(new Animated.Value(length * 75 + 4)); let animation = Animated.timing(fadeAnim, { - toValue: -(length * 60), - duration: 4000, - delay: 500, + toValue: -(length * 75), + duration: 15000, + delay: 0, easing: Easing.linear, - useNativeDriver: false, + useNativeDriver: true, useNativeDriverForTransform: true, // 如果动画涉及transform属性，则需要此设置 }); useEffect(() => { @@ -39,13 +39,13 @@ export default function ScrollNotice({ animation && animation.start(() => { // 动画完成时的回调，重置动画值并再次运行动画以实现循环 - fadeAnim.setValue(length * 80); // 重置动画值（如果需要） + fadeAnim.setValue(length * 75); // 重置动画值（如果需要） runAnimation(); // 再次运行动画 }); }; useEffect(() => { - runAnimation(); // 组件挂载时开始动画 + content.length > 10 && runAnimation(); // 组件挂载时开始动画 // 注意：这里没有清理函数，因为动画是无限循环的。 // 如果你需要在组件卸载时停止动画，你需要实现一个机制来跟踪组件的状态，并在适当时调用`stopAnimation`。 }, [fadeAnim]); @@ -58,7 +58,7 @@ export default function ScrollNotice({ > { if (typeof url === "string") { - try { - // 尝试启动微信客户端 - Linking.openURL(url).catch(() => { - // 启动微信客户端失败，弹出提示安装对话框 - Alert.alert( - "错误提醒", - "打开链接失败，请返回重试或者联系在线客服", - [{ text: "确认", style: "cancel" }], - { cancelable: false } - ); - }); - } catch (error) { - // 启动微信客户端失败，继续加载URL - console.error(error); - } - } else { - navigation.navigate(...url); - } - if (typeof url === "string") { - if (action === "webViewHeader") { + if ( + action === "webViewHeaderInward" || + action === "webViewHeaderOutward" + ) { navigation.navigate("WebWithHeader", { title: "", uri: url, }); return; - } else if (action === "webViewWithOutHeader") { + } else if ( + action === "webViewWithOutHeaderInward" || + action === "webViewWithOutHeaderOutward" + ) { navigation.navigate("WebWithoutHeader", { title: "", uri: url, @@ -126,17 +113,27 @@ export default function ScrollNotice({ > 10 ? fadeAnim : 0, }, ], - paddingBottom: 5, + // transform: [ + // { + // translateX: -(length * 75), + // }, + // ], + // paddingBottom: 5, }} > - + {content} diff --git a/screeens/Refund/RefundDetail/index.jsx b/screeens/Refund/RefundDetail/index.jsx index 5176025..54ff6fe 100644 --- a/screeens/Refund/RefundDetail/index.jsx +++ b/screeens/Refund/RefundDetail/index.jsx @@ -20,7 +20,6 @@ export default function RefundDetail({ navigation, route }) { const tailwind = useTailwind(); const insets = useSafeAreaInsets(); const [data, setData] = useState(null); - const [dragging, setDragging] = useState(true); const [isSubmitting, setIsSubmitting] = useState(false); const [selectedIndex, setIndex] = useState(2); const [checkAble, setCheckAble] = useState(true); @@ -119,7 +118,7 @@ export default function RefundDetail({ navigation, route }) { ...tailwind("flex-1"), }} > - + {item.account.name} @@ -149,7 +148,7 @@ export default function Reviewed({ navigation, zid }) { {item?.refunds_status === 3 && ( 2小时无条件 -- 2.41.0 From 811705bad1d5e546f25e33f9804f7daa7277d1ad Mon Sep 17 00:00:00 2001 From: al Date: Fri, 7 Feb 2025 18:50:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=B0=E6=9C=89bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.jsx | 2 +- app.json | 3 +- components/MediaPicker/index.jsx | 3 +- components/Post/index.jsx | 72 ++++++++++++++++------------- screeens/CreateImagePost/index.jsx | 2 +- screeens/CreatePost/index.jsx | 2 +- screeens/CreateVideoPost/index.jsx | 2 +- screeens/EditSpacePost/index.jsx | 18 +++++--- screeens/EditStreamerPost/index.jsx | 12 +++-- 9 files changed, 67 insertions(+), 49 deletions(-) diff --git a/App.jsx b/App.jsx index b02c742..fbc4b1e 100644 --- a/App.jsx +++ b/App.jsx @@ -563,7 +563,7 @@ const App = () => { onPress={() => navigation.goBack()} /> ), - title: "动态", + title: "广场动态", headerTitleStyle: { color: "white" }, headerStyle: { backgroundColor: "#07050A" }, })} diff --git a/app.json b/app.json index 37180c6..965e9e3 100644 --- a/app.json +++ b/app.json @@ -77,7 +77,8 @@ "useLegacyPackaging": true } } - ] + ], + "expo-asset" ], "extra": { "eas": { diff --git a/components/MediaPicker/index.jsx b/components/MediaPicker/index.jsx index f708f7e..206007d 100644 --- a/components/MediaPicker/index.jsx +++ b/components/MediaPicker/index.jsx @@ -14,7 +14,6 @@ import { useImageViewer } from "../../context/ImageViewProvider"; import VideoModal from "../VideoModal"; import * as ImagePicker from "expo-image-picker"; import * as VideoThumbnails from "expo-video-thumbnails"; - /* props格式： setDragging 返回正在拖动的状态，用于该组件嵌套在ScrollView中的时候禁用ScrollView的滚动 @@ -65,9 +64,11 @@ export default function MediaPicker({ allowsMultipleSelection: true, selectionLimit: maxCount - _assets.length, quality: 1, + exif: true, }); if (!result.canceled) { + // console.log("EXIF Orientation:", result.assets[0].exif.Orientation); setNewAssets(result.assets); } }; diff --git a/components/Post/index.jsx b/components/Post/index.jsx index a01f198..da6dfc0 100644 --- a/components/Post/index.jsx +++ b/components/Post/index.jsx @@ -129,6 +129,7 @@ export default function Post({ data, isOwn = false, tagElement = null }) { ...tailwind( "ml-1 justify-center items-center rounded-full px-3 h-6" ), + display: !isOwn ? "flex" : "none", }} > @@ -166,51 +167,60 @@ export default function Post({ data, isOwn = false, tagElement = null }) { - {data?.streamer_ext?.is_active_within_a_week === 1 ? ( - - navigation.navigate("SpaceIntroduce", { mid: data?.mid }) - } - style={tailwind("flex flex-row items-center")} - > - - - 空间 - {formatZoneUpdateTime( - data?.streamer_ext - ?.days_elapsed_since_the_last_zones_update - )} - 有更新 - - - - ) : ( - data?.streamer_ext?.zones?.length !== 0 && ( + + {data?.streamer_ext?.is_active_within_a_week === 1 ? ( navigation.navigate("SpaceIntroduce", { mid: data?.mid }) } style={tailwind("flex flex-row items-center")} > + - 查看TA的空间 + 空间 + {formatZoneUpdateTime( + data?.streamer_ext + ?.days_elapsed_since_the_last_zones_update + )} + 有更新 - ) - )} + ) : ( + data?.streamer_ext?.zones?.length !== 0 && ( + + navigation.navigate("SpaceIntroduce", { + mid: data?.mid, + }) + } + style={tailwind("flex flex-row items-center")} + > + + 查看TA的空间 + + + + ) + )} + diff --git a/screeens/EditStreamerPost/index.jsx b/screeens/EditStreamerPost/index.jsx index bc70613..8b26d7b 100644 --- a/screeens/EditStreamerPost/index.jsx +++ b/screeens/EditStreamerPost/index.jsx @@ -4,12 +4,10 @@ import { TextInput, ScrollView, ActivityIndicator, - Modal, KeyboardAvoidingView, - TouchableOpacity, Platform, } from "react-native"; -import React, { useState, useEffect, useCallback } from "react"; +import React, { useState, useEffect } from "react"; import { useTailwind } from "tailwind-rn"; import { useSafeAreaInsets } from "react-native-safe-area-context"; import MediaPicker from "../../components/MediaPicker"; @@ -85,7 +83,7 @@ export default function EditStreamerPost({ navigation, route }) { ), }); - }, [isSubmitting, handleSubmit, formData, mediaAssets]); + }, [isSubmitting, handleSubmit, formData, mediaAssets, oldMediaAssets]); //是否正在拖动图片，用于禁用ScrollView的滚动 const [dragging, setDragging] = useState(false); @@ -231,7 +229,11 @@ export default function EditStreamerPost({ navigation, route }) { )} -- 2.41.0 From fcddeb46fcbde94ca4aeb6fe7b846c73b777c54a Mon Sep 17 00:00:00 2001 From: al Date: Tue, 11 Feb 2025 16:09:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/MediaPicker/index.jsx | 2 +- screeens/EditSpacePost/index.jsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/MediaPicker/index.jsx b/components/MediaPicker/index.jsx index 206007d..5198664 100644 --- a/components/MediaPicker/index.jsx +++ b/components/MediaPicker/index.jsx @@ -64,7 +64,7 @@ export default function MediaPicker({ allowsMultipleSelection: true, selectionLimit: maxCount - _assets.length, quality: 1, - exif: true, + // exif: true, }); if (!result.canceled) { diff --git a/screeens/EditSpacePost/index.jsx b/screeens/EditSpacePost/index.jsx index 09b2bc5..db41a5a 100644 --- a/screeens/EditSpacePost/index.jsx +++ b/screeens/EditSpacePost/index.jsx @@ -98,7 +98,9 @@ export default function EditSpacePost({ navigation, route }) { media_component, } = _data.data.list[0]; setContent( - paid_text ? text.slice(0, text.length - paid_text.length) : text + is_creating_paid_text + ? text.slice(0, text.length - paid_text.length) + : text ); setPrice((price ? price / 100 : 0).toString()); setTextVisibleRange(text_visible_range.toString()); -- 2.41.0 From ede19de70285dc23b5f1332d148a601715d24fee Mon Sep 17 00:00:00 2001 From: al Date: Tue, 11 Feb 2025 16:21:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B8=85=E9=99=A4"expo-asset"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +-- components/MediaPicker/index.jsx | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app.json b/app.json index 965e9e3..37180c6 100644 --- a/app.json +++ b/app.json @@ -77,8 +77,7 @@ "useLegacyPackaging": true } } - ], - "expo-asset" + ] ], "extra": { "eas": { diff --git a/components/MediaPicker/index.jsx b/components/MediaPicker/index.jsx index 5198664..1c6a328 100644 --- a/components/MediaPicker/index.jsx +++ b/components/MediaPicker/index.jsx @@ -68,7 +68,6 @@ export default function MediaPicker({ }); if (!result.canceled) { - // console.log("EXIF Orientation:", result.assets[0].exif.Orientation); setNewAssets(result.assets); } }; -- 2.41.0