@smart-link/rn-im 1.0.22 → 1.0.23

package/dist/default-assets.js

@@ -14,7 +14,7 @@ exports.defaultAvatars = {
 exports.receiptStatus = {
     [im_base_1.MessageStatus.READ]: require('../assets/hook-blue-double.png'),
     [im_base_1.MessageStatus.ARRIVED]: require('../assets/hook-black-double.png'),
-    [im_base_1.MessageStatus.EMITTED]: require('../assets/hook-black-double.png'),
+    [im_base_1.MessageStatus.EMITTED]: require('../assets/hook-black.png'),
 };
 exports.messageBackupImg = {
     cloud: require('../assets/cloud-backup.png'),

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

@@ -35,7 +35,6 @@ const MaterialIcons_1 = __importDefault(require("react-native-vector-icons/Mater
 const ChatAvatar_1 = __importDefault(require("../../../components/ChatAvatar/ChatAvatar"));
 const useFormatMsgTime_1 = __importDefault(require("../../../hooks/useFormatMsgTime"));
 const useTranslation_1 = __importDefault(require("../../../hooks/useTranslation"));
-const init_1 = require("../../../init");
 const ConversationCard = (0, react_1.memo)(props => {
     const { status, selected, conversation, onPressCard, onLongPressCard } = props;
     const { t } = (0, useTranslation_1.default)();
@@ -46,12 +45,12 @@ const ConversationCard = (0, react_1.memo)(props => {
     const content = (0, im_base_1.getConversationContent)(text, errorText, draftText, tipsList, countText, t);
     const contentStyles = content.tips ? styles.contentRedStyles : null;
     const formatTime = (0, useFormatMsgTime_1.default)(time, true);
-    const imManager = (0, init_1.getImManager)();
-    // 还没找到为啥会让空的头像的人变成登录人的头像，先解决表面问题
-    let newAvatars = avatars;
-    if (avatars === imManager.user.avatars && name !== imManager.user.userName) {
-        newAvatars = "";
-    }
+    // const imManager = getImManager();
+    // // 还没找到为啥会让空的头像的人变成登录人的头像，先解决表面问题
+    // let newAvatars = avatars;
+    // if (avatars === imManager.user.avatars && name !== imManager.user.userName) {
+    //     newAvatars = "";
+    // }
     return (<react_native_1.TouchableOpacity activeOpacity={0.5} style={[styles.card, enableTopStyles, selected && styles.selected]} onPress={() => {
             onPressCard && onPressCard(conversation);
         }} onLongPress={({ nativeEvent }) => {
@@ -59,7 +58,7 @@ const ConversationCard = (0, react_1.memo)(props => {
         }}>
             <react_native_1.View style={{ height: (0, rn_ui_1.dp)(50), width: (0, rn_ui_1.dp)(50), marginRight: (0, rn_ui_1.dp)(16) }}>
                 <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={newAvatars}/>
+                    <ChatAvatar_1.default disabled type={type} id={id} size={(0, rn_ui_1.dp)(48)} name={name} url={avatars}/>
                 </rn_ui_1.Badge>
                 {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'}/>

package/dist/pages/message/MessageList.js

@@ -85,10 +85,11 @@ const MessageList = ({ navigation }) => {
                 imManager.store.dispatch(im_base_1.MessagePanelActions.cancelMultipleSelect());
             }
             else {
-                console.log('[离开会话]: ');
-                imManager.store.dispatch(im_base_1.MessagePanelActions.saveDraftText(imManager));
                 react_native_1.InteractionManager.runAfterInteractions(() => {
+                    console.log('[离开会话]: ');
+                    imManager.store.dispatch(im_base_1.MessagePanelActions.saveDraftText(imManager));
                     imManager.leaveConversation();
+                    imManager.store.dispatch(im_base_1.MessageActions.resetState());
                 });
             }
         });

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

@@ -74,7 +74,7 @@ const MessageItem = ({ isMultiple, multipleSelect, conversation, message, mine,
                 },
             ]}>
                         {mine && isMultiple && (<rn_ui_1.Checkbox checked={isMultipleChecked} style={[styles.multipleCheckbox]}/>)}
-                        <ChatAvatar_1.default name={message.messageFromName} id={message.messageFrom} url={message.payload.avatars} size={(0, rn_ui_1.dp)(40)}/>
+                        <ChatAvatar_1.default name={message.messageFromName} id={message.messageFrom} size={(0, rn_ui_1.dp)(40)}/>
                         <react_native_1.View style={[
                 {
                     alignContent: 'flex-end',

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

@@ -3,19 +3,19 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onDefaultCheckedUser = exports.startSendContact = exports.resetState = exports.startAddMember = exports.startCreateGroup = exports.onSelectUser = exports.setCurrentRoot = exports.setSelectGroups = exports.setSelectUsers = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const initialState = {
+const initialState = () => ({
     selectUsers: {},
     selectGroups: {},
     currentRoot: 'none',
     choosePurpose: 'none',
     checkMode: 'multiple',
-};
+});
 const contactSlice = (0, toolkit_1.createSlice)({
     name: 'chat/contact',
     initialState,
     reducers: {
         resetState(state) {
-            Object.assign(state, initialState);
+            Object.assign(state, initialState());
         },
         setSelectUsers(state, action) {
             state.selectUsers = action.payload;

package/package.json

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