@smart-link/rn-im 1.0.2 → 1.0.5

package/dist/components/ChatAvatar/ChatAvatar.js

@@ -47,26 +47,11 @@ const user_1 = require("../../api/user");
 const useImSelector_1 = require("../../hooks/useImSelector");
 const file_1 = require("../../utils/file");
 const ChatAvatarId_1 = __importDefault(require("../../components/ChatAvatar/ChatAvatarId"));
+const useImReady_1 = __importDefault(require("../../hooks/useImReady"));
 const ChatAvatar = ({ id, name, url: fileId, size = (0, rn_ui_1.dp)(40), disabled, type = im_base_1.ConversationType.C2C, editable, onUpdate, priority = 'cache' }) => {
     const { user } = (0, useImSelector_1.useAuth)();
     const navigation = (0, rn_ui_1.useNavigation)();
-    const [ready, setReady] = (0, react_1.useState)(false);
-    (0, react_1.useEffect)(() => {
-        let imManager = (0, init_1.getImManager)();
-        if (!imManager) {
-            const cycle = setInterval(() => {
-                imManager = (0, init_1.getImManager)();
-                if (imManager) {
-                    clearInterval(cycle);
-                    setReady(true);
-                    return;
-                }
-            }, 100);
-        }
-        else {
-            setReady(true);
-        }
-    }, []);
+    const ready = (0, useImReady_1.default)();
     const defaultAvatar = {
         [im_base_1.ConversationType.C2C]: default_assets_1.defaultAvatars.EMPTY,
         [im_base_1.ConversationType.C2G]: default_assets_1.defaultAvatars.GROUP,

package/dist/components/ChatAvatar/ChatAvatarLocal.js

@@ -17,23 +17,30 @@ const react_native_1 = require("react-native");
 const rn_ui_1 = require("@smart-link/rn-ui");
 const react_2 = require("react");
 const init_1 = require("../../init");
-const file_1 = require("../../utils/file");
 const react_native_fs_1 = __importDefault(require("react-native-fs"));
-;
+const LocalImage_1 = __importDefault(require("../../components/LocalImage"));
 // 防止重复下载
 const downloadMap = Object.create(null);
+const cacheMap = Object.create(null);
 const ChatAvatarLocal = ({ fileId, size, name, defaultAvatar }) => {
-    const [avatar, setAvatar] = (0, react_2.useState)('');
+    const [avatar, setAvatar] = (0, react_2.useState)(fileId ? cacheMap[fileId] : '');
+    const [ready, setReady] = (0, react_2.useState)(false);
     const loadAvatar = () => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('loadResourceFromCache: ', fileId);
+        if (fileId && cacheMap[fileId]) {
+            setAvatar(cacheMap[fileId]);
+            setReady(true);
+            return;
+        }
         if (fileId) {
             const imManager = (0, init_1.getImManager)();
             const localPath = yield imManager.loadResourceFromCache(fileId);
-            console.log('loadResourceFromCache: ', localPath);
+            // console.log('loadResourceFromCache: ', localPath)
             if (localPath) {
                 const exists = yield react_native_fs_1.default.exists(localPath);
                 if (exists) {
-                    setAvatar((0, file_1.toAbsolutePath)(localPath));
+                    cacheMap[fileId] = localPath;
+                    setAvatar(localPath);
+                    setReady(true);
                     return;
                 }
             }
@@ -50,7 +57,9 @@ const ChatAvatarLocal = ({ fileId, size, name, defaultAvatar }) => {
                         filename: `${fileId}.jpg`,
                         resourceType: 'avatars',
                     });
-                    setAvatar((0, file_1.toAbsolutePath)(localPath));
+                    cacheMap[fileId] = localPath;
+                    setAvatar(localPath);
+                    setReady(true);
                     // 更新资源
                     imManager.updateResource({
                         url: fileId,
@@ -58,19 +67,30 @@ const ChatAvatarLocal = ({ fileId, size, name, defaultAvatar }) => {
                     });
                 }
                 else {
+                    cacheMap[fileId] = fileId;
                     setAvatar(fileId);
+                    setReady(true);
                 }
             }
             catch (e) {
                 downloadMap[fileId] = false;
             }
         }
+        else {
+            setReady(true);
+        }
     });
     (0, react_2.useEffect)(() => {
-        loadAvatar();
+        loadAvatar().then(_r => { });
     }, [fileId]);
-    return (<rn_ui_1.Avatar src={avatar} icon={<react_native_1.Image style={{ width: size, height: size }} source={defaultAvatar}/>} style={size ? { width: size, height: size } : {}}>
-            {name === null || name === void 0 ? void 0 : name[0]}
-        </rn_ui_1.Avatar>);
+    if (ready && avatar) {
+        return (<LocalImage_1.default localPath={avatar} style={size ? { width: size, height: size, borderRadius: size / 2 } : { width: 40, height: 40, borderRadius: 20 }}/>);
+    }
+    else if (ready) {
+        return (<rn_ui_1.Avatar icon={<react_native_1.Image style={{ width: size, height: size }} source={defaultAvatar}/>} style={size ? { width: size, height: size } : {}}>
+                {name === null || name === void 0 ? void 0 : name[0]}
+            </rn_ui_1.Avatar>);
+    }
+    return <react_native_1.View style={size ? { width: size, height: size } : { width: 40, height: 40 }}/>;
 };
 exports.default = ChatAvatarLocal;

package/dist/hooks/useImReady.d.ts

@@ -0,0 +1 @@
+export default function useImReady(): boolean;

package/dist/hooks/useImReady.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = require("react");
+const init_1 = require("../init");
+let isReady = false;
+function useImReady() {
+    const [ready, setReady] = (0, react_1.useState)(isReady);
+    (0, react_1.useEffect)(() => {
+        let imManager = (0, init_1.getImManager)();
+        if (!imManager) {
+            const cycle = setInterval(() => {
+                imManager = (0, init_1.getImManager)();
+                if (imManager) {
+                    clearInterval(cycle);
+                    isReady = true;
+                    setReady(true);
+                    return;
+                }
+            }, 100);
+        }
+        else {
+            setReady(true);
+        }
+    }, []);
+    return isReady || ready;
+}
+exports.default = useImReady;

package/dist/init.js

@@ -39,7 +39,7 @@ const initImSdk = ({ user, storage, store, server, logo: outLogo, t, logout, und
         db,
         store,
         storage,
-        server: server,
+        server,
         namespace: '/chat',
         user: (0, lodash_es_1.cloneDeep)(user),
         platform: react_native_1.Platform.OS === 'ios' ? im_base_1.Platform.IOS : im_base_1.Platform.ANDROID,

package/dist/locales/lao/addressList.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const locale = {
-    search: 'Search',
+    search: 'ຄົ້ນຫາ',
     addressList: 'ລາຍຊື່ການຕິດຕໍ່',
     groupChat: 'ກຸ່ມ',
     orgStructure: 'ໂຄງຮ່າງອົງການຈັດຕັ້ງ',
@@ -16,16 +16,16 @@ const locale = {
     byCharacters: 'ຈາກຕົວອັກສອນ',
     addingGroupMembers: 'ກຳລັງເພີ່ມສະມາຊິກ',
     creatingGroup: 'ກຸ່ມສົນທະນາກຳລັງລິເລີ່ມ',
-    userDetail: 'User Detail',
+    userDetail: 'ລາຍລະອຽດຂອງຜູ້ໃຊ້',
     noData: 'ບໍ່ມີຂໍມູນ',
     loading: 'ກຳລັງໂຫຼດ',
     requestFail: 'ຮ້ອງຂໍລົ້ມເຫຼວ',
     userCode: 'ເລກທີຂອງພະນັກງານ',
     noAdd: 'ຍັງບໍ່ໄດ້ເພີ່ມ',
     mobile: 'ໂທລະສັບ',
-    email: 'Email',
+    email: 'ອີເມວ',
     sendNews: 'ສົ່ງຂໍ້ຄວາມ',
-    job: 'Job',
-    otherJob: 'Other Job',
+    job: 'ວຽກ',
+    otherJob: 'ວຽກອື່ນໆ',
 };
 exports.default = locale;

package/dist/pages/address-list/AddressList.js

@@ -33,16 +33,12 @@ const useTranslation_1 = __importDefault(require("../../hooks/useTranslation"));
 const Icons_1 = require("./Icons");
 const addressList_1 = require("../../api/addressList");
 const useImSelector_1 = require("../../hooks/useImSelector");
-const { width: screenWidth } = react_native_1.Dimensions.get('window');
 const AddressList = ({ navigation }) => {
     const [groupCategoryList, setGroupCategoryList] = (0, react_1.useState)([]);
     const { t } = (0, useTranslation_1.default)();
     const theme = (0, rn_ui_1.useTheme)();
     const { user } = (0, useImSelector_1.useAuth)();
     const compName = (user === null || user === void 0 ? void 0 : user.groupNamePath) || (user === null || user === void 0 ? void 0 : user.userName) || '';
-    (0, react_1.useEffect)(() => {
-        navigation.setOptions({ title: t('addressList') });
-    }, [t, navigation]);
     (0, react_1.useEffect)(() => {
         (0, addressList_1.listGroupCategory)({ appType: null }).then(({ data }) => {
             setGroupCategoryList(data);

package/dist/pages/conversation/List.js

@@ -76,28 +76,39 @@ const List = ({ navigation }) => {
                 headerTitle = t('message') + '(' + t('unConnect') + ')';
                 break;
         }
+        const options = [
+            {
+                icon: <MaterialIcons_1.default name="person-add"/>,
+                content: t('createGroupChat'),
+                onPress: () => {
+                    (0, init_1.getImManager)().store.dispatch((0, contact_slice_1.startCreateGroup)());
+                    navigation.navigate('ChooseContact', {
+                        chooseOrg: true,
+                        checkMode: 'multi',
+                    });
+                },
+            },
+            {
+                icon: <MaterialIcons_1.default name="qr-code-scanner"/>,
+                content: t('scan'),
+                onPress: () => {
+                    navigation.navigate('ScanCode');
+                },
+            },
+        ];
+        if (__DEV__) {
+            options.push({
+                icon: <MaterialIcons_1.default name="settings"/>,
+                content: '清空数据并重启',
+                onPress: () => {
+                    (0, init_1.getImManager)().db.clean();
+                    react_native_1.DevSettings.reload();
+                },
+            });
+        }
         navigation.setOptions({
             headerTitle,
-            headerRight: () => (<rn_ui_1.Popover type="dark" placement="bottom" layout="vertical" duration={100} options={[
-                    {
-                        icon: <MaterialIcons_1.default name="person-add"/>,
-                        content: t('createGroupChat'),
-                        onPress: () => {
-                            (0, init_1.getImManager)().store.dispatch((0, contact_slice_1.startCreateGroup)());
-                            navigation.navigate('ChooseContact', {
-                                chooseOrg: true,
-                                checkMode: 'multi',
-                            });
-                        },
-                    },
-                    {
-                        icon: <MaterialIcons_1.default name="qr-code-scanner"/>,
-                        content: t('scan'),
-                        onPress: () => {
-                            navigation.navigate('ScanCode');
-                        },
-                    },
-                ]} contentStyle={{ borderRadius: (0, rn_ui_1.dp)(6) }}>
+            headerRight: () => (<rn_ui_1.Popover type="dark" placement="bottom" layout="vertical" duration={100} options={options} contentStyle={{ borderRadius: (0, rn_ui_1.dp)(6) }}>
                     <react_native_1.TouchableOpacity style={{ marginHorizontal: (0, rn_ui_1.dp)(10), padding: (0, rn_ui_1.dp)(9) }}>
                         <rn_ui_1.CaihIcon name="picker-add" size={(0, rn_ui_1.dp)(19)} color={'#f6f6f6'}/>
                     </react_native_1.TouchableOpacity>

package/dist/pages/conversation/setting/SettingChatBg.js

@@ -52,13 +52,20 @@ const SettingChatBg = ({ navigation }) => {
     }, [navigation, t]);
     const openAlbum = () => __awaiter(void 0, void 0, void 0, function* () {
         let toast;
+        let image;
         try {
-            const image = yield react_native_image_crop_picker_1.default.openPicker({
+            image = yield react_native_image_crop_picker_1.default.openPicker({
                 mediaType: 'photo',
                 multiple: false,
                 compressImageQuality: 0.7,
                 compressImageMaxWidth: 1080,
             });
+        }
+        catch (e) {
+            console.log(e);
+            return;
+        }
+        try {
             toast = rn_ui_1.Toast.loading();
             const fileId = yield (0, upload_1.default)(image.path, image.mime);
             yield (0, im_base_1.updateOptionSetting)({

package/dist/pages/message/MessageList.js

@@ -57,7 +57,7 @@ const MessageList = ({ navigation }) => {
     const [nativeEvent, setNativeEvent] = (0, react_1.useState)();
     const isB2C = (currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.type) === im_base_1.ConversationType.B2C;
     (0, react_1.useEffect)(() => {
-        console.log('[进入会话]: ', currentConversation);
+        console.log('[进入会话]: ', currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.name);
         if (currentConversation) {
             navigation.setOptions({
                 headerLeft: isMultiple

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

@@ -6,5 +6,5 @@ export interface MessagePictureAlbumProps {
     messageSeq: string;
     onClose: () => void;
 }
-declare const MessagePictureAlbum: ({ visible, onClose, messages, messageSeq }: MessagePictureAlbumProps) => React.JSX.Element;
-export default MessagePictureAlbum;
+declare const _default: React.MemoExoticComponent<({ visible, onClose, messages, messageSeq }: MessagePictureAlbumProps) => React.JSX.Element>;
+export default _default;

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

@@ -68,7 +68,7 @@ const MessagePictureAlbum = ({ visible, onClose, messages, messageSeq }) => {
         setSources([]);
         onClose();
     };
-    return (<react_native_1.Modal visible={visible} onRequestClose={handleClose}>
+    return (<react_native_1.Modal style={{ flex: 1 }} statusBarTranslucent animationType="fade" visible={visible} onRequestClose={handleClose}>
             {visible && (<react_native_1.View style={styles.root}>
                     {react_native_1.Platform.OS === 'android' && <react_native_1.StatusBar backgroundColor={'#000'}/>}
                     <react_native_1.View style={{ width: width, height: height }}>
@@ -87,7 +87,6 @@ const styles = react_native_1.StyleSheet.create({
         backgroundColor: '#000',
         justifyContent: 'center',
         alignItems: 'center',
-        position: 'relative',
     },
     cancel: {
         height: (0, rn_ui_1.dp)(40),
@@ -102,4 +101,4 @@ const styles = react_native_1.StyleSheet.create({
         opacity: 0.7,
     },
 });
-exports.default = MessagePictureAlbum;
+exports.default = (0, react_1.memo)(MessagePictureAlbum);

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

@@ -35,23 +35,23 @@ const golden_rectangle_1 = require("../../../../utils/golden-rectangle");
 const MaterialIcons_1 = __importDefault(require("react-native-vector-icons/MaterialIcons"));
 const video_action_1 = require("../../../../slice/video/video.action");
 const styles_1 = require("../../../../components/styles");
-const UploadProgress_1 = __importDefault(require("../../../../pages/message/components/UploadProgress"));
+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 { width = (0, rn_ui_1.dp)(100), height = (0, rn_ui_1.dp)(163) } = payload;
-    const size = (0, golden_rectangle_1.calculate)(height, width);
+    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', payload);
+    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
             }));
         }} onLongPress={onLongPress}>
-            <react_native_fast_image_1.default style={[size, styles_1.borderStyle]} resizeMode='cover' source={thumbnail}/>
+            {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' }]}/>}
             <UploadProgress_1.default show={messageStatus === im_base_1.MessageStatus.EMITTING && !payload.fileId && payload.size > 0} width={size.width} sendSize={sendSize} totalSize={payload.size}/>
             <react_native_1.View style={styles.playView}>
                 <MaterialIcons_1.default size={30} name='play-circle-outline' color='#fff'/>

package/dist/utils/file.js

@@ -114,7 +114,7 @@ const download = ({ fileId, fileSize, resourceType, filename, onProgress }) => _
             // 设置 background 为 false，确保 progress 回调能够正常触发
             background: true,
             progress: (e) => {
-                console.log('download progress: ', e);
+                // console.log('download progress: ', e);
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({ loaded: e.bytesWritten, total: e.contentLength });
             }
         });
@@ -138,7 +138,7 @@ const download = ({ fileId, fileSize, resourceType, filename, onProgress }) => _
         }
         const contentLength = resp.headers.get('Content-Length') || fileSize;
         const result = yield (0, react_native_compressor_1.download)(fileUrl, (progress) => {
-            console.log('download progress: ', progress);
+            // console.log('download progress: ', progress);
             onProgress === null || onProgress === void 0 ? void 0 : onProgress({ loaded: progress * Number(contentLength), total: Number(contentLength) });
         });
         return yield (0, exports.moveFile)(result, filename, resourceType);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@smart-link/rn-im",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "",
   "main": "./dist/index.js",
   "dependencies": {
     "color": "^5.0.0",
     "lodash-es": "^4.17.21",
     "emoji-regex": "^10.4.0",
-    "@smart-link/im-base": "^1.0.2"
+    "@smart-link/im-base": "^1.0.5"
   },
   "devDependencies": {
     "@react-native/eslint-config": "0.73.2",
@@ -18,7 +18,7 @@
     "@types/react-native-video": "5.0.19",
     "concurrently": "^9.1.0",
     "eslint-plugin-jest": "^26.5.3",
-    "rimraf": "^5.0.1",
+    "rimraf": "^6.0.1",
     "tsc-alias": "^1.8.10",
     "typescript": "5.0.4",
     "react-native": "^0.73.0"
@@ -62,7 +62,7 @@
     "react-redux": "^8.1.3",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
-    "@smart-link/rn-ui": "^1.0.4",
+    "@smart-link/rn-ui": "^1.0.6",
     "@smart-link/rn-base": "^1.0.7"
   },
   "files": [
@@ -74,6 +74,6 @@
     "clean": "rimraf ./dist",
     "build": "pnpm run clean && tsc && tsc-alias",
     "build:watch": "concurrently \"tsc -w\" \"tsc-alias -w\"",
-    "release": "pnpm publish --tag latest --access public --no-git-checks"
+    "release": "pnpm build && pnpm publish --tag latest --access public --no-git-checks"
   }
 }