@smart-link/rn-im 1.1.5 → 1.1.6

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

@@ -13,9 +13,9 @@ import useTranslation from '../../../hooks/useTranslation';
 import { getImManager } from '../../../init';
 import { getSummary } from '../../../utils/summary';
 import { ConversationType } from '@smart-link/im-base';
-import { dp, useNavigation } from '@smart-link/rn-ui';
+import { CaihText, dp, useNavigation } from '@smart-link/rn-ui';
 import React, { memo } from 'react';
-import { View, StyleSheet, Text, FlatList, TouchableOpacity } from 'react-native';
+import { View, StyleSheet, FlatList, TouchableOpacity } from 'react-native';
 const MyGroupChat = memo(({ keyword }) => {
     const { chatGroups } = useChatGroup();
     const { t } = useTranslation();
@@ -30,7 +30,7 @@ const MyGroupChat = memo(({ keyword }) => {
                 justifyContent: 'center',
                 alignItems: 'center',
             }}>
-                    <Text>{t('noSearchResult')}</Text>
+                    <CaihText>{t('noSearchResult')}</CaihText>
                 </View>
             </View>);
     }
@@ -44,9 +44,9 @@ const MyGroupChat = memo(({ keyword }) => {
                 <ChatAvatar type={ConversationType.C2G} name={chatGroupName} disabled={true} id={chatGroupId} url={avatars} size={dp(42)}/>
                 <View style={styles.width10}/>
                 <View style={styles.left}>
-                    <Text style={styles.name} numberOfLines={1}>
+                    <CaihText style={styles.name} numberOfLines={1}>
                         {getSummary(chatGroupName, keyword, 20)}
-                    </Text>
+                    </CaihText>
                 </View>
             </TouchableOpacity>);
     };

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

@@ -1,10 +1,10 @@
 import React, { memo, useEffect, useState } from 'react';
-import { StyleSheet, TouchableOpacity, Text, View, Animated } from 'react-native';
+import { StyleSheet, TouchableOpacity, View, Animated } from 'react-native';
 import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
 import AntDesign from 'react-native-vector-icons/AntDesign';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import useTranslation from '../../../hooks/useTranslation';
-import { dp } from '@smart-link/rn-ui';
+import { CaihText, dp } from '@smart-link/rn-ui';
 const PictureMultipleBar = memo((props) => {
     const { disabled, onPicMultipleForward, onPicMultipleCollect, onPicMultipleSave, onPicMultipleDelete } = props;
     const { t } = useTranslation();
@@ -25,7 +25,7 @@ const PictureMultipleBar = memo((props) => {
         }}>
                 <View style={styles.item}>
                     <FontAwesome5 name="reply" size={dp(20)} color={color}/>
-                    <Text style={fontStyle}>{t('forward')}</Text>
+                    <CaihText style={fontStyle}>{t('forward')}</CaihText>
                 </View>
             </TouchableOpacity>
 
@@ -33,7 +33,7 @@ const PictureMultipleBar = memo((props) => {
             onPicMultipleCollect && onPicMultipleCollect();
         }}>
                 <MaterialIcons name="collections" size={dp(20)} color={color}/>
-                <Text style={fontStyle}>{t('collect')}</Text>
+                <CaihText style={fontStyle}>{t('collect')}</CaihText>
             </TouchableOpacity>
 
             {/* <TouchableOpacity
@@ -51,7 +51,7 @@ const PictureMultipleBar = memo((props) => {
             onPicMultipleDelete && onPicMultipleDelete();
         }}>
                 <AntDesign name="delete" size={dp(20)} color={color}/>
-                <Text style={fontStyle}>{t('delete')}</Text>
+                <CaihText style={fontStyle}>{t('delete')}</CaihText>
             </TouchableOpacity>
         </Animated.View>);
 });

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

@@ -7,11 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Text, View, StyleSheet, PixelRatio, SectionList, TouchableOpacity } from "react-native";
+import { View, StyleSheet, PixelRatio, SectionList, TouchableOpacity } from "react-native";
 import { memo } from "react";
 import { useSearchMessage } from "../../../pages/search/components/useSearchMessage";
 import useTranslation from "../../../hooks/useTranslation";
-import { ActionSheet, dp } from "@smart-link/rn-ui";
+import { ActionSheet, CaihText, dp } from "@smart-link/rn-ui";
 import { borderStyle } from "../../../components/styles";
 import ChatAvatar from "../../../components/ChatAvatar";
 import dayjs from "dayjs";
@@ -31,12 +31,12 @@ const SearchFileList = ({ keyword, conversationId }) => {
     });
     if (data.length === 0) {
         return <View style={styles.empty}>
-            <Text>{t('noSearchResult')}</Text>
+            <CaihText>{t('noSearchResult')}</CaihText>
         </View>;
     }
     const keyExtractor = (item) => item.messageSeq;
     const renderSectionHeader = ({ section }) => {
-        return (<Text style={styles.dateTxt}>{section.date}</Text>);
+        return (<CaihText style={styles.dateTxt}>{section.date}</CaihText>);
     };
     const renderItem = ({ item }) => {
         const { messageSeq, messageFrom, messageFromName, payload = {}, } = item;
@@ -93,13 +93,13 @@ const SearchFileList = ({ keyword, conversationId }) => {
             }}>
                 <View style={styles.itemTop}>
                     <ChatAvatar disabled={true} id={messageFrom} name={messageFromName} size={dp(24)}/>
-                    <Text style={styles.name} numberOfLines={1}>{messageFromName}</Text>
-                    <Text style={styles.time}>{dayjs(item.messageTime).format("YYYY-MM-DD")}</Text>
+                    <CaihText style={styles.name} numberOfLines={1}>{messageFromName}</CaihText>
+                    <CaihText style={styles.time}>{dayjs(item.messageTime).format("YYYY-MM-DD")}</CaihText>
                 </View>
                 <View style={styles.file}>
                     <View style={styles.fileInfo}>
-                        <Text style={styles.fileName} numberOfLines={2} ellipsizeMode={'middle'}>{payload.filename}</Text>
-                        <Text style={styles.fileSize}>{numberToFileSize(payload.size)}</Text>
+                        <CaihText style={styles.fileName} numberOfLines={2} ellipsizeMode={'middle'}>{payload.filename}</CaihText>
+                        <CaihText style={styles.fileSize}>{numberToFileSize(payload.size)}</CaihText>
                     </View>
                     <Icon style={styles.imageIcon}/>
                 </View>

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

@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Dimensions, SectionList, StyleSheet, Text, TouchableOpacity, View } from "react-native";
+import { Dimensions, SectionList, StyleSheet, TouchableOpacity, View } from "react-native";
 import CachedImage from "../../../components/CachedImage";
-import { Checkbox, dp, Toast, useNavigation } from "@smart-link/rn-ui";
+import { CaihText, Checkbox, dp, Toast, useNavigation } from "@smart-link/rn-ui";
 import PictureMultipleBar from "./PictureMulipleBar";
 import React, { useMemo, useState } from "react";
 import dayjs from "dayjs";
@@ -159,7 +159,7 @@ export const SearchPictures = ({ conversationId, multiple }) => {
                 date = title;
             }
             return (<View style={styles.header}>
-                            <Text style={styles.headerText}>{date}</Text>
+                            <CaihText style={styles.headerText}>{date}</CaihText>
                         </View>);
         }} renderItem={({ item }) => {
             return (<View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
@@ -204,7 +204,7 @@ export const SearchPictures = ({ conversationId, multiple }) => {
                                                     <CachedImage style={styles.img} localPath={message.payload.localPath} fileId={message.payload.fileId}/>
                                                     {/* 视频播放图标 */}
                                                     <View style={styles.playIcon}>
-                                                        <Text style={styles.playIconText}>▶</Text>
+                                                        <CaihText style={styles.playIconText}>▶</CaihText>
                                                     </View>
                                                 </>)}
                                         </View>

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

@@ -1,6 +1,6 @@
 import { borderStyle } from "../../../components/styles";
-import { dp } from '@smart-link/rn-ui';
-import { PixelRatio, SectionList, TouchableOpacity, View, Text, StyleSheet, Linking } from "react-native";
+import { CaihText, dp } from '@smart-link/rn-ui';
+import { PixelRatio, SectionList, TouchableOpacity, View, StyleSheet, Linking } from "react-native";
 import ChatAvatar from "../../../components/ChatAvatar";
 import dayjs from "dayjs";
 import { memo } from "react";
@@ -18,12 +18,12 @@ const SearchShareLinkList = ({ keyword, conversationId }) => {
     });
     if (data.length === 0) {
         return <View style={styles.empty}>
-            <Text>{t('noSearchResult')}</Text>
+            <CaihText>{t('noSearchResult')}</CaihText>
         </View>;
     }
     const keyExtractor = (item) => item.messageSeq;
     const renderSectionHeader = ({ section }) => {
-        return (<Text style={styles.dateTxt}>{section.date}</Text>);
+        return (<CaihText style={styles.dateTxt}>{section.date}</CaihText>);
     };
     const renderItem = ({ item }) => {
         const { messageFrom, messageFromName, payload = {}, } = item;
@@ -34,13 +34,13 @@ const SearchShareLinkList = ({ keyword, conversationId }) => {
             }}>
                 <View style={styles.itemTop}>
                     <ChatAvatar disabled={true} id={messageFrom} name={messageFromName} size={dp(24)}/>
-                    <Text style={styles.name} numberOfLines={1}>{messageFromName}</Text>
-                    <Text style={styles.time}>{dayjs(item.messageTime).format("YYYY-MM-DD")}</Text>
+                    <CaihText style={styles.name} numberOfLines={1}>{messageFromName}</CaihText>
+                    <CaihText style={styles.time}>{dayjs(item.messageTime).format("YYYY-MM-DD")}</CaihText>
                 </View>
                 <View style={styles.link}>
                     <View style={styles.linkInfo}>
-                        <Text style={styles.title} numberOfLines={1} ellipsizeMode={'middle'}>{payload.title || payload.description}</Text>
-                        <Text style={styles.description} numberOfLines={2} ellipsizeMode={'middle'}>{payload.description}</Text>
+                        <CaihText style={styles.title} numberOfLines={1} ellipsizeMode={'middle'}>{payload.title || payload.description}</CaihText>
+                        <CaihText style={styles.description} numberOfLines={2} ellipsizeMode={'middle'}>{payload.description}</CaihText>
                     </View>
                     <Favicon url={payload.url} size={size}/>
                 </View>

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

@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { dp, ListRow, useNavigation } from '@smart-link/rn-ui';
+import { CaihText, dp, ListRow, useNavigation } from '@smart-link/rn-ui';
 import React, { memo, useEffect, useState } from 'react';
-import { ScrollView, Text, View } from 'react-native';
+import { ScrollView, View } from 'react-native';
 import { searchUser } from '../../../api/user';
 import ChatAvatar from '../../../components/ChatAvatar/ChatAvatar';
 import Highlighter from '../../../components/Highlighter';
@@ -21,7 +21,7 @@ const RenderUserItem = (props) => {
             <ChatAvatar needUpdate id={data.userId} url={data.avatars} name={data.userName}/>
             <View style={{ marginLeft: dp(10), flex: 1 }}>
                 <Highlighter searchWord={keyword} textToHighlight={data.userName} numberOfLines={1}/>
-                <Text numberOfLines={1} style={{ fontSize: dp(12), color: '#999' }}>{data.groupNamePaths}</Text>
+                <CaihText numberOfLines={1} style={{ fontSize: dp(12), color: '#999' }}>{data.groupNamePaths}</CaihText>
             </View>
 
         </View>);
@@ -35,7 +35,7 @@ const SearchUser = ({ keyword }) => {
             return;
         }
         searchUser({
-            searchKey: keyword,
+            userNameLike: keyword,
         }).then(({ data }) => {
             setUserList(data);
         });
@@ -46,7 +46,7 @@ const SearchUser = ({ keyword }) => {
                 justifyContent: 'center',
                 alignItems: 'center',
             }}>
-                <Text>{t('noSearchResult')}</Text>
+                <CaihText>{t('noSearchResult')}</CaihText>
             </View>);
     }
     return (<ScrollView style={{ flex: 1 }}>

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

@@ -17,7 +17,7 @@ let stopFn = () => { };
 export const loadVideoPlayer = message => (dispatch) => __awaiter(void 0, void 0, void 0, function* () {
     console.log('loadVideoPlayer: ', message);
     const { payload, messageSeq, isRecord } = message;
-    const { width = dp(100), height = dp(163), localPath } = payload;
+    const { width = dp(100), height = dp(163), localPath, sourcePath } = payload;
     const thumbnail = payload.imagePath
         ? { uri: toAbsolutePath(payload.imagePath) }
         : { uri: getDownloadUrl(payload.imageFileId) };
@@ -40,6 +40,10 @@ export const loadVideoPlayer = message => (dispatch) => __awaiter(void 0, void 0
         catch (e) {
             dispatch(setVideoDownloadError());
             console.log('download error: ', e);
+            imManager.updateResource({
+                url: payload.fileId,
+                localPath: '',
+            });
             throw new Error('download error');
         }
     });
@@ -96,7 +100,7 @@ export const loadVideoPlayer = message => (dispatch) => __awaiter(void 0, void 0
     }
     else {
         dispatch(showVideoPlayer({
-            videoLocalPath: localPath,
+            videoLocalPath: (sourcePath || localPath),
             videoImageHeight: height,
             videoImageWidth: width,
             videoImagePath: thumbnail.uri,

package/dist/utils/camera.d.ts

@@ -0,0 +1,25 @@
+import { PhotoFile, VideoFile } from "react-native-vision-camera";
+export interface PictureData {
+    filename: string;
+    localPath: string;
+    height: number;
+    width: number;
+    ext: string;
+    type: string;
+    size: number;
+}
+export declare function buildPictureData(data: PhotoFile): Promise<{
+    filename: string;
+    localPath: string;
+    height: number;
+    width: number;
+    ext: string | undefined;
+    type: string;
+    size: string;
+}>;
+export interface VideoData extends PictureData {
+    imageName: string;
+    imagePath: string;
+    duration: number;
+}
+export declare function buildVideoData(data: VideoFile): Promise<VideoData | null>;

package/dist/utils/camera.js

@@ -0,0 +1,75 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { moveFile, toAbsolutePath, toFullPath } from "./file";
+import { createVideoThumbnail, Image, getFileSize, uuidv4 } from 'react-native-compressor';
+import { ResourceType } from "@smart-link/im-base";
+const { PICTURE, VIDEO } = ResourceType;
+export function buildPictureData(data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const uid = uuidv4();
+        const path = data.path;
+        const ext = path.split('.').pop();
+        const filename = PICTURE + '_' + uid + '.' + ext;
+        const tmp = yield Image.compress(path, {
+            compressionMethod: 'auto'
+        });
+        const localPath = yield moveFile(tmp, filename, PICTURE);
+        const size = yield getFileSize(toFullPath(localPath));
+        let width = data.width;
+        let height = data.height;
+        if (data.orientation === 'portrait') {
+            if (width > height) {
+                [width, height] = [height, width];
+            }
+        }
+        return {
+            filename: filename,
+            localPath: localPath,
+            height: height,
+            width: width,
+            ext: ext,
+            type: 'image/' + ext,
+            size,
+        };
+    });
+}
+export function buildVideoData(data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const uid = uuidv4();
+        const path = data.path;
+        try {
+            const ext = path.split('.').pop();
+            const filename = VIDEO + '_' + uid + '.' + ext;
+            const size = yield getFileSize(path);
+            console.log('video size', size);
+            let thumb = yield createVideoThumbnail(toAbsolutePath(path));
+            console.log('RNThumbnail', thumb);
+            const imageName = 'thumb_' + uid + '.jpg';
+            const imagePath = yield moveFile(thumb.path, imageName, VIDEO);
+            const localPath = yield moveFile(path, filename, VIDEO);
+            return {
+                filename,
+                localPath: localPath,
+                imageName,
+                imagePath,
+                duration: data.duration,
+                ext: ext,
+                type: 'video/' + ext,
+                width: thumb.width,
+                height: thumb.height,
+                size: Number(size),
+            };
+        }
+        catch (e) {
+            console.log('RNThumbnail', e);
+            return null;
+        }
+    });
+}

package/dist/utils/file.d.ts

@@ -22,6 +22,7 @@ export declare const getSuffix: (filename: string) => string;
 export declare const download: ({ fileId, resourceType, filename, onProgress, onStart }: IDownloadOptions) => Promise<string>;
 export declare function saveToAlbum(imManager: ImManager, localPath: string, showTips?: boolean): Promise<boolean>;
 export declare function requestSaveFilePermissionIfAndroid(imManager: ImManager): Promise<boolean>;
+export declare function getMimeFromExtension(ext: string): string;
 export declare function getExtensionFromMime(mime: string): string;
 export declare function selectFile(imManager: ImManager, filePath: string, filename: string): Promise<string | undefined>;
 export declare function readFileDir(imManager: ImManager, path: string, keyword?: string): Promise<IPathItem[]>;
@@ -30,6 +31,7 @@ export declare function getFileRootItem(imManager: ImManager): Promise<IPathItem
 export declare function createRootItem(imManager: ImManager, name: string, path: string): Promise<IPathItem>;
 export declare function getFileType(path: string): string;
 export declare function isImage(path: string): boolean;
+export declare function isVideo(path: string): boolean;
 export declare function sanitizeFilename(filename: string): string;
 export declare function getSafeFilename(filename: string): string;
 /**
@@ -40,5 +42,4 @@ export declare function getSafeFilename(filename: string): string;
  */
 export declare function truncateFilenameMiddle(filename: string, maxLength?: number): string;
 export declare function getFileSize(filePath: string): Promise<number>;
-export declare function sliceFile(filePath: string, start: number, end: number): Promise<string>;
 export {};

package/dist/utils/file.js

@@ -42,6 +42,10 @@ export function toAbsolutePath(filePath) {
     if (filePath.startsWith('Documents') || filePath.startsWith('file://') || filePath.startsWith('file://' + documentPath)) {
         return filePath;
     }
+    if (Platform.OS === 'android' && !filePath.startsWith('file://')
+        && filePath.startsWith('/data')) {
+        return 'file://' + filePath;
+    }
     return 'file://' + documentPath + filePath;
 }
 export function toFullPath(filePath) {
@@ -73,7 +77,7 @@ export const moveFile = (filePath, filename, resourceType) => __awaiter(void 0,
     const relativePath = resourceDir[resourceType] + "/" + filename;
     const destPath = documentPath + relativePath;
     if (yield RNFS.exists(destPath)) {
-        return relativePath;
+        yield RNFS.unlink(destPath);
     }
     yield RNFS.moveFile(filePath, destPath);
     return relativePath;
@@ -81,9 +85,6 @@ export const moveFile = (filePath, filename, resourceType) => __awaiter(void 0,
 export const copyFile = (filePath, filename, resourceType) => __awaiter(void 0, void 0, void 0, function* () {
     const relativePath = resourceDir[resourceType] + "/" + filename;
     const destPath = documentPath + relativePath;
-    if (yield RNFS.exists(destPath)) {
-        return relativePath;
-    }
     console.log('copyFile', filePath, destPath);
     yield RNFS.copyFile(filePath, destPath);
     return relativePath;
@@ -93,9 +94,7 @@ export const getSuffix = (filename) => {
     return filename.substring(index);
 };
 export const download = ({ fileId, resourceType, filename, onProgress, onStart }) => __awaiter(void 0, void 0, void 0, function* () {
-    // const cookie = await getCookieString();
     const fileUrl = getDownloadUrl(fileId);
-    // console.log('download url: ', fileUrl);
     let relativePath = resourceDir[resourceType] + "/" + getSafeFilename(filename);
     let destPath = documentPath + relativePath;
     // 如果文件已经存在，则使用文件 id 作为文件名
@@ -106,11 +105,9 @@ export const download = ({ fileId, resourceType, filename, onProgress, onStart }
     const { jobId, promise } = RNFS.downloadFile({
         fromUrl: fileUrl,
         toFile: destPath,
-        // headers: {
-        //     'Cookie': cookie,
-        // },
         progressInterval: 300,
         progressDivider: 5,
+        background: true,
         begin: (e) => {
             // 这个方法不能注释，否则 ios 不响应进度
             console.log('download begin: ', e.jobId);
@@ -187,6 +184,7 @@ const extensions = {
     'image/x-icon': '.ico',
     'image/vnd.microsoft.icon': '.ico',
     'image/x-ms-bmp': '.bmp',
+    'image/*': '.jpg',
     // 文本
     'text/plain': '.txt',
     'text/html': '.html',
@@ -206,6 +204,7 @@ const extensions = {
     'audio/aac': '.aac',
     // 视频
     'video/mp4': '.mp4',
+    'video/*': '.mp4',
     'video/webm': '.webm',
     'video/quicktime': '.mov',
     'video/x-msvideo': '.avi',
@@ -238,14 +237,21 @@ const extensions = {
     'application/octet-stream': '.apk',
     'application/vnd.android.package-archive': '.apk',
     'application/x-apk': '.apk',
+    '*/*': '.unknown',
 };
+const mimeFormExt = Object.entries(extensions).reduce((acc, [mime, ext]) => {
+    acc[ext.slice(1)] = mime;
+    return acc;
+}, {});
+export function getMimeFromExtension(ext) {
+    return mimeFormExt[ext];
+}
 export function getExtensionFromMime(mime) {
     return extensions[mime] || '';
 }
 export function selectFile(imManager, filePath, filename) {
     return __awaiter(this, void 0, void 0, function* () {
         const success = yield requestSaveFilePermissionIfAndroid(imManager);
-        // console.log("获取写入内存的权限", success)
         if (!success) {
             return;
         }
@@ -363,18 +369,25 @@ export function createRootItem(imManager, name, path) {
     });
 }
 export function getFileType(path) {
+    if (!path)
+        return '';
     if (path.lastIndexOf('.') === -1) {
         return '';
     }
-    return path.slice(path.lastIndexOf('.') + 1);
+    return path.slice(path.lastIndexOf('.') + 1).toLowerCase();
 }
 export function isImage(path) {
-    const imageTypes = ['jpg', 'jpeg', 'gif', 'bmp', 'png', 'webp'];
+    const imageTypes = ['jpg', 'jpeg', 'gif', 'bmp', 'png', 'webp', 'ico'];
     const fileType = getFileType(path);
     return imageTypes.includes(fileType);
 }
+export function isVideo(path) {
+    const videoTypes = ['mp4', 'avi', 'mkv', 'mov', 'wmv', 'flv', 'webm'];
+    const fileType = getFileType(path);
+    return videoTypes.includes(fileType);
+}
 export function sanitizeFilename(filename) {
-    return filename.replace(/[<>:"\/\\|?*\x00-\x1F]/g, '_'); // 替换非法字符为下划线
+    return (filename || '').replace(/[<>:"\/\\|?*\x00-\x1F]/g, '_'); // 替换非法字符为下划线
 }
 export function getSafeFilename(filename) {
     let safeName = sanitizeFilename(filename); // 移除非安全字符
@@ -413,12 +426,3 @@ export function getFileSize(filePath) {
         return stat.size;
     });
 }
-export function sliceFile(filePath, start, end) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // const destPath = `${userPath}/cache/${uuidv4()}.tmp`;
-        // 分片读取文件写入缓存文件
-        const base64 = yield RNFS.read(toAbsolutePath(filePath), end - start, start, 'base64');
-        // await RNFS.writeFile(destPath, base64, 'base64');
-        return base64;
-    });
-}

package/dist/utils/request.js

@@ -35,7 +35,6 @@ export const createRequest = (base, _storage) => {
     instance.interceptors.request.use((config) => __awaiter(void 0, void 0, void 0, function* () {
         if (!config.headers.Cookie) {
             config.headers.Cookie = yield storage.getItem('cookies');
-            console.log('get cookie: ', config.headers.Cookie);
         }
         return config;
     }), error => {

package/dist/utils/summary.js

@@ -1,5 +1,5 @@
-import { Text } from "react-native";
 import React from 'react';
+import { CaihText } from "@smart-link/rn-ui";
 export function getSummary(text, searchKey, summaryLength = 15, color = 'red') {
     if (!text) {
         return;
@@ -29,7 +29,7 @@ export function getSummary(text, searchKey, summaryLength = 15, color = 'red') {
     else {
         result.push(text.substring(0, index));
     }
-    result.push(<Text key={result.length} style={{ color }}>{text.substr(index, searchLength)}</Text>);
+    result.push(<CaihText key={result.length} style={{ color }}>{text.substr(index, searchLength)}</CaihText>);
     result.push(text.substring(index + searchLength, textLength));
     return result;
 }

package/dist/utils/upload.js

@@ -10,14 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import request, { getBaseURL, getStorage } from './request';
 import { toAbsolutePath, toFullPath } from './file';
 import { uploadFile as chunkUpload } from '@smart-link/chunk-upload';
-const CHUNK_SIZE = 1024 * 1024 * 2;
+import to from "await-to-js";
+const CHUNK_SIZE = 1024 * 1024 * 6;
 const uploadFile = (filePath, type, onProgress) => __awaiter(void 0, void 0, void 0, function* () {
     const uploadUrl = `/api-file/file/uploadFile`;
-    const local = yield fetch(toAbsolutePath(filePath));
+    console.log('uploadFile: ', filePath, type);
+    const [err, local] = yield to(fetch(toAbsolutePath(filePath)));
+    if (err) {
+        console.log('fetch file size error: ', err);
+        return Promise.reject(err);
+    }
     const file = yield local.blob();
     const fileName = filePath.split('/').pop();
     // 大文件20M以上, chunk上传
-    if (file.size > CHUNK_SIZE * 10) {
+    if (file.size > CHUNK_SIZE) {
+        console.log('uploadBigFile: ', filePath, type);
         return uploadBigFile(toFullPath(filePath), fileName, onProgress);
     }
     const formData = new FormData();
@@ -45,7 +52,6 @@ const uploadBigFile = (filePath, fileName, onProgress) => __awaiter(void 0, void
             'Cookie': cookie,
         },
         onProgress: (o) => {
-            // console.log('uploadBigFile: ', o)
             onProgress && onProgress({
                 loaded: o.loaded,
                 total: o.total,

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@smart-link/rn-im",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
-  "module": "./src/index.ts",
   "dependencies": {
     "color": "^5.0.0",
     "lodash-es": "^4.17.21",
@@ -65,8 +64,8 @@
     "react-redux": "^8.1.3",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
-    "@smart-link/rn-ui": "^1.1.3",
-    "@smart-link/im-base": "^1.1.2"
+    "@smart-link/rn-ui": "^1.1.6",
+    "@smart-link/im-base": "^1.1.6"
   },
   "files": [
     "dist/**",