@smart-link/rn-im 1.0.21 → 1.0.23

package/dist/default-assets.js

@@ -14,7 +14,7 @@ exports.defaultAvatars = {
 exports.receiptStatus = {
     [im_base_1.MessageStatus.READ]: require('../assets/hook-blue-double.png'),
     [im_base_1.MessageStatus.ARRIVED]: require('../assets/hook-black-double.png'),
-    [im_base_1.MessageStatus.EMITTED]: require('../assets/hook-black-double.png'),
+    [im_base_1.MessageStatus.EMITTED]: require('../assets/hook-black.png'),
 };
 exports.messageBackupImg = {
     cloud: require('../assets/cloud-backup.png'),

package/dist/hooks/useDownloadSource.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDownloadImgSource = void 0;
 const react_1 = require("react");
 const init_1 = require("../init");
-function useDownload({ fileId, localPath, filename }) {
+function useDownload({ fileId, localPath, filename, resourceType }) {
     const [local, setLocal] = (0, react_1.useState)(localPath);
     (0, react_1.useEffect)(() => {
         let cancel = false;
@@ -27,7 +27,7 @@ function useDownload({ fileId, localPath, filename }) {
                 const file = yield imManager.download({
                     fileId,
                     filename: filename || fileId,
-                    resourceType: 'file',
+                    resourceType,
                 });
                 yield imManager.updateResource({
                     url: fileId,

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

@@ -35,7 +35,6 @@ 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)();
@@ -46,12 +45,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 = "";
-    }
+    // const imManager = 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 }) => {
@@ -59,7 +58,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={newAvatars}/>
+                    <ChatAvatar_1.default disabled type={type} id={id} size={(0, rn_ui_1.dp)(48)} name={name} url={avatars}/>
                 </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/message/MessageList.js

@@ -48,7 +48,7 @@ const MessageList = ({ navigation }) => {
     const { t } = (0, useTranslation_1.default)();
     const messageListRef = (0, react_1.useRef)(null);
     const { currentConversation } = (0, useImSelector_1.useConversation)();
-    const { messages, rangeList, quote, tips, isMultiple, multipleSelect } = (0, useImSelector_1.useMessage)();
+    const { messages, rangeList, quote, tips, isMultiple, multipleSelect, isSearch } = (0, useImSelector_1.useMessage)();
     const { user } = (0, useImSelector_1.useAuth)();
     const bar = (0, react_1.useRef)(null);
     const [showAlbum, setShowAlbum] = (0, react_1.useState)(false);
@@ -85,10 +85,11 @@ const MessageList = ({ navigation }) => {
                 imManager.store.dispatch(im_base_1.MessagePanelActions.cancelMultipleSelect());
             }
             else {
-                console.log('[离开会话]: ');
-                imManager.store.dispatch(im_base_1.MessagePanelActions.saveDraftText(imManager));
                 react_native_1.InteractionManager.runAfterInteractions(() => {
+                    console.log('[离开会话]: ');
+                    imManager.store.dispatch(im_base_1.MessagePanelActions.saveDraftText(imManager));
                     imManager.leaveConversation();
+                    imManager.store.dispatch(im_base_1.MessageActions.resetState());
                 });
             }
         });
@@ -100,6 +101,13 @@ const MessageList = ({ navigation }) => {
         (0, init_1.getImManager)().setFlatListRef(messageListRef);
         (0, init_1.getImManager)().setInputRef(bar);
     }, []);
+    (0, react_1.useEffect)(() => {
+        var _a;
+        if (isSearch) {
+            (_a = messageListRef.current) === null || _a === void 0 ? void 0 : _a.scrollToOffset({ animated: false, offset: 0 });
+            (0, init_1.getImManager)().store.dispatch(im_base_1.MessageActions.setIsSearch(false));
+        }
+    }, [isSearch]);
     const onLongPressPopover = (0, react_1.useCallback)((message, nativeEvent) => {
         setNativeEvent(nativeEvent);
         setSelectMessage(message);

package/dist/pages/message/MessageRecord.js

@@ -32,15 +32,39 @@ const rn_ui_1 = require("@smart-link/rn-ui");
 const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const MessagePayload_1 = __importDefault(require("./components/MessagePayload"));
+const MessagePictureAlbum_1 = __importDefault(require("./components/MessagePictureAlbum"));
+const lodash_es_1 = require("lodash-es");
 const MessageRecord = ({ navigation, route: { params } }) => {
-    const { messages, title } = params;
+    const { messages, messageSeq, title } = params;
     (0, react_1.useEffect)(() => {
         navigation.setOptions({
             title,
         });
     }, [navigation, title]);
+    const [updateMessages, setUpdateMessages] = react_1.default.useState([]);
+    const [previewMessages, setPreviewMessages] = react_1.default.useState([]);
+    const [showAlbum, setShowAlbum] = react_1.default.useState(false);
+    const [targetMessageSeq, setTargetMessageSeq] = react_1.default.useState('');
+    (0, react_1.useEffect)(() => {
+        setUpdateMessages((0, lodash_es_1.cloneDeep)(messages));
+    }, [messages]);
+    const onPress = (item) => {
+        var _a;
+        // console.log('MessageRecord: ', item);
+        if (((_a = item.payload.quote) === null || _a === void 0 ? void 0 : _a.quoteMessage.payloadType) === 'picture') {
+            setShowAlbum(true);
+            setTargetMessageSeq(item.payload.quote.quoteMessage.messageSeq);
+            setPreviewMessages([item.payload.quote.quoteMessage]);
+            return;
+        }
+        if (item.payloadType === 'picture') {
+            setShowAlbum(true);
+            setTargetMessageSeq(item.messageSeq);
+            setPreviewMessages(updateMessages);
+        }
+    };
     return (<rn_ui_1.NavigationPage noPadding>
-            <react_native_1.FlatList contentContainerStyle={styles.list} data={messages} renderItem={({ item, index }) => {
+            <react_native_1.FlatList contentContainerStyle={styles.list} data={updateMessages} renderItem={({ item, index }) => {
             const isSamePerson = index > 0 && messages[index - 1].messageFrom === item.messageFrom;
             return (<react_native_1.View style={styles.messageItem}>
                             <react_native_1.View style={styles.avatar}>
@@ -51,9 +75,19 @@ const MessageRecord = ({ navigation, route: { params } }) => {
                                     <react_native_1.Text style={styles.usernameText}>{item.messageFromName}</react_native_1.Text>
                                     <FormatTimeText_1.default style={styles.timeText} time={item.messageTime}></FormatTimeText_1.default>
                                 </react_native_1.View>
-                                <MessagePayload_1.default {...item} showArrow={false}/>
+                                <MessagePayload_1.default {...item} isRecord direction="left" showArrow={false} onPress={() => {
+                    onPress(item);
+                }} onLoad={(localPath) => {
+                    console.log('localPath: ', localPath);
+                    if (!item.payload.localPath) {
+                        item.payload.localPath = localPath;
+                    }
+                }}/>
                             </react_native_1.View>
                         </react_native_1.View>);
+        }}/>
+            <MessagePictureAlbum_1.default visible={showAlbum} messages={previewMessages} messageSeq={targetMessageSeq} onClose={() => {
+            setShowAlbum(false);
         }}/>
         </rn_ui_1.NavigationPage>);
 };

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

@@ -74,7 +74,7 @@ const MessageItem = ({ isMultiple, multipleSelect, conversation, message, mine,
                 },
             ]}>
                         {mine && isMultiple && (<rn_ui_1.Checkbox checked={isMultipleChecked} style={[styles.multipleCheckbox]}/>)}
-                        <ChatAvatar_1.default name={message.messageFromName} id={message.messageFrom} url={message.payload.avatars} size={(0, rn_ui_1.dp)(40)}/>
+                        <ChatAvatar_1.default name={message.messageFromName} id={message.messageFrom} size={(0, rn_ui_1.dp)(40)}/>
                         <react_native_1.View style={[
                 {
                     alignContent: 'flex-end',

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

@@ -7,8 +7,10 @@ export interface MessagePayloadProps extends IMessage {
     style?: StyleProp<ViewStyle>;
     direction?: 'left' | 'right';
     showArrow?: boolean;
+    isRecord?: boolean;
     onPress?: (e: GestureResponderEvent) => void;
     onLongPress?: (e: GestureResponderEvent) => void;
+    onLoad?: (localPath: string) => void;
 }
 declare const _default: React.NamedExoticComponent<MessagePayloadProps>;
 export default _default;

package/dist/pages/message/components/Payload/PayloadFile.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { PayloadProps } from './type';
-declare const _default: React.MemoExoticComponent<({ payload, messageSeq, direction, showArrow, messageStatus, sendSize, style, onLongPress }: PayloadProps) => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ payload, messageSeq, direction, showArrow, isRecord, messageStatus, sendSize, style, onLongPress }: PayloadProps) => React.JSX.Element>;
 export default _default;

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

@@ -46,7 +46,7 @@ const init_1 = require("../../../../init");
 const PayloadWrapper_1 = __importDefault(require("./PayloadWrapper"));
 const file_icon_1 = require("../../../../utils/file-icon");
 const useTranslation_1 = __importDefault(require("../../../../hooks/useTranslation"));
-const PayloadFile = ({ payload, messageSeq, direction, showArrow = true, messageStatus, sendSize, style, onLongPress }) => {
+const PayloadFile = ({ payload, messageSeq, direction, showArrow = true, isRecord, messageStatus, sendSize, style, onLongPress }) => {
     const ext = payload.filename.split('.').pop();
     const Icon = (0, file_icon_1.findSvgIcon)(ext);
     const path = (0, react_1.useRef)('');
@@ -64,15 +64,10 @@ const PayloadFile = ({ payload, messageSeq, direction, showArrow = true, message
             rn_ui_1.Toast.warning(t('fileOpenFail'));
         }
     });
-    return (<PayloadWrapper_1.default direction={direction} showArrow={showArrow} onLongPress={onLongPress} style={[style, styles.file]} onPress={() => __awaiter(void 0, void 0, void 0, function* () {
-            if (payload.localPath || path.current) {
-                yield openWithLocal((payload.localPath || path.current));
-            }
-            else if (payload.fileId) {
-                if (downloading.current)
-                    return;
-                downloading.current = true;
-                const imManager = (0, init_1.getImManager)();
+    const pressFile = () => __awaiter(void 0, void 0, void 0, function* () {
+        const imManager = (0, init_1.getImManager)();
+        const download = () => __awaiter(void 0, void 0, void 0, function* () {
+            try {
                 const localPath = yield imManager.download({
                     fileId: payload.fileId,
                     resourceType: 'file',
@@ -90,13 +85,49 @@ const PayloadFile = ({ payload, messageSeq, direction, showArrow = true, message
                     status: 'done',
                 });
                 path.current = localPath;
-                (0, init_1.getImManager)().db.updateMessage({
-                    messageSeq,
-                    payload: Object.assign(Object.assign({}, payload), { localPath: localPath }),
+                return localPath;
+            }
+            catch (e) {
+                rn_ui_1.Toast.error(t('downloadError'));
+                setDownload({
+                    progress: 0,
+                    status: 'pending',
                 });
+                throw e;
+            }
+        });
+        if (isRecord) {
+            // 聊天记录中的文件
+            // 需要从缓存中获取
+            let localPath = yield imManager.loadResourceFromCache(payload.fileId);
+            if (localPath) {
                 yield openWithLocal(localPath);
+                return;
             }
-        })}>
+            if (downloading.current)
+                return;
+            downloading.current = true;
+            localPath = yield download();
+            imManager.updateResource({ url: payload.fileId, localPath });
+            yield openWithLocal(localPath);
+            return;
+        }
+        if (payload.localPath || path.current) {
+            yield openWithLocal((payload.localPath || path.current));
+        }
+        else if (payload.fileId) {
+            if (downloading.current)
+                return;
+            downloading.current = true;
+            const localPath = yield download();
+            (0, init_1.getImManager)().db.updateMessage({
+                messageSeq,
+                payload: Object.assign(Object.assign({}, payload), { localPath: localPath }),
+            });
+            yield openWithLocal(localPath);
+        }
+    });
+    return (<PayloadWrapper_1.default direction={direction} showArrow={showArrow} onLongPress={onLongPress} style={[style, styles.file]} onPress={pressFile}>
             <react_native_1.View style={{ flexDirection: 'row', alignItems: 'center' }}>
                 <Icon style={styles.fileIcon}/>
                 <react_native_1.View style={{ flex: 1 }}>
@@ -114,7 +145,7 @@ const styles = react_native_1.StyleSheet.create({
         alignItems: 'center',
         padding: (0, rn_ui_1.dp)(6),
         borderRadius: (0, rn_ui_1.dp)(8),
-        width: react_native_1.Dimensions.get('window').width * 0.6,
+        width: react_native_1.Dimensions.get('window').width * 0.75,
     },
     fileIcon: {
         marginRight: (0, rn_ui_1.dp)(8),

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

@@ -35,7 +35,7 @@ const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const PayloadWrapper_1 = __importDefault(require("./PayloadWrapper"));
 const { width } = react_native_1.Dimensions.get('window');
-const PayloadMultiple = (0, react_1.memo)(({ payload, direction, showArrow = true, style, onLongPress }) => {
+const PayloadMultiple = (0, react_1.memo)(({ payload, messageSeq, direction, showArrow = true, style, onLongPress }) => {
     const navigation = (0, rn_ui_1.useNavigation)();
     const { type, toName, fromName, selectedMessages } = payload;
     const { t } = (0, useTranslation_1.default)();
@@ -46,6 +46,7 @@ const PayloadMultiple = (0, react_1.memo)(({ payload, direction, showArrow = tru
         : t('multipleChatRecordTitleGroup');
     return (<PayloadWrapper_1.default direction={direction} showArrow={showArrow} style={[style, styles.wrap]} onPress={() => {
             navigation.navigate('MessageRecord', {
+                messageSeq,
                 messages: selectedMessages,
                 title,
             });

package/dist/pages/message/components/Payload/PayloadPicture.d.ts

@@ -1,7 +1,4 @@
-import { IPayload } from '@smart-link/im-base';
 import React from 'react';
-type PayloadPictureProps = {
-    payload: IPayload;
-};
-declare const _default: React.MemoExoticComponent<({ payload, ...retProps }: PayloadPictureProps) => React.JSX.Element>;
+import { PayloadProps } from "./type";
+declare const _default: React.MemoExoticComponent<({ payload, onLoad, ...retProps }: PayloadProps) => React.JSX.Element>;
 export default _default;

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

@@ -40,27 +40,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const react_native_svg_1 = require("react-native-svg");
-const file_1 = require("../../../../api/file");
 const golden_rectangle_1 = require("../../../../utils/golden-rectangle");
 const styles_1 = require("../../../../components/styles");
 const rn_ui_1 = require("@smart-link/rn-ui");
 const PayloadWrapper_1 = __importDefault(require("./PayloadWrapper"));
 const react_native_fast_image_1 = __importDefault(require("react-native-fast-image"));
+const useDownloadSource_1 = __importDefault(require("../../../../hooks/useDownloadSource"));
+const file_1 = require("../../../../utils/file");
 const { width: screenWidth } = react_native_1.Dimensions.get('window');
 const PayloadPicture = (_a) => {
-    var { payload } = _a, retProps = __rest(_a, ["payload"]);
+    var { payload, onLoad } = _a, retProps = __rest(_a, ["payload", "onLoad"]);
     const ext = payload.filename.split('.').pop();
-    const src = payload.localPath ? { uri: 'file://' + payload.localPath } : payload.fileId ? { uri: (0, file_1.getDownloadUrl)(payload.fileId) } : { uri: '' };
+    const localPath = (0, useDownloadSource_1.default)(payload);
+    (0, react_1.useEffect)(() => {
+        if (localPath) {
+            onLoad === null || onLoad === void 0 ? void 0 : onLoad(localPath);
+        }
+    }, [onLoad, localPath]);
     const size = (0, golden_rectangle_1.calculate)(payload.height || (0, rn_ui_1.dp)(163), payload.width || (0, rn_ui_1.dp)(100), 200);
-    if (!payload.localPath && !payload.fileId) {
+    if (!localPath) {
         return <react_native_1.View style={[styles_1.borderStyle, size, { alignItems: 'center', justifyContent: 'center', backgroundColor: 'rgba(0,0,0, 0.8)' }]}/>;
     }
     let content;
     if (/svg/i.test(ext)) {
-        content = <react_native_svg_1.SvgFromUri style={[styles_1.borderStyle]} uri={src.uri} viewBox={'0 0 1024 1024'} width={screenWidth * 0.4} height={screenWidth * 0.4}/>;
+        content = <react_native_svg_1.SvgFromUri style={[styles_1.borderStyle]} uri={localPath} viewBox={'0 0 1024 1024'} width={screenWidth * 0.4} height={screenWidth * 0.4}/>;
     }
     else {
-        content = <react_native_fast_image_1.default resizeMode="cover" style={[styles_1.borderStyle, size]} source={src}/>;
+        content = <react_native_fast_image_1.default resizeMode="cover" style={[styles_1.borderStyle, size]} source={{
+                uri: (0, file_1.toAbsolutePath)(localPath),
+            }}/>;
     }
     return <PayloadWrapper_1.default style={styles_1.shadowStyle} {...retProps}>
         {content}

package/dist/pages/message/components/Payload/PayloadText.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { PayloadProps } from './type';
-declare const _default: React.MemoExoticComponent<({ payload, onLongPress, showArrow, direction, style }: PayloadProps) => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ payload, onLongPress, onPress, isRecord, showArrow, direction, style }: PayloadProps) => React.JSX.Element>;
 export default _default;

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

@@ -37,7 +37,7 @@ const PayloadWrapper_1 = __importDefault(require("./PayloadWrapper"));
 const init_1 = require("../../../../init");
 const im_base_1 = require("@smart-link/im-base");
 const clipboard_1 = __importDefault(require("@react-native-clipboard/clipboard"));
-const PayloadText = ({ payload, onLongPress, showArrow = true, direction, style }) => {
+const PayloadText = ({ payload, onLongPress, onPress, isRecord, showArrow = true, direction, style }) => {
     const { t } = (0, useTranslation_1.default)();
     const { text, quote } = payload;
     const onLongPressPhone = (phone) => {
@@ -104,6 +104,11 @@ const PayloadText = ({ payload, onLongPress, showArrow = true, direction, style
         });
     };
     const onPressQuote = (quoteMessageSeq) => {
+        if (isRecord) {
+            // @ts-ignore
+            onPress === null || onPress === void 0 ? void 0 : onPress();
+            return;
+        }
         const imManager = (0, init_1.getImManager)();
         imManager.store.dispatch(im_base_1.MessagePanelActions.onPressQuote(imManager, quoteMessageSeq));
     };

package/dist/pages/message/components/Payload/PayloadVideo.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { PayloadProps } from './type';
-declare const _default: React.MemoExoticComponent<({ messageStatus, messageSeq, payload, sendSize, onLongPress }: PayloadProps) => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ messageStatus, messageSeq, payload, sendSize, isRecord, onLongPress }: PayloadProps) => React.JSX.Element>;
 export default _default;

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

@@ -39,16 +39,16 @@ const UploadProgress_1 = __importDefault(require("../UploadProgress"));
 const PayloadWrapper_1 = __importDefault(require("./PayloadWrapper"));
 const init_1 = require("../../../../init");
 const react_native_fast_image_1 = __importDefault(require("react-native-fast-image"));
-const PayloadVideo = ({ messageStatus, messageSeq, payload, sendSize = 0, onLongPress }) => {
+const PayloadVideo = ({ messageStatus, messageSeq, payload, sendSize = 0, isRecord, onLongPress }) => {
     const { width, height } = payload;
     const size = (0, golden_rectangle_1.calculate)(height || (0, rn_ui_1.dp)(163), width || (0, rn_ui_1.dp)(100));
     const thumbnail = payload.imagePath ? { uri: 'file://' + payload.imagePath }
         : { uri: (0, file_1.getDownloadUrl)(payload.imageFileId) };
-    console.log('payload video', payload);
     return (<PayloadWrapper_1.default style={[styles.root, styles_1.shadowStyle, styles_1.borderStyle, size]} onPress={() => {
             (0, init_1.getImManager)().store.dispatch((0, video_action_1.loadVideoPlayer)({
                 messageSeq,
-                payload
+                payload,
+                isRecord
             }));
         }} onLongPress={onLongPress}>
             {payload.imagePath || payload.imageFileId ? <react_native_fast_image_1.default style={[size, styles_1.borderStyle]} resizeMode='cover' source={thumbnail}/> : <react_native_1.View style={[size, styles_1.borderStyle, { backgroundColor: '#000' }]}/>}

package/dist/pages/message/components/Payload/type.d.ts

@@ -4,6 +4,8 @@ export interface PayloadProps extends IMessage {
     style?: StyleProp<ViewStyle>;
     direction?: 'left' | 'right';
     showArrow?: boolean;
+    isRecord?: boolean;
     onPress?: (e: GestureResponderEvent) => void;
     onLongPress?: (e: GestureResponderEvent) => void;
+    onLoad?: (localPath: string) => void;
 }

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

@@ -31,7 +31,6 @@ const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const TextMixMessage_1 = __importDefault(require("./TextMixMessage"));
 const styles_1 = require("../../../components/styles");
-// @ts-ignore
 const AntDesign_1 = __importDefault(require("react-native-vector-icons/AntDesign"));
 const rn_ui_1 = require("@smart-link/rn-ui");
 const im_base_1 = require("@smart-link/im-base");

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

@@ -79,7 +79,7 @@ const OptionPanel = (0, react_1.forwardRef)((props, ref) => {
     });
     const sendFile = (data) => __awaiter(void 0, void 0, void 0, function* () {
         (0, scroll_1.scrollToBottom)();
-        const destPath = yield (0, file_1.copyFile)(data.localPath, data.filename);
+        const destPath = yield (0, file_1.copyFile)(data.localPath, data.filename, 'file');
         yield (0, init_1.getImManager)().sendFileMessage(Object.assign({}, currentConversation), Object.assign(Object.assign({}, data), { localPath: destPath }));
     });
     const openAlbum = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -135,7 +135,8 @@ const OptionPanel = (0, react_1.forwardRef)((props, ref) => {
                 fileInfo.name = fileInfo.name + ext;
             }
             yield sendFile({
-                localPath: fileInfo.uri,
+                // ios 中文名称编码了，需要解码
+                localPath: decodeURI(fileInfo.uri),
                 filename: fileInfo.name,
                 size: fileInfo.size,
                 type: fileInfo.type,

package/dist/pages/types.d.ts

@@ -53,6 +53,7 @@ export type IMPageParamList = {
     };
     OptionGroupManage: undefined;
     MessageRecord: {
+        messageSeq: string;
         messages: IMessage[];
         title: string;
     };

package/dist/slice/contact/contact.slice.js

@@ -3,19 +3,19 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onDefaultCheckedUser = exports.startSendContact = exports.resetState = exports.startAddMember = exports.startCreateGroup = exports.onSelectUser = exports.setCurrentRoot = exports.setSelectGroups = exports.setSelectUsers = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const initialState = {
+const initialState = () => ({
     selectUsers: {},
     selectGroups: {},
     currentRoot: 'none',
     choosePurpose: 'none',
     checkMode: 'multiple',
-};
+});
 const contactSlice = (0, toolkit_1.createSlice)({
     name: 'chat/contact',
     initialState,
     reducers: {
         resetState(state) {
-            Object.assign(state, initialState);
+            Object.assign(state, initialState());
         },
         setSelectUsers(state, action) {
             state.selectUsers = action.payload;

package/dist/slice/video/video.action.d.ts

@@ -2,4 +2,5 @@ import { AsyncAction, IPayload } from '@smart-link/im-base';
 export declare const loadVideoPlayer: (message: {
     messageSeq: string;
     payload: IPayload;
+    isRecord?: boolean;
 }) => AsyncAction;

package/dist/slice/video/video.action.js

@@ -17,28 +17,30 @@ const file_1 = require("../../api/file");
 const init_1 = require("../../init");
 const loadVideoPlayer = message => (dispatch) => __awaiter(void 0, void 0, void 0, function* () {
     console.log('loadVideoPlayer: ', message);
-    const { payload, messageSeq } = message;
+    const { payload, messageSeq, isRecord } = message;
     const { width = (0, rn_ui_1.dp)(100), height = (0, rn_ui_1.dp)(163), localPath } = payload;
     const thumbnail = payload.imagePath
         ? { uri: 'file://' + payload.imagePath }
         : { uri: (0, file_1.getDownloadUrl)(payload.imageFileId) };
-    if (!localPath) {
-        dispatch((0, video_slice_1.showVideoPlayer)({
-            videoLocalPath: '',
-            videoImageHeight: height,
-            videoImageWidth: width,
-            videoImagePath: thumbnail.uri,
-        }));
-        const imManager = (0, init_1.getImManager)();
-        const destPath = yield imManager.download({
+    const imManager = (0, init_1.getImManager)();
+    const download = () => __awaiter(void 0, void 0, void 0, function* () {
+        return yield imManager.download({
             fileId: payload.fileId,
             resourceType: 'video',
             filename: payload.filename || (payload.fileId + '.mp4'),
             onProgress(o) {
-                console.log(o);
                 dispatch((0, video_slice_1.setVideoDownloadProgress)(o.loaded / Number(o.total || payload.size)));
             },
         });
+    });
+    if (!localPath && !isRecord) {
+        dispatch((0, video_slice_1.showVideoPlayer)({
+            videoLocalPath: '',
+            videoImageHeight: height,
+            videoImageWidth: width,
+            videoImagePath: thumbnail.uri,
+        }));
+        const destPath = yield download();
         dispatch((0, video_slice_1.showVideoPlayer)({
             videoLocalPath: destPath,
             videoImageHeight: height,
@@ -53,6 +55,23 @@ const loadVideoPlayer = message => (dispatch) => __awaiter(void 0, void 0, void
             payload: Object.assign(Object.assign({}, payload), { localPath: destPath })
         });
     }
+    else if (!localPath && isRecord) {
+        // 下载文件，缓存资源
+        let destPath = yield imManager.loadResourceFromCache(payload.fileId);
+        if (!destPath) {
+            destPath = yield download();
+            imManager.updateResource({
+                url: payload.fileId,
+                localPath: destPath,
+            });
+        }
+        dispatch((0, video_slice_1.showVideoPlayer)({
+            videoLocalPath: destPath,
+            videoImageHeight: height,
+            videoImageWidth: width,
+            videoImagePath: thumbnail.uri,
+        }));
+    }
     else {
         dispatch((0, video_slice_1.showVideoPlayer)({
             videoLocalPath: localPath,

package/dist/utils/file.js

@@ -208,6 +208,7 @@ const extensions = {
     'text/css': '.css',
     'text/javascript': '.js',
     'text/xml': '.xml',
+    'application/xml': '.xml',
     'text/csv': '.csv',
     'text/markdown': '.md',
     'text/calendar': '.ics',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart-link/rn-im",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "",
   "main": "./dist/index.js",
   "dependencies": {
@@ -64,7 +64,7 @@
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
     "@smart-link/rn-ui": "^1.0.6",
-    "@smart-link/im-base": "^1.0.21"
+    "@smart-link/im-base": "^1.0.23"
   },
   "files": [
     "dist/**",