@smart-link/rn-im 1.0.24 → 1.0.26

package/dist/utils/file.js

@@ -13,7 +13,6 @@ import { getCookieString } from './cookie';
 import { getDownloadUrl } from '../api/file';
 import { uuidv4 } from 'react-native-compressor';
 import { PermissionsAndroid, Platform } from 'react-native';
-import { throttle } from "lodash-es";
 const documentPath = RNFS.DocumentDirectoryPath;
 const resourceDirBase = {
     avatars: '/avatars',
@@ -47,7 +46,7 @@ export function toAbsolutePath(filePath) {
     if (filePath.startsWith('file://')) {
         return filePath;
     }
-    return 'file://' + filePath;
+    return 'file://' + documentPath + filePath;
 }
 export function toRelativePath(filePath) {
     if (filePath.startsWith(documentPath)) {
@@ -86,25 +85,27 @@ export const getSuffix = (filename) => {
     const index = filename.lastIndexOf('.');
     return filename.substring(index);
 };
-export const download = ({ fileId, fileSize, resourceType, filename, onProgress, onStart }) => __awaiter(void 0, void 0, void 0, function* () {
+export const download = ({ fileId, resourceType, filename, onProgress, onStart }) => __awaiter(void 0, void 0, void 0, function* () {
     const cookie = yield getCookieString();
     const fileUrl = getDownloadUrl(fileId);
     console.log('download url: ', fileUrl);
-    const throttledFn = throttle((o) => {
-        onProgress === null || onProgress === void 0 ? void 0 : onProgress(o);
-    }, 500);
-    // if (Platform.OS === 'android') {
-    const destPath = RNFS.DocumentDirectoryPath + resourceDir[resourceType] + '/' + fileId + getSuffix(filename);
+    const relativePath = resourceDir[resourceType] + "/" + filename;
+    const destPath = documentPath + relativePath;
     const { jobId, promise } = RNFS.downloadFile({
         fromUrl: fileUrl,
         toFile: destPath,
         headers: {
             'Cookie': cookie,
         },
-        background: true,
+        progressInterval: 300,
+        progressDivider: 5,
+        begin: (e) => {
+            // 这个方法不能注释，否则 ios 不响应进度
+            // console.log('download begin: ', e);
+        },
         progress: (e) => {
             // console.log('download progress: ', e);
-            throttledFn({ loaded: e.bytesWritten, total: e.contentLength });
+            onProgress === null || onProgress === void 0 ? void 0 : onProgress({ loaded: e.bytesWritten, total: e.contentLength, jobId });
         }
     });
     onStart === null || onStart === void 0 ? void 0 : onStart(() => {
@@ -112,28 +113,12 @@ export const download = ({ fileId, fileSize, resourceType, filename, onProgress,
     });
     try {
         yield promise;
-        console.log('下载完成');
-        return destPath;
+        return relativePath;
     }
     catch (error) {
         console.error('下载失败:', error);
         throw error;
     }
-    // } else {
-    //     const resp = await fetch(fileUrl, {
-    //         method: 'HEAD',
-    //     })
-    //     if (resp.status !== 200) {
-    //         console.error('下载失败:', resp.status);
-    //         throw new Error('下载失败');
-    //     }
-    //     const contentLength = resp.headers.get('Content-Length') || fileSize;
-    //     const result = await CompressDownload(fileUrl, (progress) => {
-    //         // console.log('download progress: ', progress);
-    //         throttledFn({loaded: progress * Number(contentLength), total: Number(contentLength)});
-    //     })
-    //     return  await moveFile(result, filename, resourceType)
-    // }
 });
 export function saveToAlbum(imManager, localPath, showTips = true) {
     var _a, _b;
@@ -245,3 +230,131 @@ const extensions = {
 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;
+        }
+        let relativePath;
+        if (filePath.indexOf(documentPath) >= 0) {
+            return filePath.replace(documentPath, '');
+        }
+        relativePath = resourceDir.file + "/" + filename;
+        const destPath = documentPath + relativePath;
+        console.log('destPath: ', filePath, destPath);
+        if (yield RNFS.exists(destPath)) {
+            return destPath;
+        }
+        yield RNFS.copyFile(filePath, destPath);
+        return relativePath;
+    });
+}
+function filterUserPath(imManager, path, items = []) {
+    if (path !== userPath) {
+        return items;
+    }
+    return items.filter(item => {
+        switch (item.path) {
+            case userPath + resourceDirBase.file:
+                item.name = imManager.t('file');
+                return true;
+            case userPath + resourceDirBase.video:
+                item.name = imManager.t('video');
+                return true;
+            case userPath + resourceDirBase.picture:
+                item.name = imManager.t('picture');
+                return true;
+            default:
+                return false;
+        }
+    });
+}
+function filterThumbPicture(imManager, path, items) {
+    if (path !== userPath + resourceDirBase.video) {
+        return items;
+    }
+    return items.filter(item => {
+        if (getFileType(item.path) === 'jpg') {
+            return false;
+        }
+        let thumbPath = item.path.replace('video_', 'thumb_');
+        thumbPath = thumbPath.substring(0, thumbPath.lastIndexOf('.'));
+        thumbPath = thumbPath + '.jpg';
+        item.thumbPath = thumbPath;
+        return true;
+    });
+}
+export function readFileDir(imManager, path, keyword = '') {
+    return __awaiter(this, void 0, void 0, function* () {
+        let items = yield RNFS.readDir(path);
+        items = filterUserPath(imManager, path, items);
+        items = filterThumbPicture(imManager, path, items);
+        const list = [];
+        for (let i = 0; i < items.length; i++) {
+            const item = items[i];
+            const mapItem = {
+                name: item.name,
+                time: item.mtime.getTime(),
+                isDir: item.isDirectory(),
+                path: item.path,
+                size: item.size,
+                thumbPath: item.thumbPath,
+            };
+            mapItem.childrenCount = yield getChildrenCount(imManager, item.isDirectory(), item.path);
+            list.push(mapItem);
+        }
+        if (keyword === '') {
+            return list;
+        }
+        else {
+            return list.filter(item => item.name.indexOf(keyword) >= 0);
+        }
+    });
+}
+export function getChildrenCount(imManager, isDir, path) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!isDir) {
+            return 0;
+        }
+        let children = yield RNFS.readDir(path);
+        children = filterUserPath(imManager, path, children);
+        children = filterThumbPicture(imManager, path, children);
+        return children.length;
+    });
+}
+export function getFileRootItem(imManager) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const rootList = [];
+        if (Platform.OS === 'android') {
+            const item = yield createRootItem(imManager, imManager.t('storage'), '/storage/emulated/0');
+            rootList.push(item);
+        }
+        const item = yield createRootItem(imManager, imManager.t('user'), userPath);
+        rootList.push(item);
+        return rootList;
+    });
+}
+export function createRootItem(imManager, name, path) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let item = {
+            name,
+            isDir: true,
+            path,
+        };
+        item.childrenCount = yield getChildrenCount(imManager, true, path);
+        return item;
+    });
+}
+export function getFileType(path) {
+    if (path.lastIndexOf('.') === -1) {
+        return '';
+    }
+    return path.slice(path.lastIndexOf('.') + 1);
+}
+export function isImage(path) {
+    const imageTypes = ['jpg', 'jpeg', 'gif', 'bmp', 'png', 'webp'];
+    const fileType = getFileType(path);
+    return imageTypes.includes(fileType);
+}

package/dist/utils/upload.js

@@ -21,7 +21,7 @@ const uploadFile = (filePath, type, onProgress) => __awaiter(void 0, void 0, voi
         onProgress === null || onProgress === void 0 ? void 0 : onProgress(o);
     }, 500);
     if (Platform.OS === 'android') {
-        const resp = yield backgroundUpload(uploadUrl, filePath, {
+        const resp = yield backgroundUpload(uploadUrl, toAbsolutePath(filePath), {
             httpMethod: 'POST',
             uploadType: UploadType.MULTIPART,
             headers: {

package/package.json

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

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

@@ -1 +0,0 @@
-export {};

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

@@ -1 +0,0 @@
-export {};