Skip to content

O
OffcnIMSDKiOS
Commit 925afddc by zhangyunjie
Options

数据库

parent 5970a5f5
Showing with 227 additions and 30 deletions
OffcnIMSDKiOS.xcodeproj/project.pbxproj
......@@ -207,8 +207,9 @@
A9D1B31B24F34C25000F4662 /* OffcnIMSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B31A24F34C25000F4662 /* OffcnIMSocketManager.m */; };
A9D1B32224F50973000F4662 /* OffcnIMModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B32124F50973000F4662 /* OffcnIMModel.m */; };
A9D1B32E24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B32C24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m */; };
A9D1B33624FE1652000F4662 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B33424FE164C000F4662 /* oimcore.framework */; };
A9D1B33724FE1652000F4662 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B33424FE164C000F4662 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
A9D1B33A24FE2DAC000F4662 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B33824FE2DA7000F4662 /* oimcore.framework */; };
A9D1B33B24FE2DAC000F4662 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B33824FE2DA7000F4662 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
A9D1B33E24FE3BE6000F4662 /* OffcnIMSqliteTestVC.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1B33D24FE3BE6000F4662 /* OffcnIMSqliteTestVC.m */; };
B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49CE5E230A14D9B821170F61 /* libPods-OffcnIMSDKiOS.a */; };
/* End PBXBuildFile section */
......@@ -219,7 +220,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
A9D1B33724FE1652000F4662 /* oimcore.framework in Embed Frameworks */,
A9D1B33B24FE2DAC000F4662 /* oimcore.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -646,7 +647,9 @@
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>"; };
A9D1B32D24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OffcnZYJTestDataStorageView.h; sourceTree = "<group>"; };
A9D1B33424FE164C000F4662 /* oimcore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = oimcore.framework; sourceTree = "<group>"; };
A9D1B33824FE2DA7000F4662 /* oimcore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = oimcore.framework; sourceTree = "<group>"; };
A9D1B33C24FE3BE6000F4662 /* OffcnIMSqliteTestVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OffcnIMSqliteTestVC.h; sourceTree = "<group>"; };
A9D1B33D24FE3BE6000F4662 /* OffcnIMSqliteTestVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OffcnIMSqliteTestVC.m; 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 */
......@@ -659,7 +662,7 @@
A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */,
A96621F524EA84160024EB54 /* libxml2.tbd in Frameworks */,
A96621EF24EA83A80024EB54 /* SystemConfiguration.framework in Frameworks */,
A9D1B33624FE1652000F4662 /* oimcore.framework in Frameworks */,
A9D1B33A24FE2DAC000F4662 /* oimcore.framework in Frameworks */,
A96621F124EA83B10024EB54 /* CoreTelephony.framework in Frameworks */,
B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */,
);
......@@ -698,7 +701,7 @@
A9661B4224EA64EE0024EB54 /* OffcnIMSDKiOS */ = {
isa = PBXGroup;
children = (
A9D1B33424FE164C000F4662 /* oimcore.framework */,
A9D1B33824FE2DA7000F4662 /* oimcore.framework */,
A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */,
A966274724EBA36A0024EB54 /* ExposedInterface-(外放接口) */,
A9661FC824EA7AD10024EB54 /* Common-(宏) */,
......@@ -707,6 +710,8 @@
A9661B5E24EA72900024EB54 /* AppDelegate.m */,
A9661B5D24EA72900024EB54 /* ViewController.h */,
A9661B5F24EA72900024EB54 /* ViewController.mm */,
A9D1B33C24FE3BE6000F4662 /* OffcnIMSqliteTestVC.h */,
A9D1B33D24FE3BE6000F4662 /* OffcnIMSqliteTestVC.m */,
A9D1B32D24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.h */,
A9D1B32C24F7BE7B000F4662 /* OffcnZYJTestDataStorageView.m */,
A9661B6224EA729A0024EB54 /* Main.storyboard */,
......@@ -1734,6 +1739,7 @@
A96621A324EA80A60024EB54 /* ZYJOSSLog.m in Sources */,
A96621D824EA80A60024EB54 /* ZYJMQTTCoreDataPersistence.m in Sources */,
A9661FE224EA7AD10024EB54 /* NSMutableAttributedString+SDSize.m in Sources */,
A9D1B33E24FE3BE6000F4662 /* OffcnIMSqliteTestVC.m in Sources */,
A966218F24EA80A60024EB54 /* ZYJMJRefreshAutoStateFooter.m in Sources */,
A96621E824EA80A60024EB54 /* ZYJAFNetworkReachabilityManager.m in Sources */,
A96621A524EA80A60024EB54 /* ZYJOSSGetBucketInfoRequest.m in Sources */,
......
OffcnIMSDKiOS/ExposedInterface-(外放接口)/OffcnIMSDKiOS.m
//
//
......@@ -221,6 +221,33 @@ static OffcnIMSDKiOS *liveTelecastSDK;
[dataDic setObjectOnSafe:[NSNumber numberWithLongLong:folderSize] forKey:@"size"];
}
OffcnIMMsgModel *MsgModel = [[OffcnIMMsgModel alloc] init];
OffcnIMBodyModel *BodyModel = [[OffcnIMBodyModel alloc] init];
BodyModel.msg_from = msg_fromID;
BodyModel.msg_to = msg_toID;
BodyModel.msg_type = msg_type;
BodyModel.tid = tidStr;
BodyModel.isSentSuccess = 0;
BodyModel.bymyself = 1;
BodyModel.isRead = 0;
if (msg_type == 1) {
MsgModel.msg = [dataDic objectForKeyOnSafe:@"msg"];
}else{
MsgModel.dur = [[dataDic objectForKeyOnSafe:@"dur"] longLongValue];
MsgModel.name = [dataDic objectForKeyOnSafe:@"name"];
MsgModel.md5 = [dataDic objectForKeyOnSafe:@"md5"];
MsgModel.url = [dataDic objectForKeyOnSafe:@"url"];
MsgModel.thumb_url = [dataDic objectForKeyOnSafe:@"thumb_url"];
MsgModel.cover_url = [dataDic objectForKeyOnSafe:@"cover_url"];
MsgModel.ext = [dataDic objectForKeyOnSafe:@"ext"];
MsgModel.w = [[dataDic objectForKeyOnSafe:@"w"] longLongValue];
MsgModel.h = [[dataDic objectForKeyOnSafe:@"h"] longLongValue];
MsgModel.size = [[dataDic objectForKeyOnSafe:@"size"] longLongValue];
}
BodyModel.msg = MsgModel;
[[OffcnIMZYJFMDBHandler sharedInstance] updateChatInfoIsSendStatusToFMDBWithModel:BodyModel isSuccess:nil];
[[OffcnIMZYJFMDBHandler sharedInstance] chatlistCacheInfo:BodyModel callback:nil];
[OffcnNetworkExecutor requestSendMsgWithMsg_fromID:msg_fromID msg_toID:msg_toID msg_type:msg_type tid:tidStr msg:dataDic Finished:^(BOOL success, OffcnIMSendMsgModel *sendMsgModel, BaseResponse *baseResponse) {
finished(success,sendMsgModel,baseResponse.errorMessage);
......
OffcnIMSDKiOS/ExposedInterface-(外放接口)/OffcnIMSocketManager.m
//
//
......@@ -49,8 +49,16 @@ static OffcnIMSocketManager *socketManager;
//建立连接
-(void)connectIMServerWithAccount_id:(NSString *)account_id token:(NSString *)token{
// connection_type = ["kcp，1281", "websocket，1280"]
// tls = ["disable", "enable"]
// kcp和websocket地址信息：
// server_ip : "39.102.42.185"
// server_port_websocket : 1280
// server_port_kcp:1281
//
// websocket + tls地址信息：
// server_ip : test-im.offcncloud.com
// server_port : 1279
// connection_type = ["kcp，1281", "websocket，1280"]
// tls = ["disable", "enable"]
self.msg_fromId = account_id;
......
OffcnIMSDKiOS/ExposedInterface-(外放接口)/OffcnIMZYJFMDBHandler.h
//
//
......@@ -14,10 +14,11 @@ typedef NS_ENUM(NSInteger, UIClearStyle) {
UIClearStyleList = 3 //删除系统消息等
};
typedef void (^getFMDBHistoryMessagesBlock)(NSArray *messagesArray);
@class OffcnIMBodyModel;
typedef void (^getFMDBHistoryMessagesBlock)(NSArray<OffcnIMBodyModel *> *messagesArray);
typedef void (^callBackIsSuccess)(BOOL isSuccess);
@class OffcnIMBodyModel;
@interface OffcnIMZYJFMDBHandler : NSObject
+ (OffcnIMZYJFMDBHandler *)sharedInstance;
......@@ -38,9 +39,9 @@ typedef void (^callBackIsSuccess)(BOOL isSuccess);
//删除表格
- (void)deleteDataTable;
//查询聊天记录(按时间戳倒叙排序)
- (void)getChatInfoArrayWithFromUser:(NSString *)fromUser toUser:(NSString *)toUser limit:(NSString *)limit startIndex:(NSString *)startIndex callback:(getFMDBHistoryMessagesBlock)messagesBack;
- (void)getChatRecordArrayWithFromUser:(NSString *)fromUser toUser:(NSString *)toUser limit:(NSString *)limit startIndex:(NSString *)startIndex callback:(getFMDBHistoryMessagesBlock)messagesBack;
//查询聊天列表
- (void)getChatInfoAllDataArrayCallback:(getFMDBHistoryMessagesBlock)messagesBack;
- (void)getChatListArrayCallback:(getFMDBHistoryMessagesBlock)messagesBack;
//消息内容
- (NSString *)lastMessage:(OffcnIMBodyModel *)messageModel;
@end
......
OffcnIMSDKiOS/ExposedInterface-(外放接口)/OffcnIMZYJFMDBHandler.m
//
//
......@@ -70,7 +70,7 @@ static OffcnIMZYJFMDBHandler *FMDBHandler;
[_database inDatabase:^(ZYJZYJFMDatabase *db) {
NSString *sqlStr = @"insert into chatinfo(msg_fromId,msg_toId,tid,session_id,msg_id,version,send_time,msg_seq,msg_scope,msg_type,msg,dur,name,md5,url,thumb_url,cover_url,ext,w,h,size,isSentSuccess,bymyself,isRead) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
BOOL result = [db executeUpdate:sqlStr,chatModel.msg_from,chatModel.msg_to,chatModel.tid,chatModel.session_id,chatModel.msg_id,chatModel.version,chatModel.send_time,[NSNumber numberWithInteger:chatModel.msg_seq],[NSNumber numberWithInteger:chatModel.msg_scope],[NSNumber numberWithInteger:chatModel.msg_type],chatModel.msg.msg,chatModel.msg.dur,chatModel.msg.name,chatModel.msg.md5,chatModel.msg.url,chatModel.msg.thumb_url,chatModel.msg.cover_url,chatModel.msg.ext,chatModel.msg.w,chatModel.msg.h,chatModel.msg.size,[NSNumber numberWithInteger:chatModel.isSentSuccess],[NSNumber numberWithInteger:chatModel.bymyself],[NSNumber numberWithInteger:chatModel.isRead]];
BOOL result = [db executeUpdate:sqlStr,chatModel.msg_from,chatModel.msg_to,chatModel.tid,chatModel.session_id,chatModel.msg_id,chatModel.version,chatModel.send_time,[NSNumber numberWithInteger:chatModel.msg_seq],[NSNumber numberWithInteger:chatModel.msg_scope],[NSNumber numberWithInteger:chatModel.msg_type],chatModel.msg.msg,[NSNumber numberWithInteger:chatModel.msg.dur],chatModel.msg.name,chatModel.msg.md5,chatModel.msg.url,chatModel.msg.thumb_url,chatModel.msg.cover_url,chatModel.msg.ext,[NSNumber numberWithInteger:chatModel.msg.w],[NSNumber numberWithInteger:chatModel.msg.h],[NSNumber numberWithInteger:chatModel.msg.size],[NSNumber numberWithInteger:chatModel.isSentSuccess],[NSNumber numberWithInteger:chatModel.bymyself],[NSNumber numberWithInteger:chatModel.isRead]];
if (!result) {
NSLog(@"error when insert into database table");
......@@ -87,8 +87,9 @@ static OffcnIMZYJFMDBHandler *FMDBHandler;
}
[_database inDatabase:^(ZYJZYJFMDatabase *db) {
NSString *sql = @"update chatinfo set isSentSuccess = ?,msg_id = ?,send_time = ?,session_id = ? where tid = ?";
BOOL result = [db executeUpdate:sql,[NSNumber numberWithInteger:messageModel.isSentSuccess],messageModel.msg_id,messageModel.send_time,messageModel.session_id,messageModel.tid];
NSString *sql = @"update chatinfo set isSentSuccess = ?,msg_id = ?,send_time = ?,session_id = ?,msg = ?,name = ?,md5 = ?,url = ?,thumb_url = ?,cover_url = ?,ext = ?,w = ?,h = ?,size = ?,dur = ? where tid = ?";
BOOL result = [db executeUpdate:sql,[NSNumber numberWithInteger:messageModel.isSentSuccess],messageModel.msg_id,messageModel.send_time,messageModel.session_id,messageModel.msg.msg,messageModel.msg.name,messageModel.msg.md5,messageModel.msg.url,messageModel.msg.thumb_url,messageModel.msg.cover_url,messageModel.msg.ext,[NSNumber numberWithInteger:messageModel.msg.w],[NSNumber numberWithInteger:messageModel.msg.h],[NSNumber numberWithInteger:messageModel.msg.size],[NSNumber numberWithInteger:messageModel.msg.dur],messageModel.tid];
if (!result) {
NSLog(@"error when insert into database table");
NSLog(@"%d",db.lastErrorCode);
......@@ -122,9 +123,9 @@ static OffcnIMZYJFMDBHandler *FMDBHandler;
BOOL result = NO;
if (tmpDataArray.count) {
NSString *sqlStr = @"update chatlist set lastmessage = ?,lastSendtime = ?,session_id = ? where tid = ? or msg_id = ?";
NSString *sqlStr = @"update chatlist set lastmessage = ?,lastSendtime = ?,session_id = ?,tid = ?,msg_id = ?,msg_type = ? where msg_fromId = ? and msg_toId = ?";
NSString *lastmessage = [self lastMessage:chatlistModel];
result = [db executeUpdate:sqlStr,lastmessage,chatlistModel.send_time,chatlistModel.session_id,chatlistModel.tid,chatlistModel.msg_id];
result = [db executeUpdate:sqlStr,lastmessage,chatlistModel.send_time,chatlistModel.session_id,chatlistModel.tid,chatlistModel.msg_id,[NSNumber numberWithInteger:chatlistModel.msg_type],chatlistModel.msg_from,chatlistModel.msg_to];
//不存在,插库
}else{
......@@ -276,7 +277,7 @@ static OffcnIMZYJFMDBHandler *FMDBHandler;
}
//查询聊天记录(按时间戳倒叙排序)
- (void)getChatInfoArrayWithFromUser:(NSString *)fromUser toUser:(NSString *)toUser limit:(NSString *)limit startIndex:(NSString *)startIndex callback:(getFMDBHistoryMessagesBlock)messagesBack{
- (void)getChatRecordArrayWithFromUser:(NSString *)fromUser toUser:(NSString *)toUser limit:(NSString *)limit startIndex:(NSString *)startIndex callback:(getFMDBHistoryMessagesBlock)messagesBack{
if (!_database) {
getFMDBInstance();
}
......@@ -303,16 +304,16 @@ static OffcnIMZYJFMDBHandler *FMDBHandler;
tmpModel.isRead = [rs intForColumn:@"isRead"];
tmpContentModel.msg = [rs stringForColumn:@"msg"];
tmpContentModel.dur = [[rs stringForColumn:@"dur"] integerValue];
tmpContentModel.dur = [rs longLongIntForColumn:@"dur"];
tmpContentModel.name = [rs stringForColumn:@"name"];
tmpContentModel.md5 = [rs stringForColumn:@"md5"];
tmpContentModel.url = [rs stringForColumn:@"url"];
tmpContentModel.thumb_url = [rs stringForColumn:@"thumb_url"];
tmpContentModel.cover_url = [rs stringForColumn:@"cover_url"];
tmpContentModel.ext = [rs stringForColumn:@"ext"];
tmpContentModel.w = [[rs stringForColumn:@"w"] integerValue];
tmpContentModel.h = [[rs stringForColumn:@"h"] integerValue];
tmpContentModel.size = [[rs stringForColumn:@"size"] integerValue];
tmpContentModel.w = [rs longLongIntForColumn:@"w"];
tmpContentModel.h = [rs longLongIntForColumn:@"h"];
tmpContentModel.size = [rs longLongIntForColumn:@"size"];
tmpModel.msg = tmpContentModel;
[tmpArray addObject:tmpModel];
}
......@@ -327,7 +328,7 @@ static OffcnIMZYJFMDBHandler *FMDBHandler;
}
//查询聊天列表
- (void)getChatInfoAllDataArrayCallback:(getFMDBHistoryMessagesBlock)messagesBack{
- (void)getChatListArrayCallback:(getFMDBHistoryMessagesBlock)messagesBack{
if (!_database) {
getFMDBInstance();
}
......
OffcnIMSDKiOS/OffcnIMSqliteTestVC.h 0 → 100644
//
// OffcnIMSqliteTestVC.h
// OffcnIMSDKiOS
//
// Created by vockey on 2020/9/1.
// Copyright © 2020 offcn. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface OffcnIMSqliteTestVC : UIViewController
@end
NS_ASSUME_NONNULL_END
OffcnIMSDKiOS/OffcnIMSqliteTestVC.m 0 → 100644
//
// OffcnIMSqliteTestVC.m
// OffcnIMSDKiOS
//
// Created by vockey on 2020/9/1.
// Copyright © 2020 offcn. All rights reserved.
//
#import "OffcnIMSqliteTestVC.h"
#import "OffcnIMZYJFMDBHandler.h"
#import "OffcnIMModel.h"
#import "OffcnZYJTestDataStorageView.h"
@interface OffcnIMSqliteTestVC ()
@property (strong, nonatomic) NSString *fromId;
@property (strong, nonatomic) NSString *toId;
@property (assign, nonatomic) UIClearStyle clearStyle;
@end
@implementation OffcnIMSqliteTestVC
- (void)viewDidLoad {
[super viewDidLoad];
self.title = @"数据库";
self.fromId = @"ce0819db8391f1e7258a71cc9e2c3235";
self.toId = @"ceb7383519c5b6a1c8579553f01ad9c4";
self.clearStyle = UIClearStylePart;
}
//删除记录
- (IBAction)deleteRecord:(UIButton *)sender {
[[OffcnIMZYJFMDBHandler sharedInstance] deleteUserChatDataWithFromUser:self.fromId toUser:self.toId clearStyle:self.clearStyle callBack:^(BOOL isSuccess) {
}];
}
//删除表格
- (IBAction)deleteTable:(UIButton *)sender {
[[OffcnIMZYJFMDBHandler sharedInstance] deleteDataTable];
}
//查询聊天列表
- (IBAction)queryChatList:(UIButton *)sender {
[[OffcnIMZYJFMDBHandler sharedInstance] getChatListArrayCallback:^(NSArray<OffcnIMBodyModel *> *messagesArray) {
NSString *msg = @"";
for (int i=0; i<messagesArray.count; i++) {
OffcnIMBodyModel *model = messagesArray[i];
msg = [msg stringByAppendingString:[NSString stringWithFormat:@"msg_type:%ld,lastSendtime:%@,lastmessage:%@",(long)model.msg_type,model.lastSendtime,model.lastmessage]];
msg = [msg stringByAppendingString:@"\r\n"];
msg = [msg stringByAppendingString:@"\r\n"];
}
OffcnZYJTestDataStorageView *storageView = [[OffcnZYJTestDataStorageView alloc] initWithFrame:CGRectMake(0, 20, self.view.bounds.size.width, self.view.bounds.size.height-20)];
storageView.msg = msg;
[storageView showView];
}];
}
//查询聊天记录
- (IBAction)queryChat:(UIButton *)sender {
[[OffcnIMZYJFMDBHandler sharedInstance] getChatRecordArrayWithFromUser:self.fromId toUser:self.toId limit:@"20" startIndex:@"0" callback:^(NSArray<OffcnIMBodyModel *> *messagesArray) {
NSString *msg = @"";
for (int i=0; i<messagesArray.count; i++) {
OffcnIMBodyModel *model = messagesArray[i];
if (model.msg_type == 1) {
msg = [msg stringByAppendingString:model.msg.msg?model.msg.msg:@"nil"];
}else{
msg = [msg stringByAppendingString:model.msg.url?model.msg.url:@"nil"];
}
msg = [msg stringByAppendingString:@"\r\n"];
msg = [msg stringByAppendingString:@"\r\n"];
}
OffcnZYJTestDataStorageView *storageView = [[OffcnZYJTestDataStorageView alloc] initWithFrame:CGRectMake(0, 20, self.view.bounds.size.width, self.view.bounds.size.height-20)];
storageView.msg = msg;
[storageView showView];
}];
}
@end
OffcnIMSDKiOS/Tools-(工具)/NetworkManager/OffcnNetworkExecutor.m
//
//
......@@ -51,6 +51,7 @@
OffcnIMSendMsgModel *SendMsgModel = [OffcnIMSendMsgModel mj_ZYJobjectWithKeyValues:baseResponse.responseObject];
OffcnIMMsgModel *MsgModel = [[OffcnIMMsgModel alloc] init];
OffcnIMBodyModel *BodyModel = [[OffcnIMBodyModel alloc] init];
BodyModel.msg_from = msg_fromID;
BodyModel.msg_to = msg_toID;
......@@ -59,6 +60,23 @@
BodyModel.session_id = SendMsgModel.session_id;
BodyModel.tid = SendMsgModel.tid;
BodyModel.isSentSuccess = 1;
BodyModel.msg_type = msg_type;
if (msg_type == 1) {
MsgModel.msg = [msgDic objectForKeyOnSafe:@"msg"];
}else{
MsgModel.dur = [[msgDic objectForKeyOnSafe:@"dur"] longLongValue];
MsgModel.name = [msgDic objectForKeyOnSafe:@"name"];
MsgModel.md5 = [msgDic objectForKeyOnSafe:@"md5"];
MsgModel.url = [msgDic objectForKeyOnSafe:@"url"];
MsgModel.thumb_url = [msgDic objectForKeyOnSafe:@"thumb_url"];
MsgModel.cover_url = [msgDic objectForKeyOnSafe:@"cover_url"];
MsgModel.ext = [msgDic objectForKeyOnSafe:@"ext"];
MsgModel.w = [[msgDic objectForKeyOnSafe:@"w"] longLongValue];
MsgModel.h = [[msgDic objectForKeyOnSafe:@"h"] longLongValue];
MsgModel.size = [[msgDic objectForKeyOnSafe:@"size"] longLongValue];
}
BodyModel.msg = MsgModel;
[[OffcnIMZYJFMDBHandler sharedInstance] updateChatInfoIsSendStatusToFMDBWithModel:BodyModel isSuccess:nil];
[[OffcnIMZYJFMDBHandler sharedInstance] chatlistCacheInfo:BodyModel callback:nil];
......
OffcnIMSDKiOS/ViewController.mm
......@@ -75,7 +75,7 @@
};
[OffcnIMSocketManager defaultService].connectStatus = ^(OffcnIMConnectStatus status, NSString * _Nonnull errorMessage) {
NSLog(@"收到连接状态---%@,code:%lu",errorMessage,(unsigned long)status);
NSLog(@"收到连接状态---%@,code:%lu,%@",errorMessage,(unsigned long)status,[weakSelf getNowSSSTimeTimestamp]);
if (status == OffcnIMConnectStatusDisConnectOK) {
errorMessage = @"断开连接成功";
}else if (status == OffcnIMConnectStatusSuccess){
......@@ -88,6 +88,20 @@
[weakSelf tipMessageWithTitle:@"收到连接状态" message:errorMessage];
};
}
//获取当前时间戳(以毫秒为单位)
-(NSString *)getNowSSSTimeTimestamp{
NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
[formatter setDateStyle:NSDateFormatterMediumStyle];
[formatter setTimeStyle:NSDateFormatterShortStyle];
[formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss SSS"]; //
NSTimeZone* timeZone = [NSTimeZone timeZoneWithName:@"Asia/Beijing"];
[formatter setTimeZone:timeZone];
NSDate *datenow = [NSDate date];
// NSString *timeSp = [NSString stringWithFormat:@"%ld", (long)([datenow timeIntervalSince1970]*1000)];
NSString *timeSp = [formatter stringFromDate:datenow];
return timeSp;
}
- (IBAction)disconnectAction:(UIButton *)sender {
//断开连接
......@@ -241,7 +255,7 @@
[self gotoImageLibrary];
}
- (IBAction)uploadFile:(UIButton *)sender {
- (IBAction)uploadImage:(UIButton *)sender {
//上传
__weak typeof(self) weakSelf = self;
NSString *filePath = [self getImagePath:self.pickImage];
......@@ -254,6 +268,20 @@
}
}];
}
- (IBAction)uploadFile:(UIButton *)sender {
NSString *path = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,NSUserDomainMask,YES).firstObject;
NSString *filePath = [path stringByAppendingPathComponent:@"ZYJFMDBIMChat.db"];
__weak typeof(self) weakSelf = self;
[[OffcnIMSDKiOS defaultService] sendMsgWithMsg_fromID:self.fromId msg_toID:self.toId msg_type:OffcnSDKMsgTypeFile text:nil filePath:filePath Finished:^(BOOL success, OffcnIMSendMsgModel *sendMsgModel, NSString *errorMessage) {
if (success) {
[weakSelf tipMessageWithTitle:@"上传成功" message:@""];
}else{
[weakSelf tipMessageWithTitle:@"上传失败" message:errorMessage];
}
}];
}
#pragma mark UIImagePickerControllerDelegate
- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary<UIImagePickerControllerInfoKey, id> *)info {
......
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