Merge branch 'dev' of github.com:jpush/jmessage-react-plugin into dev

Author: KenChoi

ios/RCTJMessageModule.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		6212EB1A1F3C34BB00BDF51A /* RCTJMessageModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 6212EB191F3C34BB00BDF51A /* RCTJMessageModule.m */; };
 		6212EB1B1F3C34BB00BDF51A /* RCTJMessageModule.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6212EB181F3C34BB00BDF51A /* RCTJMessageModule.h */; };
-		623E44691FE245FA00FB7AD8 /* JMessage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 623E44681FE245FA00FB7AD8 /* JMessage.framework */; };
+		626BCF17200888E0006F7C15 /* JMessage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 626BCF16200888E0006F7C15 /* JMessage.framework */; };
 		62D683E21F4469820083CDF6 /* JMessageHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 62D683E11F4469820083CDF6 /* JMessageHelper.m */; };
 /* End PBXBuildFile section */
 
@@ -30,7 +30,7 @@
 		6212EB151F3C34BB00BDF51A /* libRCTJMessageModule.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTJMessageModule.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		6212EB181F3C34BB00BDF51A /* RCTJMessageModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTJMessageModule.h; sourceTree = "<group>"; };
 		6212EB191F3C34BB00BDF51A /* RCTJMessageModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTJMessageModule.m; sourceTree = "<group>"; };
-		623E44681FE245FA00FB7AD8 /* JMessage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JMessage.framework; sourceTree = "<group>"; };
+		626BCF16200888E0006F7C15 /* JMessage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JMessage.framework; sourceTree = "<group>"; };
 		62D683E01F4469820083CDF6 /* JMessageHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JMessageHelper.h; sourceTree = "<group>"; };
 		62D683E11F4469820083CDF6 /* JMessageHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JMessageHelper.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -40,7 +40,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				623E44691FE245FA00FB7AD8 /* JMessage.framework in Frameworks */,
+				626BCF17200888E0006F7C15 /* JMessage.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -66,7 +66,7 @@
 		6212EB171F3C34BB00BDF51A /* RCTJMessageModule */ = {
 			isa = PBXGroup;
 			children = (
-				623E44681FE245FA00FB7AD8 /* JMessage.framework */,
+				626BCF16200888E0006F7C15 /* JMessage.framework */,
 				62D683E01F4469820083CDF6 /* JMessageHelper.h */,
 				62D683E11F4469820083CDF6 /* JMessageHelper.m */,
 				6212EB181F3C34BB00BDF51A /* RCTJMessageModule.h */,
@@ -238,6 +238,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/RCTJMessageModule",
+					"$(PROJECT_DIR)",
 				);
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
 				OTHER_LDFLAGS = "-ObjC";
@@ -253,6 +254,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/RCTJMessageModule",
+					"$(PROJECT_DIR)",
 				);
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
 				OTHER_LDFLAGS = "-ObjC";

ios/RCTJMessageModule/JMessage.framework/Headers/JMSGConstants.h

@@ -143,7 +143,15 @@ typedef NS_ENUM(NSInteger, JMSGContentType) {
   kJMSGContentTypePrompt = 8,
 };
 
-
+/*!
+ * 提示性消息的类型 - 消息撤回提示、后台自定义消息提示等
+ */
+typedef NS_ENUM(NSInteger, JMSGPromptContentType) {
+  /// 消息撤回提示
+  kJMSGPromptContentTypeRetractMessage = 0,
+  /// 自定义提示
+  kJMSGPromptContentTypeAPPRbag   = 1 << 0,
+};
 
 /*!
  * 消息状态

ios/RCTJMessageModule/JMessage.framework/Headers/JMSGEventDelegate.h

@@ -73,7 +73,7 @@
  *
  * @param event 申请入群事件
  *
- * @discussion 申请入群事件相关参数请查看 JMSGApplyJoinGroupEvent 类，在群主审批此事件时需要传递事件的相关参数
+ * @discussion 只有群主和管理员能收到此事件；申请入群事件相关参数请查看 JMSGApplyJoinGroupEvent 类，在群主审批此事件时需要传递事件的相关参数
  *
  * @since 3.4.0
  */
@@ -85,7 +85,7 @@
  *
  * @param event 拒绝入群申请事件
  *
- * @discussion 拒绝的相关描述和原因请查看 JMSGGroupAdminRejectApplicationEvent 类
+ * @discussion 只有申请方和被申请方会收到此事件；拒绝的相关描述和原因请查看 JMSGGroupAdminRejectApplicationEvent 类
  *
  * @since 3.4.0
  */

ios/RCTJMessageModule/JMessage.framework/Headers/JMSGGroup.h

@@ -15,22 +15,33 @@
 @class JMSGUser,JMSGApplyJoinGroupEvent;
 
 /*!
- * 群信息类（用于修改群信息、创建群）
+ * @abstract 群信息类（此类仅用于修改群信息、创建群、群信息展示）
+ *
+ * #### 注意：
+ *
+ * 如果想要获取群的相关属性值、调用相关接口，需要通过 gid 获取到 JMSGGroup 对象再使用；
+ *
+ * 本类中可读可写属性表示可以用于群信息修改、创建群传值，只读属性说明是不允许客户端修改的，只做展示；
  */
 @interface JMSGGroupInfo : NSObject
 
+/** 群 id */
+@property(nonatomic, strong, readonly) NSString *JMSG_NONNULL gid;
 /** 群名称 */
-@property(nonatomic, strong) NSString *JMSG_NONNULL name;
+@property(nonatomic, strong, readwrite) NSString *JMSG_NONNULL name;
 /** 群描述 */
-@property(nonatomic, strong) NSString *JMSG_NONNULL desc;
-/** 群头像数据 */
-@property(nonatomic, strong) NSData   *JMSG_NONNULL avatarData;
+@property(nonatomic, strong, readwrite) NSString *JMSG_NONNULL desc;
+/** 群头像数据，此属性只用户修改群信息，切勿从此类拿来此属性来展示 */
+@property(nonatomic, strong, readwrite) NSData   *JMSG_NONNULL avatarData;
+/** 群头像的媒体文件ID */
+@property(nonatomic, strong, readonly) NSString *JMSG_NONNULL avatar;
 /** 群组类型，私有、公开，注意：仅限于创建群组时设置，创建成功之后不允许修改群类型*/
-@property(nonatomic, assign) JMSGGroupType groupType;
+@property(nonatomic, assign, readwrite) JMSGGroupType groupType;
+/** 群组人数上限*/
+@property(nonatomic, strong, readonly) NSString *JMSG_NONNULL maxMemberCount;
 
 @end
 
-
 /*!
  * 群组
  *
@@ -155,6 +166,21 @@ JMSG_ASSUME_NONNULL_BEGIN
  */
 + (void)shieldList:(JMSGCompletionHandler)handler;
 
+/*!
+ * @abstract 分页获取 appkey 下所有公开群信息
+ *
+ * @param appkey    群组所在的 AppKey，不填则默认为当前应用 AppKey
+ * @param start     分页获取的下标，第一页从  index = 0 开始
+ * @param count     每一页的数量，最大值为500
+ * @param handler   结果回调，NSArray<JMSGGroupInfo>
+ *
+ * #### 注意：返回数据中不是 JMSGGroup 类型，而是 JMSGGroupInfo 类型，只能用于展示信息，如果想要调用相关群组 API 接口则需要通过 gid 获取到 JMSGGroup 对象才可以调用
+ */
++ (void)getPublicGroupInfoWithAppKey:(NSString *JMSG_NULLABLE)appkey
+                               start:(NSInteger)start
+                               count:(NSInteger)count
+                   completionHandler:(JMSGCompletionHandler)handler;
+
 /*!
  * @abstract 申请加入群组
  *

ios/RCTJMessageModule/JMessage.framework/Headers/JMSGMessage.h

@@ -622,6 +622,7 @@ JMSG_ASSUME_NONNULL_BEGIN
  * @param value   待更新的value,不能为null,类型只能为 NSNumber 和 NSString
  * @param key     待更新value对应的key,不能为null
  *
+ * @discussion 如果 message 中没有该 key 对应的 extra 值，则会插入该新值
  */
 - (BOOL)updateMessageExtraValue:(id)value forKey:(NSString *)key;
 

ios/RCTJMessageModule/JMessage.framework/Headers/JMSGPromptContent.h

@@ -27,6 +27,12 @@ JMSG_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic,strong, readonly) NSString *promptText;
 
+/*!
+ * @abstract 提示性消息的类型
+ *
+ * @discussion 比如：消息撤回提示、后台自定义消息提示等
+ */
+@property(nonatomic,assign, readonly) JMSGPromptContentType promptType;
 
 // 不支持使用的初始化方法
 - (instancetype)init NS_UNAVAILABLE;

ios/RCTJMessageModule/JMessage.framework/Headers/JMessage.h

@@ -54,10 +54,10 @@ extern NSString *const kJMSGServiceErrorNotification;                 // 错误
 @interface JMessage : NSObject
 
 /*! JMessage SDK 版本号。用于展示 SDK 的版本信息 */
-#define JMESSAGE_VERSION @"3.4.0"
+#define JMESSAGE_VERSION @"3.4.1"
 
 /*! JMessage SDK 构建ID. 每次构建都会增加 */
-#define JMESSAGE_BUILD 199
+#define JMESSAGE_BUILD 205
 
 /*! API Version - int for program logic. SDK API 有变更时会增加 */
 extern NSInteger const JMESSAGE_API_VERSION;