From b31a91f924fe9c54178dd13b0e4a48ec32b4b4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= <xuqinmin@bjca.org.cn>
Date: Mon, 27 Apr 2026 13:42:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20add=20member=20to=20group=20via=20UserS?=
 =?UTF-8?q?earch=20=E2=80=94=20pass=20addToGroupId=20param=20from=20GroupS?=
 =?UTF-8?q?ettings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/navigation/types.ts                   |  2 +-
 src/screens/contact/UserSearchScreen.tsx  | 34 +++++++++++++++--------
 src/screens/group/GroupSettingsScreen.tsx |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/navigation/types.ts b/src/navigation/types.ts
index d091e45..6649692 100644
--- a/src/navigation/types.ts
+++ b/src/navigation/types.ts
@@ -14,7 +14,7 @@ export type RootStackParams = {
   Main: undefined
   SingleChat: { targetId: string; targetName: string; targetAvatar?: string }
   GroupChat:  { groupId: string; groupName: string }
-  UserSearch: undefined
+  UserSearch: { addToGroupId?: string } | undefined
   GroupList:  undefined
   CreateGroup: undefined
   GroupMembers: { groupId: string; groupName: string }
diff --git a/src/screens/contact/UserSearchScreen.tsx b/src/screens/contact/UserSearchScreen.tsx
index 0bb8ee9..aad1fac 100644
--- a/src/screens/contact/UserSearchScreen.tsx
+++ b/src/screens/contact/UserSearchScreen.tsx
@@ -3,17 +3,20 @@ import {
   View, Text, TextInput, FlatList, StyleSheet, TouchableOpacity,
   SafeAreaView, ActivityIndicator, Alert, Image,
 } from 'react-native'
-import { useNavigation } from '@react-navigation/native'
-import type { NativeStackNavigationProp } from '@react-navigation/native-stack'
+import { useNavigation, useRoute } from '@react-navigation/native'
+import type { NativeStackNavigationProp, NativeStackScreenProps } from '@react-navigation/native-stack'
 import { ImSDK } from '@xuqm/rn-sdk'
 import { demoApi, type UserProfile } from '../../api/demo'
 import { load, save, K } from '../../utils/storage'
 import type { RootStackParams } from '../../navigation/types'
 
 type Nav = NativeStackNavigationProp<RootStackParams>
+type Props = NativeStackScreenProps<RootStackParams, 'UserSearch'>
 
 export default function UserSearchScreen() {
   const navigation = useNavigation<Nav>()
+  const route = useRoute<Props['route']>()
+  const addToGroupId = (route.params as any)?.addToGroupId as string | undefined
   const [keyword, setKeyword] = useState('')
   const [results, setResults] = useState<UserProfile[]>([])
   const [loading, setLoading] = useState(false)
@@ -37,15 +40,24 @@ export default function UserSearchScreen() {
   }, [])
 
   const addContact = async (user: UserProfile) => {
-    try {
-      await ImSDK.addFriend(user.userId)
-      const current = (await load<UserProfile[]>(K.CONTACTS)) ?? []
-      if (!current.find(c => c.userId === user.userId)) {
-        await save(K.CONTACTS, [...current, user])
+    if (addToGroupId) {
+      try {
+        await ImSDK.addGroupMember(addToGroupId, user.userId)
+        Alert.alert('已添加到群聊', undefined, [{ text: '确定', onPress: () => navigation.goBack() }])
+      } catch (e: any) {
+        Alert.alert('添加失败', e?.message ?? '请重试')
+      }
+    } else {
+      try {
+        await ImSDK.addFriend(user.userId)
+        const current = (await load<UserProfile[]>(K.CONTACTS)) ?? []
+        if (!current.find(c => c.userId === user.userId)) {
+          await save(K.CONTACTS, [...current, user])
+        }
+        Alert.alert('已添加为好友')
+      } catch {
+        Alert.alert('添加失败')
       }
-      Alert.alert('已添加为好友')
-    } catch {
-      Alert.alert('添加失败')
     }
   }
 
@@ -87,7 +99,7 @@ export default function UserSearchScreen() {
                 </View>
               </TouchableOpacity>
               <TouchableOpacity style={styles.addBtn} onPress={() => addContact(item)}>
-                <Text style={styles.addBtnText}>+ 添加</Text>
+                <Text style={styles.addBtnText}>{addToGroupId ? '加入群聊' : '+ 添加'}</Text>
               </TouchableOpacity>
             </View>
           )
diff --git a/src/screens/group/GroupSettingsScreen.tsx b/src/screens/group/GroupSettingsScreen.tsx
index b30d9cc..31a70dd 100644
--- a/src/screens/group/GroupSettingsScreen.tsx
+++ b/src/screens/group/GroupSettingsScreen.tsx
@@ -57,7 +57,7 @@ export default function GroupSettingsScreen({ route }: Props) {
         {isAdmin && (
           <>
             <View style={styles.sep} />
-            <Row label="添加成员" onPress={() => (nav as any).navigate('UserSearch')} />
+            <Row label="添加成员" onPress={() => (nav as any).navigate('UserSearch', { addToGroupId: groupId })} />
           </>
         )}
       </View>