FairClip/memowake-front
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 取消其他注释

Browse Source
This commit is contained in:
Junhui Chen 2025-08-06 17:28:07 +08:00
parent 7c86362830
commit 67a71400de
1 changed files with 186 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

371
app/(tabs)/ask.tsx
View File

@ -18,7 +18,8 @@ import {
TouchableOpacity, TouchableOpacity,
View View
} from 'react-native'; } from 'react-native';
import { useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated'; import { Gesture, GestureDetector } from "react-native-gesture-handler";
import { runOnJS, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
export default function AskScreen() { export default function AskScreen() {
@ -40,147 +41,147 @@ export default function AskScreen() {
}>(); }>();
// 创建一个可复用的滚动函数 // 创建一个可复用的滚动函数
// const scrollToEnd = useCallback((animated = true) => { const scrollToEnd = useCallback((animated = true) => {
// if (chatListRef.current) { if (chatListRef.current) {
// setTimeout(() => chatListRef.current?.scrollToEnd({ animated }), 100); setTimeout(() => chatListRef.current?.scrollToEnd({ animated }), 100);
// } }
// }, []); }, []);
// 右滑 // 右滑
// const gesture = Gesture.Pan() const gesture = Gesture.Pan()
// .onEnd((event) => { .onEnd((event) => {
// const { translationX } = event; const { translationX } = event;
// const threshold = 100; // 滑动阈值 const threshold = 100; // 滑动阈值
// if (translationX > threshold) { if (translationX > threshold) {
// // 从左向右滑动，跳转页面 // 从左向右滑动，跳转页面
// runOnJS(router.replace)("/memo-list"); runOnJS(router.replace)("/memo-list");
// } }
// }) })
// .minPointers(1) .minPointers(1)
// .activeOffsetX([-10, 10]); // 在 X 方向触发的范围 .activeOffsetX([-10, 10]); // 在 X 方向触发的范围
// useEffect(() => { useEffect(() => {
// if (!isHello && userMessages.length > 0) { if (!isHello && userMessages.length > 0) {
// scrollToEnd(); scrollToEnd();
// } }
// }, [userMessages, isHello, scrollToEnd]); }, [userMessages, isHello, scrollToEnd]);
// useEffect(() => { useEffect(() => {
// const keyboardDidShowListener = Keyboard.addListener( const keyboardDidShowListener = Keyboard.addListener(
// 'keyboardDidShow', 'keyboardDidShow',
// (e) => { (e) => {
// setTimeout(() => { setTimeout(() => {
// if (!isHello) { if (!isHello) {
// scrollToEnd(); scrollToEnd();
// } }
// }, 100); }, 100);
// } }
// ); );
// const keyboardDidHideListener = Keyboard.addListener( const keyboardDidHideListener = Keyboard.addListener(
// 'keyboardDidHide', 'keyboardDidHide',
// () => { () => {
// setTimeout(() => { setTimeout(() => {
// if (!isHello) { if (!isHello) {
// scrollToEnd(false); scrollToEnd(false);
// } }
// }, 100); }, 100);
// } }
// ); );
// return () => { return () => {
// keyboardDidShowListener.remove(); keyboardDidShowListener.remove();
// keyboardDidHideListener.remove(); keyboardDidHideListener.remove();
// }; };
// }, [isHello]); }, [isHello]);
// useFocusEffect( useFocusEffect(
// useCallback(() => { useCallback(() => {
// webSocketManager.connect(); webSocketManager.connect();
// const handleChatStream = (message: WsMessage) => { const handleChatStream = (message: WsMessage) => {
// if (message.type === 'ChatStream') { if (message.type === 'ChatStream') {
// setUserMessages(prevMessages => { setUserMessages(prevMessages => {
// const newMessages = [...prevMessages]; const newMessages = [...prevMessages];
// const lastMessage = newMessages[newMessages.length - 1]; const lastMessage = newMessages[newMessages.length - 1];
// if (lastMessage && lastMessage.role === Assistant) { if (lastMessage && lastMessage.role === Assistant) {
// if (typeof lastMessage.content === 'string') { if (typeof lastMessage.content === 'string') {
// if (lastMessage.content === 'keepSearchIng') { if (lastMessage.content === 'keepSearchIng') {
// // 第一次收到流式消息，替换占位符 // 第一次收到流式消息，替换占位符
// lastMessage.content = message.chunk; lastMessage.content = message.chunk;
// } else { } else {
// // 持续追加流式消息 // 持续追加流式消息
// lastMessage.content += message.chunk; lastMessage.content += message.chunk;
// } }
// } else { } else {
// // 如果 content 是数组，则更新第一个 text 部分 // 如果 content 是数组，则更新第一个 text 部分
// const textPart = lastMessage.content.find(p => p.type === 'text'); const textPart = lastMessage.content.find(p => p.type === 'text');
// if (textPart) { if (textPart) {
// textPart.text = (textPart.text || '') + message.chunk; textPart.text = (textPart.text || '') + message.chunk;
// } }
// } }
// } }
// return newMessages; return newMessages;
// }); });
// } }
// }; };
// const handleChatStreamEnd = (message: WsMessage) => { const handleChatStreamEnd = (message: WsMessage) => {
// if (message.type === 'ChatStreamEnd') { if (message.type === 'ChatStreamEnd') {
// setUserMessages(prevMessages => { setUserMessages(prevMessages => {
// const newMessages = [...prevMessages]; const newMessages = [...prevMessages];
// const lastMessage = newMessages[newMessages.length - 1]; const lastMessage = newMessages[newMessages.length - 1];
// if (lastMessage && lastMessage.role === Assistant) { if (lastMessage && lastMessage.role === Assistant) {
// // 使用最终消息替换流式消息，确保 message.message 存在 // 使用最终消息替换流式消息，确保 message.message 存在
// if (message.message) { if (message.message) {
// newMessages[newMessages.length - 1] = message.message as Message; newMessages[newMessages.length - 1] = message.message as Message;
// } else { } else {
// // 如果最终消息为空，则移除 'keepSearchIng' 占位符 // 如果最终消息为空，则移除 'keepSearchIng' 占位符
// return prevMessages.filter(m => !(typeof m.content === 'string' && m.content === 'keepSearchIng')); return prevMessages.filter(m => !(typeof m.content === 'string' && m.content === 'keepSearchIng'));
// } }
// } }
// return newMessages; return newMessages;
// }); });
// } }
// }; };
// const handleError = (message: WsMessage) => { const handleError = (message: WsMessage) => {
// if (message.type === 'Error') { if (message.type === 'Error') {
// console.log(`WebSocket Error: ${message.code} - ${message.message}`); console.log(`WebSocket Error: ${message.code} - ${message.message}`);
// // 可以在这里添加错误提示，例如替换最后一条消息为错误信息 // 可以在这里添加错误提示，例如替换最后一条消息为错误信息
// setUserMessages(prev => { setUserMessages(prev => {
// // 创建新的数组和新的消息对象 // 创建新的数组和新的消息对象
// return prev.map((msg, index) => { return prev.map((msg, index) => {
// if (index === prev.length - 1 && if (index === prev.length - 1 &&
// typeof msg.content === 'string' && typeof msg.content === 'string' &&
// msg.content === 'keepSearchIng') { msg.content === 'keepSearchIng') {
// // 返回新的消息对象 // 返回新的消息对象
// return { return {
// ...msg, ...msg,
// content: getWebSocketErrorMessage(message.code, t) content: getWebSocketErrorMessage(message.code, t)
// }; };
// } }
// return msg; return msg;
// }); });
// }); });
// } }
// }; };
// webSocketManager.subscribe('ChatStream', handleChatStream); webSocketManager.subscribe('ChatStream', handleChatStream);
// webSocketManager.subscribe('ChatStreamEnd', handleChatStreamEnd); webSocketManager.subscribe('ChatStreamEnd', handleChatStreamEnd);
// webSocketManager.subscribe('Error', handleError); webSocketManager.subscribe('Error', handleError);
// return () => { return () => {
// webSocketManager.unsubscribe('ChatStream', handleChatStream); webSocketManager.unsubscribe('ChatStream', handleChatStream);
// webSocketManager.unsubscribe('ChatStreamEnd', handleChatStreamEnd); webSocketManager.unsubscribe('ChatStreamEnd', handleChatStreamEnd);
// webSocketManager.unsubscribe('Error', handleError); webSocketManager.unsubscribe('Error', handleError);
// // 可以在这里选择断开连接，或者保持连接以加快下次进入页面的速度 // 可以在这里选择断开连接，或者保持连接以加快下次进入页面的速度
// // webSocketManager.disconnect(); // webSocketManager.disconnect();
// }; };
// }, []) }, [])
// ); );
// 创建动画样式 // 创建动画样式
const welcomeStyle = useAnimatedStyle(() => { const welcomeStyle = useAnimatedStyle(() => {
@ -217,13 +218,13 @@ export default function AskScreen() {
} }
}, [sessionId, newSession]); }, [sessionId, newSession]);
// useEffect(() => { useEffect(() => {
// if (!isHello) { if (!isHello) {
// // 不再自动关闭键盘，让用户手动控制 // 不再自动关闭键盘，让用户手动控制
// // 这里可以添加其他需要在隐藏hello界面时执行的逻辑 // 这里可以添加其他需要在隐藏hello界面时执行的逻辑
// scrollToEnd(false); scrollToEnd(false);
// } }
// }, [isHello]); }, [isHello]);
useFocusEffect( useFocusEffect(
useCallback(() => { useCallback(() => {
@ -235,41 +236,41 @@ export default function AskScreen() {
); );
return ( return (
// <GestureDetector gesture={gesture}> <GestureDetector gesture={gesture}>
<View style={[styles.container, { paddingTop: insets.top, paddingBottom: insets.bottom }]}> <View style={[styles.container, { paddingTop: insets.top, paddingBottom: insets.bottom }]}>
{/* 导航栏 */} {/* 导航栏 */}
<View style={[styles.navbar, isHello && styles.hiddenNavbar]}> <View style={[styles.navbar, isHello && styles.hiddenNavbar]}>
<TouchableOpacity <TouchableOpacity
style={styles.backButton} style={styles.backButton}
onPress={() => { onPress={() => {
try { try {
if (TextInput.State?.currentlyFocusedInput) { if (TextInput.State?.currentlyFocusedInput) {
const input = TextInput.State.currentlyFocusedInput(); const input = TextInput.State.currentlyFocusedInput();
if (input) input.blur(); if (input) input.blur();
}
} catch (error) {
console.log('失去焦点失败:', error);
} }
} catch (error) { Keyboard.dismiss();
console.log('失去焦点失败:', error); router.push('/memo-list');
} }}
Keyboard.dismiss(); >
router.push('/memo-list'); <ReturnArrow />
}} </TouchableOpacity>
> <ThemedText style={styles.title} onPress={() => { router.push('/owner') }}>MemoWake</ThemedText>
<ReturnArrow /> <View style={styles.placeholder} />
</TouchableOpacity> </View>
<ThemedText style={styles.title} onPress={() => { router.push('/owner') }}>MemoWake</ThemedText>
<View style={styles.placeholder} />
</View>
<View style={styles.contentContainer}> <View style={styles.contentContainer}>
{/* 欢迎页面 */} {/* 欢迎页面 */}
<Animated.View <Animated.View
style={[styles.absoluteView, welcomeStyle, { zIndex: 1 }]} style={[styles.absoluteView, welcomeStyle, { zIndex: 1 }]}
> >
<AskHello setUserMessages={setUserMessages} setConversationId={setConversationId} setIsHello={setIsHello} /> <AskHello setUserMessages={setUserMessages} setConversationId={setConversationId} setIsHello={setIsHello} />
</Animated.View> </Animated.View>
{/* 聊天页面 */} {/* 聊天页面 */}
{/* <Animated.View {/* <Animated.View
style={[styles.absoluteView, chatStyle, { zIndex: 0 }]} style={[styles.absoluteView, chatStyle, { zIndex: 0 }]}
> >
<Chat <Chat
@ -284,25 +285,25 @@ export default function AskScreen() {
// onContentSizeChange={() => scrollToEnd()} // onContentSizeChange={() => scrollToEnd()}
/> />
</Animated.View> */} </Animated.View> */}
</View>
{/* 输入框区域 */}
<KeyboardAvoidingView
behavior={Platform.OS === "ios" ? "padding" : "height"}
keyboardVerticalOffset={0} >
<View style={styles.inputContainer} key={conversationId}>
<SendMessage
setIsHello={setIsHello}
conversationId={conversationId}
setConversationId={setConversationId}
setUserMessages={setUserMessages}
selectedImages={selectedImages}
setSelectedImages={setSelectedImages}
/>
</View> </View>
</KeyboardAvoidingView>
</View > {/* 输入框区域 */}
// </GestureDetector > <KeyboardAvoidingView
behavior={Platform.OS === "ios" ? "padding" : "height"}
keyboardVerticalOffset={0} >
<View style={styles.inputContainer} key={conversationId}>
<SendMessage
setIsHello={setIsHello}
conversationId={conversationId}
setConversationId={setConversationId}
setUserMessages={setUserMessages}
selectedImages={selectedImages}
setSelectedImages={setSelectedImages}
/>
</View>
</KeyboardAvoidingView>
</View >
</GestureDetector >
); );
} }