diff --git a/app/(tabs)/ask.tsx b/app/(tabs)/ask.tsx index 68d42d9..3ac0086 100644 --- a/app/(tabs)/ask.tsx +++ b/app/(tabs)/ask.tsx @@ -255,7 +255,7 @@ export default function AskScreen() { {/* 导航栏 */} - + { @@ -273,11 +273,11 @@ export default function AskScreen() { > - { router.push('/owner') }}>MemoWake + { router.push('/owner') }}>MemoWake - + {/* 欢迎页面 */} - + + + diff --git a/components/ask/hello.tsx b/components/ask/hello.tsx index 47b8db9..8f7acba 100644 --- a/components/ask/hello.tsx +++ b/components/ask/hello.tsx @@ -1,10 +1,9 @@ -import IP from "@/assets/icons/svg/ip.svg"; import { ThemedText } from "@/components/ThemedText"; import { webSocketManager } from "@/lib/websocket-util"; import { Message } from "@/types/ask"; import { Dispatch, SetStateAction } from "react"; import { useTranslation } from "react-i18next"; -import { ScrollView, StyleSheet, TouchableOpacity, View } from 'react-native'; +import { Dimensions, Image, ScrollView, StyleSheet, TouchableOpacity, View } from 'react-native'; import { createNewConversation } from "./utils"; interface AskHelloProps { @@ -14,6 +13,8 @@ interface AskHelloProps { } export default function AskHello({ setUserMessages, setConversationId, setIsHello }: AskHelloProps) { const { t } = useTranslation(); + const width = Dimensions.get('window').width; + const height = Dimensions.get('window').height; const handleCase = async (text: string) => { setIsHello(false); @@ -50,7 +51,7 @@ export default function AskHello({ setUserMessages, setConversationId, setIsHell - - + + - + {t('ask.ready', { ns: 'ask' })} {"\n"} {t('ask.justAsk', { ns: 'ask' })} @@ -110,10 +111,12 @@ const styles = StyleSheet.create({ marginTop: 16 }, case: { - borderWidth: 2, - borderColor: "#FFB645", - borderRadius: 24, + borderWidth: 1, + borderColor: "#AC7E35", + borderRadius: 10, paddingHorizontal: 8, - width: 'auto' + width: 'auto', + fontSize: 14, + color: "#4C320C" } }) \ No newline at end of file diff --git a/components/ask/send.tsx b/components/ask/send.tsx index 08effe9..3125502 100644 --- a/components/ask/send.tsx +++ b/components/ask/send.tsx @@ -265,13 +265,14 @@ export default function SendMessage(props: Props) { returnKeyType="send" /> - - - + @@ -288,15 +289,18 @@ const styles = StyleSheet.create({ borderWidth: 2, display: 'flex', flexDirection: 'row', - gap: 5 + gap: 5, + // backgroundColor: '#F8F8F8' }, container: { justifyContent: 'center', backgroundColor: '#transparent', }, input: { - borderColor: '#FF9500', + // borderColor: '#d9d9d9', + borderColor: '#AC7E35', borderWidth: 1, + // borderRadius: 18, borderRadius: 25, paddingHorizontal: 20, paddingVertical: 13, diff --git a/i18n/locales/en/ask.json b/i18n/locales/en/ask.json index 8278354..eaf2f72 100644 --- a/i18n/locales/en/ask.json +++ b/i18n/locales/en/ask.json @@ -14,9 +14,9 @@ "refresh": "Refresh", "error": "have some error", "issue": "have some issue", - "case1": "Find last year's baby/pet material", - "case2": "Find last year's food", - "case3": "Find recent travel material", + "case1": "Find last year’s baby moments", + "case2": "Pet moments", + "case3": "Show me my food memories in France with family", "mediaAuth": "need album permission", "mediaAuthDesc": "allow app to access album to save media files", "saveSuccess": "save success",