@smart-link/rn-im 1.0.16 → 1.0.18

package/dist/pages/conversation/components/ConversationCard.js

@@ -35,6 +35,7 @@ const MaterialIcons_1 = __importDefault(require("react-native-vector-icons/Mater
 const ChatAvatar_1 = __importDefault(require("../../../components/ChatAvatar/ChatAvatar"));
 const useFormatMsgTime_1 = __importDefault(require("../../../hooks/useFormatMsgTime"));
 const useTranslation_1 = __importDefault(require("../../../hooks/useTranslation"));
+const init_1 = require("../../../init");
 const ConversationCard = (0, react_1.memo)(props => {
     const { status, selected, conversation, onPressCard, onLongPressCard } = props;
     const { t } = (0, useTranslation_1.default)();
@@ -45,6 +46,12 @@ const ConversationCard = (0, react_1.memo)(props => {
     const content = (0, im_base_1.getConversationContent)(text, errorText, draftText, tipsList, countText, t);
     const contentStyles = content.tips ? styles.contentRedStyles : null;
     const formatTime = (0, useFormatMsgTime_1.default)(time, true);
+    const imManager = (0, init_1.getImManager)();
+    // 还没找到为啥会让空的头像的人变成登录人的头像，先解决表面问题
+    let newAvatars = avatars;
+    if (avatars === imManager.user.avatars && name !== imManager.user.userName) {
+        newAvatars = "";
+    }
     return (<react_native_1.TouchableOpacity activeOpacity={0.5} style={[styles.card, enableTopStyles, selected && styles.selected]} onPress={() => {
             onPressCard && onPressCard(conversation);
         }} onLongPress={({ nativeEvent }) => {
@@ -52,7 +59,7 @@ const ConversationCard = (0, react_1.memo)(props => {
         }}>
             <react_native_1.View style={{ height: (0, rn_ui_1.dp)(50), width: (0, rn_ui_1.dp)(50), marginRight: (0, rn_ui_1.dp)(16) }}>
                 <rn_ui_1.Badge text={unreadCount} dot={showPoint}>
-                    <ChatAvatar_1.default disabled type={type} id={id} size={(0, rn_ui_1.dp)(48)} name={name} url={avatars}/>
+                    <ChatAvatar_1.default disabled type={type} id={id} size={(0, rn_ui_1.dp)(48)} name={name} url={newAvatars}/>
                 </rn_ui_1.Badge>
                 {status === 'online' && <react_native_1.View style={styles.status}>
                     <MaterialIcons_1.default size={(0, rn_ui_1.dp)(14)} color={status === 'online' ? '#4caf50' : '#616161'} name={status === 'online' ? 'check-circle' : 'not-interested'}/>

package/dist/pages/conversation/setting/OptionGroupMoreMember.js

@@ -62,12 +62,23 @@ const OptionGroupMoreMember = (props) => {
             </react_native_1.TouchableOpacity>);
     };
     const list = (0, react_1.useMemo)(() => {
-        return allMembers.slice().reverse().filter((item) => {
+        const allMembersData = allMembers.slice().reverse().filter((item) => {
             if (keyword) {
                 return item.memberName.indexOf(keyword) > -1;
             }
             return true;
         });
+        // 让群主在第一个
+        let dealData = allMembersData;
+        const ownerIndex = dealData.findIndex(m => m.memberLevel === "owner");
+        if (ownerIndex > 0) {
+            dealData = [
+                allMembersData[ownerIndex],
+                ...allMembersData.slice(0, ownerIndex),
+                ...allMembersData.slice(ownerIndex + 1) // 群主之后的成员
+            ];
+        }
+        return dealData;
     }, [allMembers, keyword]);
     return (<rn_ui_1.NavigationPage noPadding>
             <rn_ui_1.SearchInput value={keyword} onChange={(txt) => {

package/dist/pages/conversation/setting/Setting.js

@@ -22,7 +22,7 @@ const { LIAISON } = im_base_1.GroupType;
 // 最大显示人数
 const MAX_SHOW_MEMBER_COUNT = 23;
 const ConversationSetting = ({ navigation }) => {
-    var _a;
+    var _a, _b;
     const { t } = (0, useTranslation_1.default)();
     const { currentConversation } = (0, useImSelector_1.useConversation)();
     const { groupDetail } = (0, useImSelector_1.useChatGroup)();
@@ -136,7 +136,7 @@ const ConversationSetting = ({ navigation }) => {
                 </>);
             break;
         case im_base_1.ConversationType.C2G:
-            const avatarList = groupMemberList
+            let avatarList = groupMemberList
                 .map(item => {
                 var _a;
                 return {
@@ -147,6 +147,23 @@ const ConversationSetting = ({ navigation }) => {
                 };
             })
                 .splice(0, MAX_SHOW_MEMBER_COUNT);
+            let fMaster = groupMemberList.find(item => item.memberLevel === OWNER);
+            // 假设 fMaster 是要插入的对象，且它有一个唯一标识，比如 userId
+            if (fMaster) {
+                const fMasterWithRequiredFields = {
+                    userId: fMaster.userId,
+                    userName: (_b = fMaster.memberName) !== null && _b !== void 0 ? _b : '',
+                    avatars: fMaster.memberAvatars,
+                    memberLevel: fMaster.memberLevel,
+                };
+                // 先移除已存在的群主
+                const existingIndex = avatarList.findIndex(item => item.userId === (fMaster === null || fMaster === void 0 ? void 0 : fMaster.userId));
+                if (existingIndex > -1) {
+                    avatarList.splice(existingIndex, 1);
+                }
+                // 插入群主
+                avatarList.unshift(fMasterWithRequiredFields);
+            }
             content = (<>
                     <OptionAvatars_1.default list={avatarList} showTitle memberTotalCount={memberTotalCount} showAdd showMore={isMgr ? avatarList.length > 8 : avatarList.length > 9} isMgr={isMgr} addUser={() => {
                     // 添加成员

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart-link/rn-im",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "",
   "main": "./dist/index.js",
   "dependencies": {