@smart-link/rn-im 1.0.26 → 1.1.2

package/dist/api/addressList.d.ts

@@ -1,27 +1,28 @@
 import { IUser } from '@smart-link/im-base';
+import { IGroup, IRole } from "../interface";
 type IListTreeParams = {
-    groupCatId: any;
-    parentId: string;
-    groupStatus: string;
-    queryChild: boolean;
+    groupCatId?: any;
+    parentId?: string;
+    groupStatus?: string;
+    queryChild?: boolean;
 };
 type IListUserParams = {
-    groupCategoryId: string;
-    groupId: string;
-    groupIdPathLike: string;
+    groupCategoryId?: string;
+    groupId?: string;
+    groupIdPathLike?: string;
     pageNum: number;
     pageSize: number;
-    queryAll: boolean;
-    userStatus: string;
+    queryAll?: boolean;
+    userStatus?: string;
 };
-export declare const listGroupCategory: (data: {
-    appType: null;
-}) => Promise<import("../utils/request").IResponse<any>>;
-export declare const listTree: (data: IListTreeParams) => Promise<import("../utils/request").IResponse<any>>;
-export declare const listUser: (data: IListUserParams) => Promise<import("../utils/request").IResponse<any>>;
+export declare const listGroupCategory: (data: any) => Promise<import("../utils/request").IResponse<any>>;
+export declare const listTree: (data: IListTreeParams) => Promise<import("../utils/request").IResponse<IGroup[]>>;
+export declare const listUser: (data: IListUserParams) => Promise<import("../utils/request").IResponse<IUser[]>>;
 export declare const queryUser: (userId: string) => Promise<import("../utils/request").IResponse<any>>;
+export declare const queryUsersByCond: (userIds: string[]) => Promise<import("../utils/request").IResponse<IUser[]>>;
 export declare const searchUser: (params: {
     userNameLike: string;
-    tenantId: string;
 }) => Promise<import("../utils/request").IResponse<IUser[]>>;
+export declare const listRole: () => Promise<import("../utils/request").IResponse<IRole[]>>;
+export declare const listRoleUser: (roleId: string) => Promise<import("../utils/request").IResponse<IUser[]>>;
 export {};

package/dist/api/addressList.js

@@ -4,4 +4,18 @@ export const listGroupCategory = (data) => request.post(`${api}/open/groupQuery/
 export const listTree = (data) => request.post(`${api}/open/groupQuery/listTree`, data);
 export const listUser = (data) => request.post(`${api}/open/userQuery/listUser`, data);
 export const queryUser = (userId) => request.post(`${api}/open/userQuery/queryUsersByIds`, [userId]);
-export const searchUser = (params) => request.post(`${api}/open/userQuery/listUser`, Object.assign(Object.assign({}, params), { queryAll: true, userStatus: 'valid' }));
+export const queryUsersByCond = (userIds) => request.post(`${api}/open/userQuery/queryUsersByCond`, {
+    userIds,
+});
+export const searchUser = (params) => request.post(`${api}/open/userQuery/listUser`, Object.assign(Object.assign({}, params), { queryAll: true, userStatus: 'valid', pageSize: 100, pageNum: 1 }));
+export const listRole = () => request.post(`${api}/open/roleQuery/listRole`, {
+    pageNum: 1,
+    pageSize: 100,
+    roleStatus: "valid"
+});
+export const listRoleUser = (roleId) => request.post(`${api}/open/roleQuery/listRoleUser`, {
+    roleId,
+    pageNum: 1,
+    pageSize: 100,
+    userStatus: "valid"
+});

package/dist/api/user.js

@@ -2,5 +2,5 @@ import request from '../utils/request';
 export const userApi = '/api-user-center';
 export const searchUser = (params) => request.post(`${userApi}/open/userQuery/listUser`, Object.assign(Object.assign({}, params), { queryAll: true, userStatus: 'valid' }));
 export const updateUserInfo = (params) => request.post(`${userApi}/mgr/user/editUserInfo`, params);
-export const reloadUserInfo = () => request.post('/reloadUserInfo', {});
+export const reloadUserInfo = () => request.post('/auth/reloadUserInfo', {});
 export const queryUserByIds = (userIds) => request.post(`${userApi}/open/userQuery/queryUsersByIds`, userIds);

package/dist/components/Camera/Camera.js

@@ -11,7 +11,7 @@ import React, { memo } from 'react';
 import CameraResult from './CameraResult';
 import CameraCapture, { buildPictureData } from './CameraCapture';
 import { Modal, Platform, StatusBar, NativeModules } from "react-native";
-import { toAbsolutePath } from "../../utils/file";
+import { toAbsolutePath, toFullPath } from "../../utils/file";
 import PhotoEditor from "@baronha/react-native-photo-editor";
 const Camera = memo(props => {
     const { horizontal = true, cancelCamera, finishTakePicture, finishTakeRecord, } = props;
@@ -31,7 +31,8 @@ const Camera = memo(props => {
         }
         else {
             try {
-                const file = yield NativeModules.PictureEditingModule.editPicture(result.localPath);
+                console.log('editPicture', result.localPath, toFullPath(result.localPath));
+                const file = yield NativeModules.PictureEditingModule.editPicture(toFullPath(result.localPath));
                 console.log(file.uri);
                 file.path = file.uri;
                 const fileInfo = yield buildPictureData(file);

package/dist/components/Camera/CameraCapture.js

@@ -8,13 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import React, { memo, useEffect, useState, useCallback, useRef } from 'react';
-import { StyleSheet, Text, TouchableOpacity, View, Animated, Dimensions } from 'react-native';
+import { StyleSheet, Text, TouchableOpacity, View, Animated, Dimensions, Platform } from 'react-native';
 import { Camera, useCameraDevice, useCameraFormat, useMicrophonePermission } from 'react-native-vision-camera';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 import { numberToTime, ResourceType } from '@smart-link/im-base';
-import { moveFile, requestSaveFilePermissionIfAndroid, toAbsolutePath } from '../../utils/file';
+import { moveFile, requestSaveFilePermissionIfAndroid, toFullPath } from '../../utils/file';
 import { getImManager } from '../../init';
-import { dp, CaihIcon } from '@smart-link/rn-ui';
+import { dp, CaihIcon, Toast } from '@smart-link/rn-ui';
 import { createVideoThumbnail, Image, Video, getFileSize, uuidv4 } from 'react-native-compressor';
 const { PICTURE, VIDEO } = ResourceType;
 const FlashModeValue = ['on', 'off', 'auto'];
@@ -28,7 +28,8 @@ const CameraCapture = memo(props => {
     const camera = useRef(null);
     const [cameraTypeIndex, setCameraTypeIndex] = useState(0);
     const [isRecording, setIsRecording] = useState(false);
-    const [flashModeIndex, setFlashModeIndex] = useState(2);
+    const [flashModeIndex, setFlashModeIndex] = useState(1);
+    const toast = useRef();
     const microphone = useMicrophonePermission();
     const device = useCameraDevice(CameraTypeValue[cameraTypeIndex]);
     const format = useCameraFormat(device, [
@@ -39,6 +40,7 @@ const CameraCapture = memo(props => {
         }
     ]);
     const takePicture = () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
         if (camera.current && !isRecording) {
             const success = yield requestSaveFilePermissionIfAndroid(getImManager());
             if (!success) {
@@ -46,10 +48,29 @@ const CameraCapture = memo(props => {
             }
             const photo = yield camera.current.takePhoto({
                 flash: FlashModeValue[flashModeIndex],
+                enableShutterSound: false,
             });
             console.log('photo: ', photo);
-            const pictureData = yield buildPictureData(photo);
-            finishTakePicture && finishTakePicture(pictureData);
+            if (Platform.OS === 'android') {
+                toast.current = Toast.loading();
+            }
+            try {
+                const pictureData = yield buildPictureData(photo);
+                if (Platform.OS === 'android') {
+                    (_a = toast.current) === null || _a === void 0 ? void 0 : _a.close();
+                    toast.current = null;
+                }
+                finishTakePicture === null || finishTakePicture === void 0 ? void 0 : finishTakePicture(pictureData);
+            }
+            catch (e) {
+                console.log('take picture error: ', e);
+            }
+            finally {
+                if (Platform.OS === 'android') {
+                    (_b = toast.current) === null || _b === void 0 ? void 0 : _b.close();
+                    toast.current = null;
+                }
+            }
         }
     });
     const takeRecord = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -63,9 +84,28 @@ const CameraCapture = memo(props => {
                 videoCodec: 'h264',
                 fileType: 'mp4',
                 onRecordingFinished: (data) => __awaiter(void 0, void 0, void 0, function* () {
+                    var _c, _d;
                     console.log('onRecordingFinished: ', data);
-                    const videoData = yield buildVideoData(data);
-                    finishTakeRecord === null || finishTakeRecord === void 0 ? void 0 : finishTakeRecord(videoData);
+                    if (Platform.OS === 'android') {
+                        toast.current = Toast.loading();
+                    }
+                    try {
+                        const videoData = yield buildVideoData(data);
+                        if (Platform.OS === 'android') {
+                            (_c = toast.current) === null || _c === void 0 ? void 0 : _c.close();
+                            toast.current = null;
+                        }
+                        finishTakeRecord === null || finishTakeRecord === void 0 ? void 0 : finishTakeRecord(videoData);
+                    }
+                    catch (e) {
+                        console.log('record error: ', e);
+                    }
+                    finally {
+                        if (Platform.OS === 'android') {
+                            (_d = toast.current) === null || _d === void 0 ? void 0 : _d.close();
+                            toast.current = null;
+                        }
+                    }
                 }),
                 onRecordingError: (error) => {
                     console.log('onRecordingError: ', error);
@@ -75,12 +115,14 @@ const CameraCapture = memo(props => {
         }
     });
     const stopRecord = () => {
-        var _a;
+        var _a, _b;
         console.log('stopRecord： ', isRecording);
         if (isRecording) {
             (_a = camera.current) === null || _a === void 0 ? void 0 : _a.stopRecording();
             setIsRecording(false);
         }
+        (_b = toast.current) === null || _b === void 0 ? void 0 : _b.close();
+        toast.current = null;
     };
     const switchCameraType = useCallback(() => {
         const index = (cameraTypeIndex + 1) % 2;
@@ -98,6 +140,13 @@ const CameraCapture = memo(props => {
         }
         cancelCamera && cancelCamera();
     };
+    useEffect(() => {
+        return () => {
+            var _a;
+            (_a = toast.current) === null || _a === void 0 ? void 0 : _a.close();
+            toast.current = null;
+        };
+    }, []);
     return (<View style={styles.camera}>
             {device ? (<Camera ref={camera} device={device} format={format} isActive={true} style={styles.preview} photo={true} video={true} audio={microphone.hasPermission} outputOrientation="portrait" onInitialized={() => {
                 console.log('Camera initialized!');
@@ -273,7 +322,7 @@ export function buildPictureData(data) {
             compressionMethod: 'auto'
         });
         const localPath = yield moveFile(tmp, filename, PICTURE);
-        const size = yield getFileSize(localPath);
+        const size = yield getFileSize(toFullPath(localPath));
         let width = data.width;
         let height = data.height;
         if (data.orientation === 'portrait') {
@@ -297,14 +346,14 @@ function buildVideoData(data) {
         const uid = uuidv4();
         const path = data.path;
         try {
-            const compressPath = yield Video.compress(toAbsolutePath(path), {
+            const compressPath = yield Video.compress(path, {
                 compressionMethod: 'auto',
                 maxSize: 1080,
             });
             const ext = compressPath.split('.').pop();
             const filename = VIDEO + '_' + uid + '.' + ext;
             const size = yield getFileSize(compressPath);
-            let thumb = yield createVideoThumbnail(toAbsolutePath(compressPath));
+            let thumb = yield createVideoThumbnail(compressPath);
             console.log('RNThumbnail', thumb);
             const imageName = 'thumb_' + uid + '.jpg';
             const imagePath = yield moveFile(thumb.path, imageName, VIDEO);

package/dist/components/ChatAvatar/ChatAvatar.d.ts

@@ -1,15 +1,15 @@
 import React from 'react';
 import { ConversationType } from '@smart-link/im-base';
-import { ChatAvatarIdProps } from "./ChatAvatarId";
 type ChatAvatarProps = {
     id: string;
     name: string;
     url?: string;
     type?: ConversationType;
     size?: number;
+    needUpdate?: boolean;
     disabled?: boolean;
     editable?: boolean;
     onUpdate?: (url: string) => void;
-} & Pick<ChatAvatarIdProps, 'priority'>;
-declare const _default: React.MemoExoticComponent<({ id, name, url: fileId, size, disabled, type, editable, onUpdate, priority }: ChatAvatarProps) => React.JSX.Element>;
+};
+declare const _default: React.MemoExoticComponent<({ id, name, url: fileId, size, disabled, type, needUpdate, editable, onUpdate, }: ChatAvatarProps) => React.JSX.Element>;
 export default _default;

package/dist/components/ChatAvatar/ChatAvatar.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Avatar, dp, useNavigation } from '@smart-link/rn-ui';
+import { Avatar, dp, Toast, useNavigation } from '@smart-link/rn-ui';
 import React, { memo } from 'react';
 import { Image, TouchableOpacity } from 'react-native';
 import ImagePicker from 'react-native-image-crop-picker';
@@ -15,77 +15,79 @@ import { getImManager } from '../../init';
 import { ConversationActions, ConversationType, updateGroupInfo } from '@smart-link/im-base';
 import { defaultAvatars } from '../../default-assets';
 import uploadFile from '../../utils/upload';
-import { updateUserInfo } from '../../api/user';
-import { useAuth } from '../../hooks/useImSelector';
+import { reloadUserInfo, updateUserInfo } from '../../api/user';
 import { moveFile } from "../../utils/file";
 import ChatAvatarId from "./ChatAvatarId";
 import useImReady from "../../hooks/useImReady";
-const ChatAvatar = ({ id, name, url: fileId, size = dp(40), disabled, type = ConversationType.C2C, editable, onUpdate, priority = 'cache' }) => {
-    const { user } = useAuth();
+import { uuidv4 } from "react-native-compressor";
+import useTranslation from "../../hooks/useTranslation";
+import to from "await-to-js";
+const ChatAvatar = ({ id, name, url: fileId, size = dp(40), disabled, type = ConversationType.C2C, needUpdate, editable, onUpdate, }) => {
     const navigation = useNavigation();
     const ready = useImReady();
+    const { t } = useTranslation();
     const defaultAvatar = {
         [ConversationType.C2C]: defaultAvatars.EMPTY,
         [ConversationType.C2G]: defaultAvatars.GROUP,
         [ConversationType.B2C]: defaultAvatars.BUSI_NOTIFY,
     }[type] || defaultAvatars.EMPTY;
-    const onLongPress = () => __awaiter(void 0, void 0, void 0, function* () {
+    const onPress = () => __awaiter(void 0, void 0, void 0, function* () {
+        if (disabled)
+            return;
         if (editable) {
             const imManager = getImManager();
-            let image;
-            try {
-                image = yield ImagePicker.openPicker({
-                    cropping: true,
-                    width: 300,
-                    height: 300,
-                    compressImageQuality: 0.7,
-                });
-            }
-            catch (e) {
-                console.log('pick cancel: ', e);
+            imManager.setNetwork(false);
+            const [err, image] = yield to(ImagePicker.openPicker({
+                cropping: true,
+                width: 300,
+                height: 300,
+                compressImageQuality: 0.7,
+            }));
+            imManager.setNetwork(true);
+            if (err) {
+                console.log('pick cancel: ', err);
                 return;
             }
-            console.log('pick: ', image);
-            const fileId = yield uploadFile(image.path, image.mime);
-            const localPath = yield moveFile(image.path, fileId + '.jpg', 'avatars');
-            console.log('upload: ', fileId);
-            if (type === ConversationType.C2C) {
-                imManager.user.avatars = fileId;
-                // 更新头像b
-                setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
-                    try {
-                        yield updateUserInfo(Object.assign(Object.assign({}, user), { avatars: fileId }));
-                    }
-                    catch (e) {
-                        console.log('updateUserInfo error: ', e);
-                    }
-                }), 0);
+            try {
+                const localPath = yield moveFile(image.path, uuidv4() + '.jpg', 'avatars');
+                const newFileId = yield uploadFile(localPath, image.mime);
+                if (type === ConversationType.C2C) {
+                    imManager.user.avatars = newFileId;
+                    const user = imManager.user;
+                    yield updateUserInfo({
+                        userId: user.userId,
+                        userName: user.userName,
+                        avatars: newFileId,
+                        mobile: user.mobile,
+                    });
+                    yield reloadUserInfo();
+                }
+                else {
+                    // 更新群头像
+                    yield updateGroupInfo({
+                        chatGroupId: id,
+                        avatars: newFileId,
+                    });
+                }
+                onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate(newFileId);
+                yield imManager.store.dispatch(ConversationActions.updateAvatars(imManager, id, newFileId));
             }
-            else {
-                // 更新群头像
-                yield updateGroupInfo({
-                    chatGroupId: id,
-                    avatars: fileId,
-                });
+            catch (e) {
+                console.log('[ChatAvatar] update avatar error: ', e);
+                Toast.error(t('avatarsUpdateFail'));
             }
-            // 更新本地资源
-            imManager.updateResource({ url: fileId, localPath });
-            imManager.store.dispatch(ConversationActions.updateAvatars(imManager, id, fileId));
-            onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate(fileId);
-        }
-    });
-    const onPress = () => {
-        if (disabled || editable)
             return;
+        }
         if (type === ConversationType.C2C) {
             // 跳转到个人详情页
             navigation.navigate('UserDetail', {
                 userId: id,
             });
         }
-    };
-    return (<TouchableOpacity style={{ width: size, height: size }} disabled={disabled} onPress={onPress} onLongPress={onLongPress}>
-            {ready ? <ChatAvatarId priority={priority} id={id} fileId={fileId} size={size} name={name} defaultAvatar={defaultAvatar}/> : <Avatar icon={<Image style={size ? { width: size, height: size } : {}} source={defaultAvatar}/>}/>}
+    });
+    return (<TouchableOpacity style={{ width: size, height: size }} disabled={disabled} onPress={onPress}>
+            {ready ? <ChatAvatarId needUpdate={needUpdate} id={id} fileId={fileId} size={size} name={name} defaultAvatar={defaultAvatar}/> :
+            <Avatar icon={<Image style={size ? { width: size, height: size } : {}} source={defaultAvatar}/>}/>}
         </TouchableOpacity>);
 };
 export default memo(ChatAvatar);

package/dist/components/ChatAvatar/ChatAvatarId.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { ChatAvatarProps } from "./ChatAvatarLocal";
 export interface ChatAvatarIdProps extends ChatAvatarProps {
     id: string;
-    priority?: 'cache' | 'outside';
+    needUpdate?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ id, fileId: fileIdProp, priority, ...ret }: ChatAvatarIdProps) => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ id, fileId: fileIdProp, needUpdate, ...ret }: ChatAvatarIdProps) => React.JSX.Element>;
 export default _default;

package/dist/components/ChatAvatar/ChatAvatarId.js

@@ -1,12 +1,3 @@
-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());
-    });
-};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -19,49 +10,31 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import * as React from 'react';
-import { memo, useEffect, useState } from "react";
-import { getImManager } from "../../init";
+import { memo, useEffect, useState } from 'react';
 import ChatAvatarLocal from "./ChatAvatarLocal";
-import { queryUserByIds } from "../../api/user";
-import { useAvatars } from "../../hooks/useImSelector";
+import { getImManager } from "../../init";
+import { AvatarSubscribe } from '@smart-link/im-base';
 const ChatAvatarId = (_a) => {
-    var { id, fileId: fileIdProp, priority } = _a, ret = __rest(_a, ["id", "fileId", "priority"]);
-    const [fileId, setFileId] = useState(fileIdProp);
-    const cacheFileId = useAvatars()[id];
+    var { id, fileId: fileIdProp, needUpdate } = _a, ret = __rest(_a, ["id", "fileId", "needUpdate"]);
+    const [fileId, setFileId] = useState(fileIdProp || '');
     useEffect(() => {
-        if (priority === 'outside') {
+        if (fileIdProp) {
             setFileId(fileIdProp);
-            getImManager().updateAvatar({ avatarsId: id, url: fileIdProp });
-            return;
-        }
-        if (priority === 'cache' && cacheFileId) {
-            setFileId(cacheFileId);
-            return;
+            if (needUpdate) {
+                getImManager().updateAvatar({ avatarsId: id, url: fileIdProp }).then(r => { });
+            }
         }
-        getImManager().loadAvatarFromCache(id).then((localId) => __awaiter(void 0, void 0, void 0, function* () {
-            if (!localId) {
-                try {
-                    // 通过接口请求头像
-                    const { data: [user] } = yield queryUserByIds([id]);
-                    if (user === null || user === void 0 ? void 0 : user.avatars) {
-                        if (fileId !== user.avatars) {
-                            setFileId(user.avatars);
-                            getImManager().updateAvatar({ avatarsId: id, url: user.avatars });
-                        }
-                    }
-                    else {
-                        setFileId('');
-                    }
+        else {
+            getImManager().loadAvatarFromCache(id).then(fileId => {
+                if (fileId) {
+                    setFileId(fileId);
                 }
-                catch (e) {
-                    console.log('queryUserByIds error: ', e);
-                }
-            }
-            else {
-                setFileId(localId);
-            }
-        }));
-    }, [id, priority, fileIdProp, cacheFileId]);
+            });
+        }
+        return AvatarSubscribe.subscribe(id, (fileId) => {
+            setFileId(fileId);
+        });
+    }, [id, needUpdate, fileIdProp]);
     return (<ChatAvatarLocal fileId={fileId} {...ret}/>);
 };
 export default memo(ChatAvatarId);

package/dist/components/ChatAvatar/ChatAvatarLocal.js

@@ -14,6 +14,7 @@ import { useEffect, useState } from "react";
 import { getImManager } from "../../init";
 import RNFS from "react-native-fs";
 import LocalImage from "../../components/LocalImage";
+import { toAbsolutePath } from "../../utils/file";
 // 防止重复下载
 const downloadMap = Object.create(null);
 const cacheMap = Object.create(null);
@@ -26,12 +27,24 @@ const ChatAvatarLocal = ({ fileId, size, name, defaultAvatar }) => {
             setReady(true);
             return;
         }
+        const fetchFromCache = (fileId) => __awaiter(void 0, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
+                    if (cacheMap[fileId]) {
+                        setAvatar(cacheMap[fileId]);
+                        resolve(cacheMap[fileId]);
+                    }
+                    else {
+                        yield fetchFromCache(fileId);
+                    }
+                }), 16);
+            });
+        });
         if (fileId) {
             const imManager = getImManager();
             const localPath = yield imManager.loadResourceFromCache(fileId);
-            // console.log('loadResourceFromCache: ', localPath)
             if (localPath) {
-                const exists = yield RNFS.exists(localPath);
+                const exists = yield RNFS.exists(toAbsolutePath(localPath));
                 if (exists) {
                     cacheMap[fileId] = localPath;
                     setAvatar(localPath);
@@ -39,13 +52,14 @@ const ChatAvatarLocal = ({ fileId, size, name, defaultAvatar }) => {
                     return;
                 }
             }
-            if (downloadMap[fileId]) {
-                return;
-            }
-            downloadMap[fileId] = true;
             try {
-                console.log('imManager.download: ', fileId, Number.isNaN(Number(fileId)));
                 if (Number.isNaN(Number(fileId))) {
+                    if (downloadMap[fileId]) {
+                        // 等待下载完成，从缓存获取
+                        yield fetchFromCache(fileId);
+                        return;
+                    }
+                    downloadMap[fileId] = true;
                     // 下载头像文件
                     const localPath = yield imManager.download({
                         fileId,
@@ -67,8 +81,7 @@ const ChatAvatarLocal = ({ fileId, size, name, defaultAvatar }) => {
                     setReady(true);
                 }
             }
-            catch (e) {
-                downloadMap[fileId] = false;
+            finally {
             }
         }
         else {

package/dist/components/Favicon.js

@@ -15,7 +15,7 @@ const Favicon = ({ url, size = 40 }) => {
         if (!url)
             return;
         getFavicon(url).then((favicon) => {
-            console.log('favicon: ', favicon);
+            // console.log('favicon: ', favicon);
             setFavicon(favicon);
         });
     }, [url]);

package/dist/components/LocalImage.js

@@ -7,6 +7,8 @@ const LocalImage = memo(props => {
     if (Object.prototype.toString.call(localPath) === '[object String]') {
         source = { uri: toAbsolutePath(localPath) };
     }
-    return <Image style={style} resizeMode={resizeMode} source={source}/>;
+    return <Image style={style} resizeMode={resizeMode} source={source} onError={(e) => {
+            console.log('local image error: ', localPath);
+        }}/>;
 });
 export default LocalImage;

package/dist/components/styles.d.ts

@@ -6,8 +6,14 @@ export declare const shadowStyle: {
     };
     shadowRadius: number;
     shadowOpacity: number;
+    elevation?: undefined;
+} | {
     elevation: number;
-};
+    shadowColor?: undefined;
+    shadowOffset?: undefined;
+    shadowRadius?: undefined;
+    shadowOpacity?: undefined;
+} | undefined;
 export declare const borderStyle: {
     borderRadius: number;
 };

package/dist/components/styles.js

@@ -1,20 +1,25 @@
 import { dp } from '@smart-link/rn-ui';
-export const shadowStyle = {
-    shadowColor: 'rgba(0, 0, 0, 0.08)',
-    shadowOffset: {
-        width: 0,
-        height: dp(3),
+import { Platform } from "react-native";
+export const shadowStyle = Platform.select({
+    ios: {
+        shadowColor: '#eee',
+        shadowOffset: {
+            width: 0,
+            height: dp(2),
+        },
+        shadowRadius: dp(3),
+        shadowOpacity: 1,
     },
-    shadowRadius: dp(3),
-    shadowOpacity: 1,
-    elevation: 1.5,
-};
+    android: {
+        elevation: 2,
+    },
+});
 export const borderStyle = {
     borderRadius: dp(5),
 };
 export const plain = {
-    color: '#000',
-    fontSize: dp(14),
+    color: '#222',
+    fontSize: dp(15),
     paddingHorizontal: dp(12),
     paddingVertical: dp(10),
 };

package/dist/hooks/useAnimatedValue.d.ts

@@ -0,0 +1,2 @@
+import { Animated } from "react-native";
+export declare function useAnimatedValue(initialValue: number): Animated.Value;

package/dist/hooks/useAnimatedValue.js

@@ -0,0 +1,9 @@
+import { Animated } from "react-native";
+import React from "react";
+export function useAnimatedValue(initialValue) {
+    const value = React.useRef();
+    if (!value.current) {
+        value.current = new Animated.Value(initialValue);
+    }
+    return value.current;
+}