@smart-link/rn-im 1.0.13 → 1.0.18

package/dist/components/ChatAvatar/ChatAvatarLocal.js

@@ -83,7 +83,8 @@ const ChatAvatarLocal = ({ fileId, size, name, defaultAvatar }) => {
     (0, react_2.useEffect)(() => {
         loadAvatar().then(_r => { });
     }, [fileId]);
-    if (ready && avatar) {
+    let hasCorrectAvatar = avatar ? avatar.indexOf("com.caih") > -1 || avatar.indexOf("http") > -1 : false;
+    if (ready && hasCorrectAvatar) {
         return (<LocalImage_1.default localPath={avatar} style={size ? { width: size, height: size, borderRadius: size / 2 } : { width: 40, height: 40, borderRadius: 20 }}/>);
     }
     else if (ready) {

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/dist/pages/conversation/setting/SettingChatBg.js

@@ -80,6 +80,10 @@ const SettingChatBg = ({ navigation }) => {
                 id: currentConversation.id,
                 imageBackground: fileId,
             }));
+            yield imManager.db.updateConversationById({
+                id: currentConversation.id,
+                imageBackground: fileId,
+            });
             // 更新本地资源存储
             yield imManager.updateResource({
                 url: fileId,

package/dist/pages/message/MessageList.js

@@ -55,6 +55,7 @@ const MessageList = ({ navigation }) => {
     const [targetMessageSeq, setTargetMessageSeq] = (0, react_1.useState)('');
     const [selectMessage, setSelectMessage] = (0, react_1.useState)();
     const [nativeEvent, setNativeEvent] = (0, react_1.useState)();
+    const [loading, setLoading] = (0, react_1.useState)(false);
     const isB2C = (currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.type) === im_base_1.ConversationType.B2C;
     (0, react_1.useEffect)(() => {
         console.log('[进入会话]: ', currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.name);
@@ -162,7 +163,9 @@ const MessageList = ({ navigation }) => {
 
             {tips && tips.type === im_base_1.TipsType.AT && (<MessageItemTips_1.default {...tips}/>)}
             <VideoPlayer_1.default />
-            <MessageOption_1.default visible={Boolean(selectMessage)} nativeEvent={nativeEvent} message={selectMessage} onClose={() => {
+            <MessageOption_1.default visible={Boolean(selectMessage)} nativeEvent={nativeEvent} message={selectMessage} setLoading={(value) => {
+            setLoading(value);
+        }} onClose={() => {
             setNativeEvent(undefined);
             setSelectMessage(undefined);
         }}/>
@@ -170,6 +173,13 @@ const MessageList = ({ navigation }) => {
             <MessagePictureAlbum_1.default visible={showAlbum} messages={messages} messageSeq={targetMessageSeq} onClose={() => {
             setShowAlbum(false);
         }}/>
+
+            {loading && (<react_native_1.View style={styles.loadingContainer}>
+                    <react_native_1.ActivityIndicator size="large" color="#FFFFFF"/>
+                </react_native_1.View>)}
         </rn_ui_1.NavigationPage>);
 };
+const styles = react_native_1.StyleSheet.create({
+    loadingContainer: Object.assign(Object.assign({}, react_native_1.StyleSheet.absoluteFillObject), { backgroundColor: 'rgba(0, 0, 0, 0.5)', justifyContent: 'center', alignItems: 'center', zIndex: 9999 }),
+});
 exports.default = MessageList;

package/dist/pages/message/components/MessageItem.js

@@ -51,7 +51,7 @@ const MessageItem = ({ isMultiple, multipleSelect, conversation, message, mine,
     const isC2C = (conversation === null || conversation === void 0 ? void 0 : conversation.type) === im_base_1.ConversationType.C2C;
     const isMultipleChecked = !!(multipleSelect === null || multipleSelect === void 0 ? void 0 : multipleSelect[message.messageSeq]);
     const notArrow = [im_base_1.PayloadType.PICTURE, im_base_1.PayloadType.VIDEO].includes(message.payloadType);
-    const isUndo = message.messageStatus === im_base_1.MessageStatus.UNDO;
+    const isUndo = message.messageStatus === im_base_1.MessageStatus.UNDO || message.payloadType === im_base_1.PayloadType.CONVERSATION_MESSAGE_UNDO;
     const isMessagePayload = !isB2C && !isNotify && !isUndo;
     return (<react_native_1.View style={styles.root} onLayout={(e) => {
             onLayoutItem(message, e);

package/dist/pages/message/components/MessageOption.d.ts

@@ -6,6 +6,7 @@ type MessageOptionProps = {
     visible: boolean;
     nativeEvent?: NativeTouchEvent;
     onClose: () => void;
+    setLoading: (loading: boolean) => void;
 };
-declare const _default: React.MemoExoticComponent<({ visible, message, nativeEvent, onClose }: MessageOptionProps) => React.JSX.Element | null>;
+declare const _default: React.MemoExoticComponent<({ visible, message, nativeEvent, onClose, setLoading }: MessageOptionProps) => React.JSX.Element | null>;
 export default _default;

package/dist/pages/message/components/MessageOption.js

@@ -52,7 +52,7 @@ const elements_1 = require("@react-navigation/elements");
 const useImSelector_1 = require("../../../hooks/useImSelector");
 const file_1 = require("../../../utils/file");
 const ReceiptBack_1 = require("../../../pages/message/components/ReceiptBack");
-const getMessageAction = (t, message, navigation) => {
+const getMessageAction = (t, message, navigation, setLoading) => {
     if (!message)
         return [];
     const actions = (0, im_base_1.getMessageActionKeys)(message.payloadType);
@@ -120,9 +120,12 @@ const getMessageAction = (t, message, navigation) => {
             onPress: () => __awaiter(void 0, void 0, void 0, function* () {
                 (0, common_action_sheet_1.ConfirmActionSheet)(t('confirmUndoMessage'), () => __awaiter(void 0, void 0, void 0, function* () {
                     try {
+                        setLoading(true);
                         yield (0, init_1.getImManager)().undoMessage(message);
+                        setLoading(false);
                     }
                     catch (e) {
+                        setLoading(false);
                         rn_ui_1.Toast.error(t('undoFail'));
                     }
                 }), t);
@@ -219,13 +222,13 @@ const renderOperations = (items, close) => {
         })}
         </react_native_1.View>);
 };
-const MessageOption = ({ visible, message, nativeEvent, onClose }) => {
+const MessageOption = ({ visible, message, nativeEvent, onClose, setLoading }) => {
     var _a;
     const { t } = (0, useTranslation_1.default)();
     const headerHeight = (0, elements_1.useHeaderHeight)();
     const { messageBarHeight } = (0, useImSelector_1.usePanel)();
     const navigation = (0, rn_ui_1.useNavigation)();
-    const items = getMessageAction(t, message, navigation);
+    const items = getMessageAction(t, message, navigation, setLoading);
     const translateX = (0, react_1.useRef)(new react_native_1.Animated.Value(0)).current;
     const translateY = (0, react_1.useRef)(new react_native_1.Animated.Value(0)).current;
     const scale = (0, react_1.useRef)(new react_native_1.Animated.Value(0)).current;

package/dist/pages/message/components/MessagePictureAlbum.js

@@ -72,7 +72,7 @@ const MessagePictureAlbum = ({ visible, onClose, messages, messageSeq }) => {
             {visible && (<react_native_1.View style={styles.root}>
                     {react_native_1.Platform.OS === 'android' && <react_native_1.StatusBar backgroundColor={'#000'}/>}
                     <react_native_1.View style={{ width: width, height: height }}>
-                        <rn_ui_1.AlbumView images={sources} defaultIndex={index}/>
+                        <rn_ui_1.AlbumView images={sources} defaultIndex={index} onClose={onClose}/>
                     </react_native_1.View>
 
                     <react_native_1.TouchableOpacity style={styles.cancel} onPress={handleClose}>

package/dist/pages/message/components/Payload/PayloadNotify.js

@@ -48,6 +48,10 @@ const MemberRemove = ({ payload }) => {
     const { t } = (0, useTranslation_1.default)();
     return <react_native_1.Text style={styles.text}>{t('chatGroupRemoveMember', { content: payload.names.join('、') })}</react_native_1.Text>;
 };
+const MemberBeenRemove = ({ payload }) => {
+    const { t } = (0, useTranslation_1.default)();
+    return <react_native_1.Text style={styles.text}>{t('chatGroupBeenRemoveMember')}</react_native_1.Text>;
+};
 const MemberLeave = ({ payload }) => {
     const { t } = (0, useTranslation_1.default)();
     return <react_native_1.Text style={styles.text}>{t('chatGroupMemberLeave', { userName: payload.userName })}</react_native_1.Text>;
@@ -73,6 +77,9 @@ const PayloadNotify = ({ payload, payloadType }) => {
         case im_base_1.PayloadType.GROUP_MEMBER_REMOVE_NOTICE:
             content = <MemberRemove payload={payload}/>;
             break;
+        case im_base_1.PayloadType.GROUP_MEMBER_BEEN_REMOVED:
+            content = <MemberBeenRemove payload={payload}/>;
+            break;
         case im_base_1.PayloadType.GROUP_INVITE_VALIDATE_SWITCH:
             content = <GroupInviteSwitch payload={payload}/>;
             break;

package/dist/pages/message/components/messageBar/OptionPanel.js

@@ -123,12 +123,12 @@ const OptionPanel = (0, react_1.forwardRef)((props, ref) => {
             const fileInfo = files[0];
             console.log('chooseFile: ', fileInfo);
             if (!fileInfo.uri) {
-                rn_ui_1.Toast.error('获取文件路径失败');
+                rn_ui_1.Toast.error(t("failedToObtainFilePath"));
                 return;
             }
             const ext = (0, file_1.getExtensionFromMime)(fileInfo.type);
             if (!ext) {
-                rn_ui_1.Toast.error('不支持的文件类型');
+                rn_ui_1.Toast.error(t("unsupportedFileTypes"));
                 return;
             }
             if (!fileInfo.name.endsWith(ext)) {

package/dist/pages/search/components/SearchPictures.js

@@ -48,15 +48,54 @@ const im_base_1 = require("@smart-link/im-base");
 const useTranslation_1 = __importDefault(require("../../../hooks/useTranslation"));
 const MessagePictureAlbum_1 = __importDefault(require("../../../pages/message/components/MessagePictureAlbum"));
 const useSearchMessage_1 = require("../../../pages/search/components/useSearchMessage");
+const video_action_1 = require("../../../slice/video/video.action");
 const numColumns = 4;
 const { width } = react_native_1.Dimensions.get('window');
 const SearchPictures = ({ conversationId, multiple }) => {
-    const { data, onLoadMore, reload } = (0, useSearchMessage_1.useSearchMessage)({
+    // 分别获取图片和视频数据
+    const { data: pData, onLoadMore: onLoadMorePictures, reload: reloadPictures, } = (0, useSearchMessage_1.useSearchMessage)({
         keyword: '',
         conversationId,
         payloadType: 'picture',
         normalData: false,
     });
+    const { data: vData, onLoadMore: onLoadMoreVideos, reload: reloadVideos, } = (0, useSearchMessage_1.useSearchMessage)({
+        keyword: '',
+        conversationId,
+        payloadType: 'video',
+        normalData: false,
+    });
+    // 合并数据并按时间排序（最新在前）
+    const data = [...pData, ...vData].sort((a, b) => {
+        return new Date(b.messageTime).getTime() - new Date(a.messageTime).getTime();
+    });
+    // 正确合并加载更多功能
+    const onLoadMore = () => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield Promise.all([
+                onLoadMorePictures(),
+                onLoadMoreVideos()
+            ]);
+        }
+        catch (error) {
+            console.error('加载更多失败:', error);
+            // 可以添加错误处理逻辑
+        }
+    });
+    // 正确合并刷新功能
+    const reload = () => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield Promise.all([
+                reloadPictures(),
+                reloadVideos()
+            ]);
+        }
+        catch (error) {
+            console.error('刷新失败:', error);
+            // 可以添加错误处理逻辑
+        }
+    });
+    // ...其他代码保持不变
     const [checkedIds, setCheckedIds] = (0, react_1.useState)([]);
     const navigation = (0, rn_ui_1.useNavigation)();
     const { t } = (0, useTranslation_1.default)();
@@ -166,15 +205,38 @@ const SearchPictures = ({ conversationId, multiple }) => {
                             });
                         }
                         else {
-                            // 预览图片
-                            setPreview({
-                                visible: true,
-                                messages: [message],
-                                messageSeq: message.messageSeq
-                            });
+                            // 根据类型处理预览
+                            if (message.payloadType === im_base_1.PayloadType.PICTURE) {
+                                // 预览图片
+                                setPreview({
+                                    visible: true,
+                                    messages: [message],
+                                    messageSeq: message.messageSeq
+                                });
+                            }
+                            else if (message.payloadType === im_base_1.PayloadType.VIDEO) {
+                                // 播放视频
+                                (0, init_1.getImManager)().store.dispatch((0, video_action_1.loadVideoPlayer)({
+                                    messageSeq: message.messageSeq,
+                                    payload: message.payload
+                                }));
+                            }
                         }
                     }}>
-                                        <CachedImage_1.default style={styles.img} localPath={message.payload.localPath} fileId={message.payload.fileId}/>
+                                        {/* 媒体内容容器 */}
+                                        <react_native_1.View style={styles.mediaContainer}>
+                                            {message.payloadType === im_base_1.PayloadType.PICTURE ? (
+                    // 图片展示
+                    <CachedImage_1.default style={styles.img} localPath={message.payload.localPath} fileId={message.payload.fileId}/>) : (
+                    // 视频展示
+                    <>
+                                                    <CachedImage_1.default style={styles.img} localPath={message.payload.localPath} fileId={message.payload.fileId}/>
+                                                    {/* 视频播放图标 */}
+                                                    <react_native_1.View style={styles.playIcon}>
+                                                        <react_native_1.Text style={styles.playIconText}>▶</react_native_1.Text>
+                                                    </react_native_1.View>
+                                                </>)}
+                                        </react_native_1.View>
                                     </react_native_1.TouchableOpacity>
                                     <react_native_1.View style={styles.checkbox}>
                                         {multiple && (<rn_ui_1.Checkbox style={{ pointerEvents: 'none' }} checked={checkedIds.includes(message.messageSeq)} size='s'/>)}
@@ -216,5 +278,28 @@ const styles = react_native_1.StyleSheet.create({
         top: 0,
         right: 0,
     },
+    mediaContainer: {
+        position: 'relative',
+        width: '100%',
+        height: '100%',
+    },
+    playIcon: {
+        position: 'absolute',
+        top: '50%',
+        left: '50%',
+        transform: [{ translateX: -15 }, { translateY: -15 }],
+        width: 30,
+        height: 30,
+        borderRadius: 15,
+        backgroundColor: 'rgba(0, 0, 0, 0.5)',
+        justifyContent: 'center',
+        alignItems: 'center',
+    },
+    playIconText: {
+        color: 'white',
+        fontSize: 16,
+        fontWeight: 'bold',
+        marginLeft: 2, // 让播放图标稍微右移，看起来更居中
+    },
 });
 exports.default = exports.SearchPictures;

package/dist/utils/file.js

@@ -248,6 +248,10 @@ const extensions = {
     'application/x-tar': '.tar',
     'application/x-7z-compressed': '.7z',
     'application/x-rar-compressed': '.rar',
+    // 安卓包
+    'application/octet-stream': '.apk',
+    'application/vnd.android.package-archive': '.apk',
+    'application/x-apk': '.apk',
 };
 function getExtensionFromMime(mime) {
     return extensions[mime] || '';

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@smart-link/rn-im",
-  "version": "1.0.13",
+  "version": "1.0.18",
   "description": "",
   "main": "./dist/index.js",
   "dependencies": {
     "color": "^5.0.0",
     "lodash-es": "^4.17.21",
     "emoji-regex": "^10.4.0",
-    "@smart-link/im-base": "^1.0.13"
+    "@smart-link/im-base": "^1.0.16"
   },
   "devDependencies": {
     "@react-native/eslint-config": "0.73.2",