@smart-link/rn-im 1.0.11 → 1.0.13

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

@@ -54,7 +54,7 @@ const ConversationCard = (0, react_1.memo)(props => {
                 <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={avatars}/>
                 </rn_ui_1.Badge>
-                {status && <react_native_1.View style={styles.status}>
+                {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'}/>
                 </react_native_1.View>}
             </react_native_1.View>

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

@@ -57,7 +57,7 @@ const OptionAvatars = (0, react_1.memo)(props => {
     const subCount = isMgr ? 8 : 9;
     // @ts-ignore
     return (<react_native_1.View>
-            {showTitle && (<rn_ui_1.ListRow title={t('groupChatMember')} detail={'(' + (list.length || 0) + ')'} onPress={toMoreMember}/>)}
+            {showTitle && (<rn_ui_1.ListRow title={t('groupChatMember')} detail={'(' + (memberTotalCount || 0) + ')'} onPress={toMoreMember}/>)}
 
             <react_native_1.View style={[
             styles.avatarsList,

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

@@ -15,16 +15,17 @@ const styles_1 = require("../../../components/styles");
 const { OWNER, MGR, } = im_base_1.MemberLevel;
 const OptionGroupMoreMember = (props) => {
     const { groupDetail } = (0, useImSelector_1.useChatGroup)();
-    const { groupMemberList } = groupDetail;
+    const { memberTotalCount } = groupDetail;
+    const { allMembers } = (0, useImSelector_1.useMessage)();
     const [keyword, setKeyword] = (0, react_1.useState)('');
     const { t } = (0, useTranslation_1.default)();
     const navigation = (0, rn_ui_1.useNavigation)();
     (0, react_1.useEffect)(() => {
         navigation.setOptions({
-            title: t('groupChatMember') + '(' + groupMemberList.length + ')',
+            title: t('groupChatMember') + '(' + memberTotalCount + ')',
         });
-    }, [t, navigation, groupMemberList.length]);
-    const listLineComponent = groupMemberList.length === 0 ? null : <react_native_1.View style={styles.listLine}/>;
+    }, [t, navigation, memberTotalCount]);
+    const listLineComponent = allMembers.length === 0 ? null : <react_native_1.View style={styles.listLine}/>;
     const itemSeparatorComponent = () => <react_native_1.View style={[styles.separator]}/>;
     const keyExtractor = (member) => member.userId;
     const renderItem = ({ item }) => {
@@ -61,13 +62,13 @@ const OptionGroupMoreMember = (props) => {
             </react_native_1.TouchableOpacity>);
     };
     const list = (0, react_1.useMemo)(() => {
-        return groupMemberList.slice().reverse().filter((item) => {
+        return allMembers.slice().reverse().filter((item) => {
             if (keyword) {
                 return item.memberName.indexOf(keyword) > -1;
             }
             return true;
         });
-    }, [groupMemberList, keyword]);
+    }, [allMembers, keyword]);
     return (<rn_ui_1.NavigationPage noPadding>
             <rn_ui_1.SearchInput value={keyword} onChange={(txt) => {
             setKeyword(txt);

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

@@ -27,16 +27,17 @@ const ConversationSetting = ({ navigation }) => {
     const { currentConversation } = (0, useImSelector_1.useConversation)();
     const { groupDetail } = (0, useImSelector_1.useChatGroup)();
     const title = t('chatSetting');
+    const { memberTotalCount = 0 } = groupDetail || {};
     // 设置标题
     (0, react_1.useEffect)(() => {
         let newTitle = title;
-        if ((currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.type) === im_base_1.ConversationType.C2G && (currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.memberTotalCount)) {
-            newTitle += `(${currentConversation.memberTotalCount})`;
+        if ((currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.type) === im_base_1.ConversationType.C2G && memberTotalCount) {
+            newTitle += `(${memberTotalCount})`;
         }
         navigation.setOptions({
             title: newTitle,
         });
-    }, [title, navigation, currentConversation]);
+    }, [title, navigation, currentConversation, memberTotalCount]);
     if (!currentConversation) {
         return null;
     }
@@ -57,7 +58,7 @@ const ConversationSetting = ({ navigation }) => {
             imManager.clearMessages(currentConversation.id);
         }, t);
     };
-    const { id, type, name, avatars, enableNoDisturb = 'off', enableTop = 'off', notice = '', enableInviteValidate = 'off', memberLevel = MEMBER, memberTotalCount = 0, groupType, } = currentConversation;
+    const { id, type, name, avatars, enableNoDisturb = 'off', enableTop = 'off', notice = '', enableInviteValidate = 'off', memberLevel = MEMBER, groupType, } = currentConversation;
     const groupMemberList = (_a = groupDetail === null || groupDetail === void 0 ? void 0 : groupDetail.groupMemberList.slice().reverse()) !== null && _a !== void 0 ? _a : [];
     console.log('type: ', type, '[memberLevel]', memberLevel);
     const isMgr = memberLevel === MGR || memberLevel === OWNER;
@@ -147,7 +148,7 @@ const ConversationSetting = ({ navigation }) => {
             })
                 .splice(0, MAX_SHOW_MEMBER_COUNT);
             content = (<>
-                    <OptionAvatars_1.default list={avatarList} showTitle showAdd showMore={isMgr ? avatarList.length > 8 : avatarList.length > 9} isMgr={isMgr} addUser={() => {
+                    <OptionAvatars_1.default list={avatarList} showTitle memberTotalCount={memberTotalCount} showAdd showMore={isMgr ? avatarList.length > 8 : avatarList.length > 9} isMgr={isMgr} addUser={() => {
                     // 添加成员
                     (0, init_1.getImManager)().store.dispatch((0, contact_slice_1.startAddMember)());
                     navigation.navigate('ChooseContact', {
@@ -155,6 +156,7 @@ const ConversationSetting = ({ navigation }) => {
                         checkMode: 'multi',
                     });
                 }} removeUser={removeUser} toMoreMember={() => {
+                    (0, init_1.getImManager)().store.dispatch(im_base_1.MessagePanelActions.loadAllMembers(id));
                     navigation.navigate('OptionGroupMoreMember');
                 }}/>
                     <rn_ui_1.Space size={'m'}/>

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

@@ -45,24 +45,35 @@ const UploadProgress_1 = __importDefault(require("../UploadProgress"));
 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 ext = payload.filename.split('.').pop();
     const Icon = (0, file_icon_1.findSvgIcon)(ext);
     const path = (0, react_1.useRef)('');
     const downloading = (0, react_1.useRef)(false);
+    const { t } = (0, useTranslation_1.default)();
     const [download, setDownload] = (0, react_1.useState)({
         progress: 0,
         status: 'pending',
     });
+    const openWithLocal = (path) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield react_native_file_viewer_1.default.open(path);
+        }
+        catch (e) {
+            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 react_native_file_viewer_1.default.open((payload.localPath || path.current));
+                yield openWithLocal((payload.localPath || path.current));
             }
             else if (payload.fileId) {
                 if (downloading.current)
                     return;
                 downloading.current = true;
-                const localPath = yield (0, init_1.getImManager)().download({
+                const imManager = (0, init_1.getImManager)();
+                const localPath = yield imManager.download({
                     fileId: payload.fileId,
                     resourceType: 'file',
                     filename: payload.filename,
@@ -83,14 +94,14 @@ const PayloadFile = ({ payload, messageSeq, direction, showArrow = true, message
                     messageSeq,
                     payload: Object.assign(Object.assign({}, payload), { localPath: localPath }),
                 });
-                yield react_native_file_viewer_1.default.open(localPath);
+                yield openWithLocal(localPath);
             }
         })}>
             <react_native_1.View style={{ flexDirection: 'row', alignItems: 'center' }}>
                 <Icon style={styles.fileIcon}/>
                 <react_native_1.View style={{ flex: 1 }}>
-                    <react_native_1.Text>{payload.filename}</react_native_1.Text>
-                    <react_native_1.Text style={styles.size}>{(0, file_1.numberToFileSize)(payload.size)}</react_native_1.Text>
+                    <react_native_1.Text numberOfLines={1} ellipsizeMode="middle">{payload.filename}</react_native_1.Text>
+                    <react_native_1.Text style={styles.size}>{(0, file_1.numberToFileSize)(payload.size)}{payload.localPath ? t('downloaded') : ''}</react_native_1.Text>
                 </react_native_1.View>
             </react_native_1.View>
             <UploadProgress_1.default show={download.status === 'downloading'} width={200} sendSize={download.progress} totalSize={payload.size}/>

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

@@ -57,7 +57,7 @@ const PayloadMultiple = (0, react_1.memo)(({ payload, direction, showArrow = tru
                 {messages.map((message, index) => {
             return message === 'more' ? (<react_native_1.Text key={index} style={styles.itemTextMore}>
                                     ......
-                                </react_native_1.Text>) : (<react_native_1.Text key={index} style={styles.itemText} numberOfLines={1}>
+                                </react_native_1.Text>) : (<react_native_1.Text key={index} style={styles.itemText} numberOfLines={1} ellipsizeMode="middle">
                                     {message.messageFromName + ': ' + (0, im_base_1.buildSimpleText)(imManager, message.payloadType, message.payload)}
                                 </react_native_1.Text>);
         })}

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

@@ -35,6 +35,7 @@ const useTranslation_1 = __importDefault(require("../../../hooks/useTranslation"
 const dayjs_1 = __importDefault(require("dayjs"));
 const ReceiptBack = ({ message }) => {
     const { t } = (0, useTranslation_1.default)();
+    // console.log('ReceiptBack: ', message.receiptBackList.length, message.receiptBackList);
     return (<react_native_1.View style={styles.content}>
             <react_native_1.View style={{ flexDirection: 'row' }}>
                 <react_native_1.Text style={[styles.text, { width: (0, rn_ui_1.dp)(165) }]}>
@@ -54,6 +55,8 @@ const ReceiptBack = ({ message }) => {
                     statusText = t('statusArrived');
                     break;
                 }
+                default:
+                    return null;
             }
             return (<react_native_1.View key={index} style={{ flexDirection: 'row' }}>
                             <react_native_1.Text style={[styles.text, { width: (0, rn_ui_1.dp)(165) }]}>

package/dist/utils/upload.js

@@ -55,7 +55,13 @@ const uploadFile = (filePath, type, onProgress) => __awaiter(void 0, void 0, voi
         });
         console.log('uploadFile: ', resp);
         try {
-            return JSON.parse(resp.body).data;
+            let body = JSON.parse(resp.body);
+            if (body.data) {
+                return body.data;
+            }
+            else {
+                throw new Error(body.codeMsg);
+            }
         }
         catch (e) {
             console.log('uploadFile error: ', e);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@smart-link/rn-im",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "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.11"
+    "@smart-link/im-base": "^1.0.13"
   },
   "devDependencies": {
     "@react-native/eslint-config": "0.73.2",