fix: types change & params compatibility (#52)

Author: lgz5689

android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java

@@ -732,7 +732,10 @@ public void setFriendListener() {
 
   public void getSpecifiedFriendsInfo(ReadableMap options, String operationID, Promise promise) {
     ReadableArray userIDList = options.getArray("userIDList");
-    boolean filterBlack = options.getBoolean("filterBlack");
+    boolean filterBlack = false;
+    if (options.hasKey("filterBlack")) {
+      filterBlack = options.getBoolean("filterBlack");
+    }
     Open_im_sdk.getSpecifiedFriendsInfo(new BaseImpl(promise), operationID, userIDList.toString(), filterBlack);
   }
 
@@ -745,7 +748,10 @@ public void getFriendList(Boolean filterBlack, String operationID, Promise promi
   public void getFriendListPage(ReadableMap options, String operationID, Promise promise) {
     int offset = options.getInt("offset");
     int count = options.getInt("count");
-    boolean filterBlack = options.getBoolean("filterBlack");
+    boolean filterBlack = false;
+    if (options.hasKey("filterBlack")) {
+      filterBlack = options.getBoolean("filterBlack");
+    }
     Open_im_sdk.getFriendListPage(new BaseImpl(promise), operationID, offset, count, filterBlack);
   }
 

example/src/App.tsx

@@ -7,13 +7,11 @@ import { MessageItem } from 'src/types/entity';
 function App(): React.JSX.Element {
   RNFS.mkdir(RNFS.DocumentDirectoryPath + '/tmp');
   const init = async () => {
-    // platformID ios 1 android 2
     try {
       await OpenIMSDKRN.initSDK(
         {
-          platformID: 2,
-          apiAddr: 'http://192.168.2.16:10002',
-          wsAddr: 'ws://192.168.2.16:10001',
+          apiAddr: 'http://127.0.0.1:10002',
+          wsAddr: 'ws://127.0.0.1:10001',
           dataDir: RNFS.DocumentDirectoryPath + '/tmp',
           logLevel: 5,
           isLogStandardOutput: true,
@@ -28,11 +26,10 @@ function App(): React.JSX.Element {
 
   const iosLogin = async () => {
     try {
-      await OpenIMSDKRN.login(  
+      await OpenIMSDKRN.login(
         {
           userID: '3742375535',
-          token:
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVc2VySUQiOiIzNzQyMzc1NTM1IiwiUGxhdGZvcm1JRCI6MSwiZXhwIjoxNzE3NTY4ODQyLCJuYmYiOjE3MDk3OTI1NDIsImlhdCI6MTcwOTc5Mjg0Mn0.xPPgeXysWhqnvp5Xk5qFERqRRuPLTCq7kDP0wPElu9I',
+          token: 'xxx',
         },
         'hrtyy45t'
       );
@@ -47,8 +44,7 @@ function App(): React.JSX.Element {
       await OpenIMSDKRN.login(
         {
           userID: '3742375535',
-          token:
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVc2VySUQiOiIzNzQyMzc1NTM1IiwiUGxhdGZvcm1JRCI6MiwiZXhwIjoxNzE3NjYwODg1LCJuYmYiOjE3MDk4ODQ1ODUsImlhdCI6MTcwOTg4NDg4NX0.0yPd2G78HLsvAldMHPLancm4BTMfefOItUwLqYmJxu8',
+          token: 'xx',
         },
         'hrtyy45t'
       );

ios/OpenImSdkRn.m

@@ -65,8 +65,8 @@ - (dispatch_queue_t)methodQueue {
   @"onRecvOfflineNewMessages",
   @"onMsgDeleted" ,
   @"onRecvC2CReadReceipt",
+  @"onNewRecvMessageRevoked",
   @"onRecvMessageRevoked",
-  @"onRecvGroupReadReceipt",
   @"onRecvNewMessage",
   @"onRecvOfflineNewMessage",
   @"onRecvOnlineOnlyMessage",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-im-sdk-rn",
-  "version": "3.8.1",
+  "version": "3.8.2-alpha.1",
   "description": "OpenIM SDK for react-native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/index.tsx

@@ -165,9 +165,12 @@ interface OpenIMSDKRNInterface {
   getFriendApplicationListAsRecipient: (
     operationID: string
   ) => Promise<FriendApplicationItem[]>;
-  getFriendList: (operationID: string) => Promise<FriendUserItem[]>;
+  getFriendList: (
+    filterBlack: boolean,
+    operationID: string
+  ) => Promise<FriendUserItem[]>;
   getFriendListPage: (
-    params: OffsetParams,
+    params: OffsetParams & { filterBlack?: boolean },
     operationID: string
   ) => Promise<FriendUserItem[]>;
   getSpecifiedFriendsInfo: (

src/types/entity.ts

@@ -78,7 +78,7 @@ export type PublicUserItem = {
   nickname: string;
   userID: string;
   faceURL: string;
-  ex?: string;
+  ex: string;
 };
 export type SelfUserInfo = {
   createTime: number;
@@ -101,6 +101,7 @@ export type FriendUserItem = {
   operatorUserID: string;
   ownerUserID: string;
   remark: string;
+  isPinned: boolean;
   attachedInfo: string;
 };
 export type SearchedFriendsInfo = FriendUserItem & {
@@ -138,6 +139,7 @@ export type GroupItem = {
   ex: string;
   applyMemberFriend: AllowType;
   lookMemberInfo: AllowType;
+  displayIsRead: boolean;
 };
 export type GroupMemberItem = {
   groupID: string;
@@ -173,7 +175,7 @@ export type ConversationItem = {
   isPrivateChat: boolean;
   isMsgDestruct: boolean;
   attachedInfo: string;
-  ex: string;
+  ex?: string;
 };
 export type MessageItem = {
   clientMsgID: string;
@@ -193,27 +195,26 @@ export type MessageItem = {
   seq: number;
   isRead: boolean;
   status: MessageStatus;
-  isReact: boolean;
-  isExternalExtensions: boolean;
-  offlinePush: OfflinePush;
-  attachedInfo: string;
-  ex: string;
-  localEx: string;
-  textElem: TextElem;
-  cardElem: CardElem;
-  pictureElem: PictureElem;
-  soundElem: SoundElem;
-  videoElem: VideoElem;
-  fileElem: FileElem;
-  mergeElem: MergeElem;
-  atTextElem: AtTextElem;
-  faceElem: FaceElem;
-  locationElem: LocationElem;
-  customElem: CustomElem;
-  quoteElem: QuoteElem;
-  notificationElem: NotificationElem;
-  advancedTextElem: AdvancedTextElem;
-  typingElem: TypingElem;
+  isReact?: boolean;
+  isExternalExtensions?: boolean;
+  offlinePush?: OfflinePush;
+  ex?: string;
+  localEx?: string;
+  textElem?: TextElem;
+  cardElem?: CardElem;
+  pictureElem?: PictureElem;
+  soundElem?: SoundElem;
+  videoElem?: VideoElem;
+  fileElem?: FileElem;
+  mergeElem?: MergeElem;
+  atTextElem?: AtTextElem;
+  faceElem?: FaceElem;
+  locationElem?: LocationElem;
+  customElem?: CustomElem;
+  quoteElem?: QuoteElem;
+  notificationElem?: NotificationElem;
+  advancedTextElem?: AdvancedTextElem;
+  typingElem?: TypingElem;
   attachedInfoElem: AttachedInfoElem;
 };
 export type TextElem = {
@@ -289,9 +290,8 @@ export type AttachedInfoElem = {
   inEncryptStatus: boolean;
   burnDuration: number;
   hasReadTime: number;
-  notSenderNotificationPush: boolean;
-  messageEntityList: MessageEntity[];
-  uploadProgress: UploadProgress;
+  messageEntityList?: MessageEntity[];
+  uploadProgress?: UploadProgress;
 };
 export type UploadProgress = {
   total: number;
@@ -376,7 +376,8 @@ export type ReceiptInfo = {
 
 export type SearchMessageResult = {
   totalCount: number;
-  searchResultItems: SearchMessageResultItem[];
+  searchResultItems?: SearchMessageResultItem[];
+  findResultItems?: SearchMessageResultItem[];
 };
 
 export type SearchMessageResultItem = {
@@ -416,6 +417,12 @@ export type UserOnlineState = {
   userID: string;
 };
 
+export type ConversationInputStatus = {
+  conversationID: string;
+  userID: string;
+  platformIDs: Platform[];
+};
+
 export type GroupMessageReceiptInfo = {
   conversationID: string;
   groupMessageReadInfo: GroupMessageReadInfo[];

src/types/enum.ts

@@ -72,6 +72,7 @@ export enum MessageType {
   OANotification = 1400,
 
   GroupCreated = 1501,
+  GroupInfoUpdated = 1502,
   MemberQuit = 1504,
   GroupOwnerTransferred = 1507,
   MemberKicked = 1508,

src/types/params.ts

@@ -295,7 +295,7 @@ export type LocationMsgParams = {
 
 export type QuoteMsgParams = {
   text: string;
-  message: string;
+  message: MessageItem;
 };
 
 export type CustomMsgParams = {