Commit cf242c29 by zhangyunjie

添加字段

parent c98d5890
...@@ -203,12 +203,12 @@ ...@@ -203,12 +203,12 @@
A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F324EA83C90024EB54 /* libsqlite3.tbd */; }; A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F324EA83C90024EB54 /* libsqlite3.tbd */; };
A96621F724EA842E0024EB54 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F224EA83BB0024EB54 /* libresolv.tbd */; }; A96621F724EA842E0024EB54 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F224EA83BB0024EB54 /* libresolv.tbd */; };
A966274D24EBA56C0024EB54 /* OffcnIMSDKiOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */; }; A966274D24EBA56C0024EB54 /* OffcnIMSDKiOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */; };
A9D1B31424EE0772000F4662 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B31224EE076B000F4662 /* oimcore.framework */; };
A9D1B31524EE0772000F4662 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B31224EE076B000F4662 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
A9D1B31824EFAD8C000F4662 /* OffcnUploadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B31724EFAD8C000F4662 /* OffcnUploadManager.m */; }; A9D1B31824EFAD8C000F4662 /* OffcnUploadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B31724EFAD8C000F4662 /* OffcnUploadManager.m */; };
A9D1B31B24F34C25000F4662 /* OffcnIMSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.m */; }; A9D1B31B24F34C25000F4662 /* OffcnIMSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.m */; };
A9D1B32224F50973000F4662 /* OffcnIMModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B32124F50973000F4662 /* OffcnIMModel.m */; }; A9D1B32224F50973000F4662 /* OffcnIMModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B32124F50973000F4662 /* OffcnIMModel.m */; };
A9D1B32E24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B32C24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m */; }; A9D1B32E24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B32C24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m */; };
A9D1B33124F8996E000F4662 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B32F24F89964000F4662 /* oimcore.framework */; };
A9D1B33224F8996E000F4662 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B32F24F89964000F4662 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49CE5E230A14D9B821170F61 /* libPods-OffcnIMSDKiOS.a */; }; B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49CE5E230A14D9B821170F61 /* libPods-OffcnIMSDKiOS.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
A9D1B31524EE0772000F4662 /* oimcore.framework in Embed Frameworks */, A9D1B33224F8996E000F4662 /* oimcore.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -638,7 +638,6 @@ ...@@ -638,7 +638,6 @@
A966274B24EBA56C0024EB54 /* OffcnIMSDKiOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OffcnIMSDKiOS.h; sourceTree = "<group>"; }; A966274B24EBA56C0024EB54 /* OffcnIMSDKiOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OffcnIMSDKiOS.h; sourceTree = "<group>"; };
A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OffcnIMSDKiOS.m; sourceTree = "<group>"; }; A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OffcnIMSDKiOS.m; sourceTree = "<group>"; };
A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OffcnIMSDKiOS.entitlements; sourceTree = "<group>"; }; A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OffcnIMSDKiOS.entitlements; sourceTree = "<group>"; };
A9D1B31224EE076B000F4662 /* oimcore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = oimcore.framework; sourceTree = "<group>"; };
A9D1B31624EFAD8C000F4662 /* OffcnUploadManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OffcnUploadManager.h; sourceTree = "<group>"; }; A9D1B31624EFAD8C000F4662 /* OffcnUploadManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OffcnUploadManager.h; sourceTree = "<group>"; };
A9D1B31724EFAD8C000F4662 /* OffcnUploadManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OffcnUploadManager.m; sourceTree = "<group>"; }; A9D1B31724EFAD8C000F4662 /* OffcnUploadManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OffcnUploadManager.m; sourceTree = "<group>"; };
A9D1B31924F34C25000F4662 /* OffcnIMSocketManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OffcnIMSocketManager.h; sourceTree = "<group>"; }; A9D1B31924F34C25000F4662 /* OffcnIMSocketManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OffcnIMSocketManager.h; sourceTree = "<group>"; };
...@@ -647,6 +646,7 @@ ...@@ -647,6 +646,7 @@
A9D1B32124F50973000F4662 /* OffcnIMModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OffcnIMModel.m; sourceTree = "<group>"; }; A9D1B32124F50973000F4662 /* OffcnIMModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OffcnIMModel.m; sourceTree = "<group>"; };
A9D1B32C24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OffcnZYJTestDataStorageView.m; sourceTree = "<group>"; }; A9D1B32C24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OffcnZYJTestDataStorageView.m; sourceTree = "<group>"; };
A9D1B32D24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OffcnZYJTestDataStorageView.h; sourceTree = "<group>"; }; A9D1B32D24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OffcnZYJTestDataStorageView.h; sourceTree = "<group>"; };
A9D1B32F24F89964000F4662 /* oimcore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = oimcore.framework; sourceTree = "<group>"; };
D7DCDED1DEE7F99F223D5C73 /* Pods-OffcnIMSDKiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OffcnIMSDKiOS.release.xcconfig"; path = "Target Support Files/Pods-OffcnIMSDKiOS/Pods-OffcnIMSDKiOS.release.xcconfig"; sourceTree = "<group>"; }; D7DCDED1DEE7F99F223D5C73 /* Pods-OffcnIMSDKiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OffcnIMSDKiOS.release.xcconfig"; path = "Target Support Files/Pods-OffcnIMSDKiOS/Pods-OffcnIMSDKiOS.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -659,7 +659,7 @@ ...@@ -659,7 +659,7 @@
A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */, A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */,
A96621F524EA84160024EB54 /* libxml2.tbd in Frameworks */, A96621F524EA84160024EB54 /* libxml2.tbd in Frameworks */,
A96621EF24EA83A80024EB54 /* SystemConfiguration.framework in Frameworks */, A96621EF24EA83A80024EB54 /* SystemConfiguration.framework in Frameworks */,
A9D1B31424EE0772000F4662 /* oimcore.framework in Frameworks */, A9D1B33124F8996E000F4662 /* oimcore.framework in Frameworks */,
A96621F124EA83B10024EB54 /* CoreTelephony.framework in Frameworks */, A96621F124EA83B10024EB54 /* CoreTelephony.framework in Frameworks */,
B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */, B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */,
); );
...@@ -699,7 +699,7 @@ ...@@ -699,7 +699,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */, A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */,
A9D1B31224EE076B000F4662 /* oimcore.framework */, A9D1B32F24F89964000F4662 /* oimcore.framework */,
A966274724EBA36A0024EB54 /* ExposedInterface-(外放接口) */, A966274724EBA36A0024EB54 /* ExposedInterface-(外放接口) */,
A9661FC824EA7AD10024EB54 /* Common-(宏) */, A9661FC824EA7AD10024EB54 /* Common-(宏) */,
A9661F8124EA7AD10024EB54 /* Tools-(工具) */, A9661F8124EA7AD10024EB54 /* Tools-(工具) */,
......
// //
...@@ -60,6 +60,8 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -60,6 +60,8 @@ NS_ASSUME_NONNULL_BEGIN
//获取会话未读消息列表Model //获取会话未读消息列表Model
@interface OffcnIMUnreadMsgModel : NSObject @interface OffcnIMUnreadMsgModel : NSObject
@property (nonatomic,copy)NSString *version;
@property (nonatomic,copy)NSString *lrms;//用户关于当前会话最后已读的消息序列号
@property (nonatomic,strong)NSMutableArray *msg_list; @property (nonatomic,strong)NSMutableArray *msg_list;
@end @end
...@@ -90,6 +92,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -90,6 +92,7 @@ NS_ASSUME_NONNULL_BEGIN
//获取会话历史消息列表Model //获取会话历史消息列表Model
@interface OffcnIMHistoryMsgModel : NSObject @interface OffcnIMHistoryMsgModel : NSObject
@property (nonatomic,copy)NSString *version;
@property (nonatomic,strong)NSMutableArray *msg_list; @property (nonatomic,strong)NSMutableArray *msg_list;
@end @end
......
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
} }
- (IBAction)connectAction:(UIButton *)sender { - (IBAction)connectAction:(UIButton *)sender {
//建立连接 //建立连接
NSString *paramStr = @"{\"server_ip\":\"39.102.42.185\", \"server_port\":6000, \"user_id\":\"ce0819db8391f1e7258a71cc9e2c3235\",\"app_id\":\"offcn_live\", \"device_type\":\"ios\", \"token\":\"fadbce3f4929b6bdee0617fee34e32ae\"}"; // connection_type = ["kcp", "websocket"]
// tls = ["disable", "enable"]
NSString *paramStr = @"{\"server_ip\":\"192.168.43.141\", \"server_port\":1026, \"account_id\":\"ce0819db8391f1e7258a71cc9e2c3235\",\"app_id\":\"offcn_live\", \"device_type\":\"ios\", \"token\":\"fadbce3f4929b6bdee0617fee34e32ae\", \"session_id\":\"123\", \"connection_type\":\"websocket\", \"tls\":\"disable\"}";
[[OffcnIMSocketManager defaultService] connectIMServerWithParam:paramStr]; [[OffcnIMSocketManager defaultService] connectIMServerWithParam:paramStr];
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
......
...@@ -30,10 +30,12 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -30,10 +30,12 @@ NS_ASSUME_NONNULL_BEGIN
- (id)mutableCopy NS_UNAVAILABLE; - (id)mutableCopy NS_UNAVAILABLE;
- (void)Initialize; - (void)Initialize;
/** /**
* 连接服务器 * connect to im server
* *
* @param param must contain server'ip and port in json format eg:{"server_ip": "xxxx", "server_port": 123} * @param params must contain server'ip and port in json format eg:
* {"server_ip":"192.168.1.1", "server_port":123, "account_id":"123", "app_id":"123", "device_type":"windows", "token":"213", "account_id":"123", "session_id":"1223", "connection_type":"kcp"}
*/ */
-(void)ConnectImServerWithParam:(NSString*)param; -(void)ConnectImServerWithParam:(NSString*)param;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment