修改,已经去掉spid

王军波
1 parent ddcc064b
Showing 10 changed files with 46 additions and 26 deletions
CNLiveChatSDKDemo/CNLiveChatManager.framework/CNLiveChatManager
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatMessage.h
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatStatusDefine.h
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatUserInfo.h
CNLiveChatSDKDemo/CNLiveChatSDKDemo.xcodeproj/project.pbxproj
CNLiveChatSDKDemo/CNLiveChatSDKDemo/ChatRoomViewController.m
CNLiveChatSDKDemo/CNLiveChatSDKDemo/PrivateViewController.m
CNLiveChatSDKDemo/CNLiveMsgTools.framework/CNLiveMsgTools
CNLiveChatSDKDemo/CNLiveMsgTools.framework/Headers/CNLiveMsgManager.h
CNLiveChatSDKDemo/CNLiveMsgTools.framework/Info.plist
@@ -20,21 +20,31 @@
 /**
  目标ID(消息来自聊天室的ID / 接收者ID)
  */
-@property (nonatomic, assign) NSString *targetId;
+@property (nonatomic, copy) NSString *targetId;
 /**
  消息ID(本地存储的消息的唯一值（数据库索引唯一值）)
  */
-@property (nonatomic, assign) NSString *messageId;
+@property (nonatomic, copy) NSString *messageId;
 /**
  消息内容
  */
-@property (nonatomic, strong) NSString *messageContent;
+@property (nonatomic, copy) NSString *messageContent;
 /**
  发送者的用户信息(userId, name, portraitUri)
  */
 @property (nonatomic, strong) CNLiveChatUserInfo *userInfo;
+/**
+ 消息的接收时间（Unix时间戳、毫秒）
+ */
+@property(nonatomic, assign) long long receivedTime;
+
+/**
+ 消息的发送时间（Unix时间戳、毫秒）
+ */
+@property(nonatomic, assign) long long sentTime;
+
 @end
@@ -245,6 +245,16 @@ typedef NS_ENUM(NSInteger, CNLiveChatErrorCode) {
     CNLive_ERRORCODE_BY_AUTHENTICATIONERROR = 303,
     /*!
+    不合法的 targetId
+     */
+    CNLive_ERRORCODE_BY_TARGETIDERROR = 304,
+    
+    /*!
+     不合法的 会话类型 type
+     */
+    CNLive_ERRORCODE_BY_CONVERSATIONTYPEERROR = 305,
+    
+    /*!
      已被对方加入黑名单
      */
     CNLive_REJECTED_BY_BLACKLIST = 405,
@@ -13,17 +13,17 @@
 /*!
  用户ID(一旦以一个用户ID连接到服务器,就不能再修改用户ID了,如果修改也会被忽略)
  */
-@property(nonatomic, strong, readonly) NSString *userId;
+@property(nonatomic, copy, readonly) NSString *userId;
 /*!
  用户名称
  */
-@property(nonatomic, strong) NSString *name;
+@property(nonatomic, copy) NSString *name;
 /*!
  用户头像的URL
  */
-@property(nonatomic, strong) NSString *portraitUri;
+@property(nonatomic, copy) NSString *portraitUri;
 /*!
  用户信息的初始化方法,
@@ -10,12 +10,12 @@
 		D231941F1E70101500111C3B /* MessageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D231941E1E70101500111C3B /* MessageModel.m */; };
 		D231C8A61E6FFC2700EAC427 /* ChatRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D231C8A51E6FFC2700EAC427 /* ChatRoomViewController.m */; };
 		D231C8A91E6FFD3100EAC427 /* PrivateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D231C8A81E6FFD3100EAC427 /* PrivateViewController.m */; };
-		D25BF8671E7A6519007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8661E7A6519007FB138 /* CNLiveMsgTools.framework */; };
-		D25BF8691E7A6520007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8681E7A6520007FB138 /* CNLiveChatManager.framework */; };
-		D25BF86A1E7A6686007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8661E7A6519007FB138 /* CNLiveMsgTools.framework */; };
-		D25BF86B1E7A6686007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8661E7A6519007FB138 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D25BF86C1E7A6688007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8681E7A6520007FB138 /* CNLiveChatManager.framework */; };
-		D25BF86D1E7A6688007FB138 /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8681E7A6520007FB138 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D23ECC581E824796007D849E /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D23ECC571E824796007D849E /* CNLiveMsgTools.framework */; };
+		D23ECC5A1E8247A4007D849E /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D23ECC591E8247A4007D849E /* CNLiveChatManager.framework */; };
+		D23ECC5B1E8247AA007D849E /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D23ECC571E824796007D849E /* CNLiveMsgTools.framework */; };
+		D23ECC5C1E8247AA007D849E /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D23ECC571E824796007D849E /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D23ECC5D1E8247AC007D849E /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D23ECC591E8247A4007D849E /* CNLiveChatManager.framework */; };
+		D23ECC5E1E8247AC007D849E /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D23ECC591E8247A4007D849E /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D264D5A51E6FDE02002CDF41 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D264D5A41E6FDE02002CDF41 /* main.m */; };
 		D264D5A81E6FDE02002CDF41 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D264D5A71E6FDE02002CDF41 /* AppDelegate.m */; };
 		D264D5AB1E6FDE02002CDF41 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D264D5AA1E6FDE02002CDF41 /* ViewController.m */; };
@@ -31,8 +31,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D25BF86B1E7A6686007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */,
-				D25BF86D1E7A6688007FB138 /* CNLiveChatManager.framework in Embed Frameworks */,
+				D23ECC5C1E8247AA007D849E /* CNLiveMsgTools.framework in Embed Frameworks */,
+				D23ECC5E1E8247AC007D849E /* CNLiveChatManager.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -46,8 +46,8 @@
 		D231C8A51E6FFC2700EAC427 /* ChatRoomViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatRoomViewController.m; sourceTree = "<group>"; };
 		D231C8A71E6FFD3100EAC427 /* PrivateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivateViewController.h; sourceTree = "<group>"; };
 		D231C8A81E6FFD3100EAC427 /* PrivateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrivateViewController.m; sourceTree = "<group>"; };
-		D25BF8661E7A6519007FB138 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
-		D25BF8681E7A6520007FB138 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
+		D23ECC571E824796007D849E /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
+		D23ECC591E8247A4007D849E /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
 		D264D5A01E6FDE02002CDF41 /* CNLiveChatSDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLiveChatSDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D264D5A41E6FDE02002CDF41 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		D264D5A61E6FDE02002CDF41 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -66,10 +66,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D25BF8671E7A6519007FB138 /* CNLiveMsgTools.framework in Frameworks */,
-				D25BF8691E7A6520007FB138 /* CNLiveChatManager.framework in Frameworks */,
-				D25BF86A1E7A6686007FB138 /* CNLiveMsgTools.framework in Frameworks */,
-				D25BF86C1E7A6688007FB138 /* CNLiveChatManager.framework in Frameworks */,
+				D23ECC5B1E8247AA007D849E /* CNLiveMsgTools.framework in Frameworks */,
+				D23ECC581E824796007D849E /* CNLiveMsgTools.framework in Frameworks */,
+				D23ECC5A1E8247A4007D849E /* CNLiveChatManager.framework in Frameworks */,
+				D23ECC5D1E8247AC007D849E /* CNLiveChatManager.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -101,8 +101,8 @@
 		D264D5971E6FDE02002CDF41 = {
 			isa = PBXGroup;
 			children = (
-				D25BF8681E7A6520007FB138 /* CNLiveChatManager.framework */,
-				D25BF8661E7A6519007FB138 /* CNLiveMsgTools.framework */,
+				D23ECC591E8247A4007D849E /* CNLiveChatManager.framework */,
+				D23ECC571E824796007D849E /* CNLiveMsgTools.framework */,
 				D264D5A21E6FDE02002CDF41 /* CNLiveChatSDKDemo */,
 				D264D5A11E6FDE02002CDF41 /* Products */,
 			);
@@ -170,10 +170,10 @@ static NSString *cellId = @&quot;cellId&quot;;
 #pragma mark - CNLiveChatManagerDelegate    !!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)onReceived:(CNLiveChatMessage *)message {
-    NSLog(@"收到消息类型:%lu,消息ID:%@,消息内容:%@,消息发送者信息:%@",(unsigned long)message.conversationType,message.targetId,message.messageContent,message.userInfo);
+    NSLog(@"收到消息类型:%lu,消息ID:%@,消息内容:%@,消息发送者信息:%@,消息ID:%@",(unsigned long)message.conversationType,message.targetId,message.messageContent,message.userInfo,message.messageId);
     // 只显示本聊天室信息
-    if (message.conversationType == CNLive_ConversationType_CHATROOM && [message.targetId isEqualToString:@"60_7788"]) {
+    if (message.conversationType == CNLive_ConversationType_CHATROOM && [message.targetId isEqualToString:@"7788"]) {
         MessageModel *model = [[MessageModel alloc] init];
@@ -119,7 +119,7 @@ static NSString *priCellId = @&quot;priCellId&quot;;
     [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:textField.text type:CNLive_ConversationType_PRIVATE targetId:@"20170311" success:^(CNLiveChatMessage *message) {
-        NSLog(@"发送消息成功:%@",message);
+        NSLog(@"发送消息成功:%@",message.messageId);
         // 自己发送的消息不会被onReceived:方法实时监听,需要自己做处理
         MessageModel *model = [[MessageModel alloc] init];
@@ -71,7 +71,7 @@
 - (void)sendCarrier:(NSString *)carrier
                type:(NSInteger)type
            targetId:(NSString *)targetId
-            success:(void (^)(NSString *carrier, NSString *messageId, NSString *targetId, NSInteger type, NSString *infoId, NSString *infoName, NSString *infoUrl))successBlock
+            success:(void (^)(NSString *carrier, NSString *messageId, NSString *targetId, NSInteger type, NSString *infoId, NSString *infoName, NSString *infoUrl, long long goTime, long long comeTime))successBlock
               error:(void (^)(NSInteger errors, NSString *messageId, NSString *targetId))errorBlock;