@smart-link/rn-im 1.0.18 → 1.0.20

package/dist/hooks/useDownloadSource.d.ts

@@ -0,0 +1,3 @@
+import { IPayload } from "@smart-link/im-base";
+export declare function useDownloadImgSource(payload: IPayload): string | File | undefined;
+export default function useDownloadSource(payload: IPayload): string | File | undefined;

package/dist/hooks/useDownloadSource.js

@@ -0,0 +1,68 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useDownloadImgSource = void 0;
+const react_1 = require("react");
+const init_1 = require("../init");
+function useDownload({ fileId, localPath, filename }) {
+    const [local, setLocal] = (0, react_1.useState)(localPath);
+    (0, react_1.useEffect)(() => {
+        let cancel = false;
+        const load = () => __awaiter(this, void 0, void 0, function* () {
+            const imManager = (0, init_1.getImManager)();
+            if (!localPath && fileId) {
+                const tmp = yield imManager.loadResourceFromCache(fileId);
+                if (tmp) {
+                    !cancel && setLocal(tmp);
+                    return;
+                }
+                const file = yield imManager.download({
+                    fileId,
+                    filename: filename || fileId,
+                    resourceType: 'file',
+                });
+                yield imManager.updateResource({
+                    url: fileId,
+                    localPath: file,
+                });
+                if (cancel) {
+                    return;
+                }
+                setLocal(file);
+            }
+        });
+        load();
+        return () => {
+            cancel = true;
+        };
+    }, [localPath, fileId, filename]);
+    return local;
+}
+function useDownloadImgSource(payload) {
+    const { imageName, imagePath, imageFileId } = payload;
+    return useDownload({
+        localPath: imagePath,
+        fileId: imageFileId,
+        filename: imageName,
+        resourceType: 'picture'
+    });
+}
+exports.useDownloadImgSource = useDownloadImgSource;
+function useDownloadSource(payload) {
+    const { localPath, fileId, filename, } = payload;
+    return useDownload({
+        localPath,
+        fileId,
+        filename,
+        resourceType: 'picture',
+    });
+}
+exports.default = useDownloadSource;

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

@@ -45,13 +45,12 @@ const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const GroupTransfer = ({ navigation }) => {
     const { t } = (0, useTranslation_1.default)();
-    const { groupDetail } = (0, useImSelector_1.useChatGroup)();
-    const { groupMemberList } = groupDetail;
+    const { allMembers } = (0, useImSelector_1.useConversation)();
     const [checkedMember, setCheckedMember] = (0, react_1.useState)(null);
     const [keyword, setKeyword] = (0, react_1.useState)('');
     const list = (0, react_1.useMemo)(() => {
-        return groupMemberList === null || groupMemberList === void 0 ? void 0 : groupMemberList.filter(item => item.memberLevel !== 'owner');
-    }, [groupMemberList]);
+        return allMembers === null || allMembers === void 0 ? void 0 : allMembers.filter(item => item.memberLevel !== 'owner');
+    }, [allMembers]);
     (0, react_1.useEffect)(() => {
         navigation.setOptions({
             title: t('chooseNewOwner'),

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

@@ -16,7 +16,7 @@ const { OWNER, MGR, } = im_base_1.MemberLevel;
 const OptionGroupMoreMember = (props) => {
     const { groupDetail } = (0, useImSelector_1.useChatGroup)();
     const { memberTotalCount } = groupDetail;
-    const { allMembers } = (0, useImSelector_1.useMessage)();
+    const { allMembers } = (0, useImSelector_1.useConversation)();
     const [keyword, setKeyword] = (0, react_1.useState)('');
     const { t } = (0, useTranslation_1.default)();
     const navigation = (0, rn_ui_1.useNavigation)();
@@ -62,7 +62,7 @@ const OptionGroupMoreMember = (props) => {
             </react_native_1.TouchableOpacity>);
     };
     const list = (0, react_1.useMemo)(() => {
-        const allMembersData = allMembers.slice().reverse().filter((item) => {
+        const allMembersData = allMembers.filter((item) => {
             if (keyword) {
                 return item.memberName.indexOf(keyword) > -1;
             }

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

@@ -22,12 +22,12 @@ const { LIAISON } = im_base_1.GroupType;
 // 最大显示人数
 const MAX_SHOW_MEMBER_COUNT = 23;
 const ConversationSetting = ({ navigation }) => {
-    var _a, _b;
     const { t } = (0, useTranslation_1.default)();
+    // const {allMembers} = useMessage();
     const { currentConversation } = (0, useImSelector_1.useConversation)();
     const { groupDetail } = (0, useImSelector_1.useChatGroup)();
     const title = t('chatSetting');
-    const { memberTotalCount = 0 } = groupDetail || {};
+    const { memberTotalCount = 0, groupMemberList = [] } = groupDetail || {};
     // 设置标题
     (0, react_1.useEffect)(() => {
         let newTitle = title;
@@ -59,8 +59,7 @@ const ConversationSetting = ({ navigation }) => {
         }, t);
     };
     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);
+    // console.log('type: ', type , '[memberLevel]', memberLevel);
     const isMgr = memberLevel === MGR || memberLevel === OWNER;
     // 离开群组
     const leaveGroup = () => {
@@ -147,23 +146,6 @@ const ConversationSetting = ({ navigation }) => {
                 };
             })
                 .splice(0, MAX_SHOW_MEMBER_COUNT);
-            let fMaster = groupMemberList.find(item => item.memberLevel === OWNER);
-            // 假设 fMaster 是要插入的对象，且它有一个唯一标识，比如 userId
-            if (fMaster) {
-                const fMasterWithRequiredFields = {
-                    userId: fMaster.userId,
-                    userName: (_b = fMaster.memberName) !== null && _b !== void 0 ? _b : '',
-                    avatars: fMaster.memberAvatars,
-                    memberLevel: fMaster.memberLevel,
-                };
-                // 先移除已存在的群主
-                const existingIndex = avatarList.findIndex(item => item.userId === (fMaster === null || fMaster === void 0 ? void 0 : fMaster.userId));
-                if (existingIndex > -1) {
-                    avatarList.splice(existingIndex, 1);
-                }
-                // 插入群主
-                avatarList.unshift(fMasterWithRequiredFields);
-            }
             content = (<>
                     <OptionAvatars_1.default list={avatarList} showTitle memberTotalCount={memberTotalCount} showAdd showMore={isMgr ? avatarList.length > 8 : avatarList.length > 9} isMgr={isMgr} addUser={() => {
                     // 添加成员
@@ -173,7 +155,6 @@ 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/ChooseMember.js

@@ -37,10 +37,11 @@ const im_base_1 = require("@smart-link/im-base");
 const init_1 = require("../../init");
 const ChooseMember = ({ navigation, route: { params } }) => {
     const { groupDetail } = (0, useImSelector_1.useChatGroup)();
+    const { allMembers } = (0, useImSelector_1.useConversation)();
     const [keyword, seKeyword] = (0, react_1.useState)('');
     const [checked, setChecked] = (0, react_1.useState)([]);
     const { t } = (0, useTranslation_1.default)();
-    const { groupMemberList, memberLevel } = groupDetail;
+    const { memberLevel } = groupDetail;
     const imManager = (0, init_1.getImManager)();
     const list = (0, react_1.useMemo)(() => {
         if (params.atOther && ['owner', 'mgr'].includes(memberLevel)) {
@@ -49,12 +50,12 @@ const ChooseMember = ({ navigation, route: { params } }) => {
                     userId: 'allMembers',
                     memberName: t('allMembers'),
                 },
-            ].concat(groupMemberList.filter(item => item.userId !== imManager.user.userId && (keyword ? item.memberName.includes(keyword) : true)));
+            ].concat(allMembers.filter(item => item.userId !== imManager.user.userId && (keyword ? item.memberName.includes(keyword) : true)));
         }
         else {
-            return groupMemberList.filter(item => item.userId !== imManager.user.userId && (keyword ? item.memberName.includes(keyword) : true));
+            return allMembers.filter(item => item.userId !== imManager.user.userId && (keyword ? item.memberName.includes(keyword) : true));
         }
-    }, [params.atOther, groupMemberList, keyword]);
+    }, [params.atOther, allMembers, keyword]);
     (0, react_1.useEffect)(() => {
         navigation.setOptions({
             headerLeft({ tintColor }) {

package/dist/pages/message/MessageBackup/utils.js

@@ -200,10 +200,10 @@ class RestoreTaskItem extends TaskItem {
                             console.log('insertMessage error: ', e);
                         }
                     }
-                    callback(1);
                     return message;
                 }))();
             }));
+            callback(1);
         });
     }
 }

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

@@ -41,6 +41,7 @@ const LocalImage_1 = __importDefault(require("../../../components/LocalImage"));
 const useTranslation_1 = __importDefault(require("../../../hooks/useTranslation"));
 const init_1 = require("../../../init");
 const PayloadFile_1 = __importDefault(require("./Payload/PayloadFile"));
+const useDownloadSource_1 = __importStar(require("../../../hooks/useDownloadSource"));
 const voiceLeft = require('../../../../assets/voice-left.png');
 const { width } = react_native_1.Dimensions.get('window');
 exports.QuoteTextMix = (0, react_1.memo)(props => {
@@ -56,9 +57,10 @@ exports.QuoteTextMix = (0, react_1.memo)(props => {
 });
 exports.QuotePicture = (0, react_1.memo)(props => {
     const { quoteTitle, quoteMessage, quoteStyle, color, textStyle, borderColor, backgroundColor, onPressQuote } = props;
-    const { height, width, localPath } = quoteMessage.payload;
+    const { height, width } = quoteMessage.payload;
     const theme = (0, rn_ui_1.useTheme)();
     console.log('QuotePicture', quoteMessage);
+    const localImg = (0, useDownloadSource_1.default)(quoteMessage.payload);
     const sizeStyle = (0, golden_rectangle_1.calculate)(height || 100, width || 61.8, 100);
     return (<react_native_1.TouchableOpacity activeOpacity={0.5} onPress={onPressQuote} style={[quoteStyle, styles.leftBorder, { backgroundColor: (0, color_1.dark)(color, 6) }]}>
             <react_native_1.Text style={[textStyle, styles.replyUserName]}>
@@ -66,7 +68,7 @@ exports.QuotePicture = (0, react_1.memo)(props => {
                 {' : '}
             </react_native_1.Text>
             <react_native_1.View style={styles.h5}/>
-            {(!localPath || localPath === '') && (<react_native_1.View style={[
+            {(!localImg) && (<react_native_1.View style={[
                 styles.pictureEmpty,
                 Object.assign({ backgroundColor,
                     borderColor }, sizeStyle),
@@ -75,22 +77,23 @@ exports.QuotePicture = (0, react_1.memo)(props => {
                     <react_native_1.ActivityIndicator color={theme.primaryColor} animating={true}/>
                 </react_native_1.View>)}
 
-            {localPath && localPath !== '' && (<LocalImage_1.default style={sizeStyle} resizeMode="cover" localPath={localPath}/>)}
+            {localImg && (<LocalImage_1.default style={sizeStyle} resizeMode="cover" localPath={localImg}/>)}
         </react_native_1.TouchableOpacity>);
 });
 exports.QuoteVideo = (0, react_1.memo)(props => {
     const { quoteTitle, quoteMessage, quoteStyle, color, textStyle, borderColor, backgroundColor, onPressQuote } = props;
-    const { duration, height, width, imagePath } = quoteMessage.payload;
+    const { duration, height, width } = quoteMessage.payload;
     const theme = (0, rn_ui_1.useTheme)();
     console.log('QuoteVideo: ', quoteMessage);
     const sizeStyle = (0, golden_rectangle_1.calculate)(height, width);
+    const localImg = (0, useDownloadSource_1.useDownloadImgSource)(quoteMessage.payload);
     return (<react_native_1.TouchableOpacity activeOpacity={0.5} onPress={onPressQuote} style={[quoteStyle, styles.leftBorder, { backgroundColor: (0, color_1.dark)(color, 6) }]}>
             <react_native_1.Text style={[textStyle, styles.replyUserName]}>
                 {quoteTitle}
                 {' : '}
             </react_native_1.Text>
             <react_native_1.View style={styles.h5}/>
-            {(!imagePath || imagePath === '') && (<react_native_1.View style={[
+            {(!localImg) && (<react_native_1.View style={[
                 styles.pictureEmpty,
                 Object.assign({ backgroundColor,
                     borderColor }, sizeStyle),
@@ -99,8 +102,8 @@ exports.QuoteVideo = (0, react_1.memo)(props => {
                     <react_native_1.ActivityIndicator color={theme.primaryColor} animating={true}/>
                 </react_native_1.View>)}
 
-            {imagePath && imagePath !== '' && (<react_native_1.View>
-                    <LocalImage_1.default style={sizeStyle} resizeMode="cover" localPath={imagePath}/>
+            {localImg && (<react_native_1.View style={{ width: sizeStyle.width }}>
+                    <LocalImage_1.default style={sizeStyle} resizeMode="cover" localPath={localImg}/>
                     <react_native_1.View style={styles.playView}>
                         <AntDesign_1.default size={30} name="playcircleo" color="#fff"/>
                     </react_native_1.View>

package/dist/slice/index.js

@@ -7,7 +7,6 @@ exports.chatReducers = void 0;
 const video_slice_1 = __importDefault(require("./video/video.slice"));
 const contact_slice_1 = __importDefault(require("./contact/contact.slice"));
 const panel_slice_1 = __importDefault(require("./panel/panel.slice"));
-// @ts-ignore
 exports.chatReducers = {
     'chat/video': video_slice_1.default,
     'chat/contact': contact_slice_1.default,

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

@@ -35,6 +35,5 @@ const videoSlice = (0, toolkit_1.createSlice)({
         }
     }
 });
-// @ts-ignore;
 _a = videoSlice.actions, exports.showVideoPlayer = _a.showVideoPlayer, exports.cancelVideoPlayer = _a.cancelVideoPlayer, exports.setVideoDownloadProgress = _a.setVideoDownloadProgress, exports.setShowVideoPlay = _a.setShowVideoPlay;
 exports.default = videoSlice.reducer;

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@smart-link/rn-im",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "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.16"
+    "emoji-regex": "^10.4.0"
   },
   "devDependencies": {
     "@react-native/eslint-config": "0.73.2",
@@ -21,7 +20,8 @@
     "rimraf": "^6.0.1",
     "tsc-alias": "^1.8.10",
     "typescript": "5.0.4",
-    "react-native": "^0.73.0"
+    "react-native": "^0.73.0",
+    "redux": "^4.2.1"
   },
   "peerDependencies": {
     "@baronha/react-native-photo-editor": "1.1.6",
@@ -64,7 +64,7 @@
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
     "@smart-link/rn-ui": "^1.0.6",
-    "@smart-link/rn-base": "^1.0.7"
+    "@smart-link/im-base": "^1.0.20"
   },
   "files": [
     "dist/**",
@@ -74,7 +74,7 @@
   "scripts": {
     "clean": "rimraf ./dist",
     "build": "pnpm run clean && tsc && tsc-alias",
-    "build:watch": "concurrently \"tsc -w\" \"tsc-alias -w\"",
+    "build:watch": "tsc && concurrently \"tsc -w\" \"tsc-alias -w\"",
     "release": "pnpm build && pnpm publish --tag latest --access public --no-git-checks"
   }
 }