Commit 0187e396 by zhangyunjie

上传改为传路径

parent 46495bfd
//
//
......@@ -60,8 +60,8 @@ typedef void(^OffcnSDKReachabilityStatusCallBack)(OffcnSDKReachabilityStatus sta
/// @param msg_toID 接收人ID
/// @param msg_type 发送消息类型
/// @param text 文本
/// @param fileData 图片/音频/视频/文件
/// @param filePath 图片/音频/视频/文件路径
/// @param finished 结果回调
-(void)sendMsgWithMsg_fromID:(NSString *)msg_fromID msg_toID:(NSString *)msg_toID msg_type:(OffcnSDKMsgType)msg_type text:(NSString *)text fileData:(NSData *)fileData Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished;
-(void)sendMsgWithMsg_fromID:(NSString *)msg_fromID msg_toID:(NSString *)msg_toID msg_type:(OffcnSDKMsgType)msg_type text:(NSString *)text filePath:(NSString *)filePath Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished;
@end
//
//
......@@ -104,7 +104,7 @@ static OffcnIMSDKiOS *liveTelecastSDK;
}
#pragma mark - 操作事件
-(void)sendMsgWithMsg_fromID:(NSString *)msg_fromID msg_toID:(NSString *)msg_toID msg_type:(OffcnSDKMsgType)msg_type text:(NSString *)text fileData:(NSData *)fileData Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished{
-(void)sendMsgWithMsg_fromID:(NSString *)msg_fromID msg_toID:(NSString *)msg_toID msg_type:(OffcnSDKMsgType)msg_type text:(NSString *)text filePath:(NSString *)filePath Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished{
//发送消息
if (msg_type == OffcnSDKMsgTypeText) {
......@@ -119,7 +119,7 @@ static OffcnIMSDKiOS *liveTelecastSDK;
finished(success,nil,baseResponse.errorMessage);
}];
}else{
[[OffcnUploadManager defaultService] uploadToQNFileData:fileData Finished:^(BOOL success, id _Nonnull response, NSString * _Nonnull errorMessage) {
[[OffcnUploadManager defaultService] uploadToQNFilePath:filePath Finished:^(BOOL success, id _Nonnull response, NSString * _Nonnull errorMessage) {
if (success) {
NSString *responseStr = @"";
if (response) {
......
//
//
......@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
+(OffcnUploadManager *)defaultService;
-(void)uploadToQNFileData:(NSData *)fileData Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished;
-(void)uploadToQNFilePath:(NSString *)filePath Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished;
@end
NS_ASSUME_NONNULL_END
//
//
......@@ -35,18 +35,18 @@ static OffcnUploadManager *uploadManager;
return self;
}
-(void)uploadToQNFileData:(NSData *)fileData Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished{
-(void)uploadToQNFilePath:(NSString *)filePath Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished{
__weak typeof(self) weakSelf = self;
if (self.QNToken) {
[self uploadToQNWithQNToken:self.QNToken fileData:fileData Finished:^(BOOL success, id response, NSString *errorMessage) {
[self uploadToQNWithQNToken:self.QNToken filePath:filePath Finished:^(BOOL success, id response, NSString *errorMessage) {
finished(success,response,errorMessage);
}];
}else{
[self getQNTokenFinished:^(BOOL success, NSString *errorMessage) {
if (success) {
[weakSelf uploadToQNWithQNToken:weakSelf.QNToken fileData:fileData Finished:^(BOOL success, id response, NSString *errorMessage) {
[weakSelf uploadToQNWithQNToken:weakSelf.QNToken filePath:filePath Finished:^(BOOL success, id response, NSString *errorMessage) {
finished(success,response,errorMessage);
}];
......@@ -72,12 +72,12 @@ static OffcnUploadManager *uploadManager;
}];
}
-(void)uploadToQNWithQNToken:(NSString *)QNToken fileData:(NSData *)fileData Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished{
-(void)uploadToQNWithQNToken:(NSString *)QNToken filePath:(NSString *)filePath Finished:(void(^)(BOOL success,id response,NSString *errorMessage))finished{
QNUploadOption *uploadOption = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
NSLog(@"percent == %.2f", percent);
}params:nil checkCrc:NO cancellationSignal:nil];
[self.upManager putData:fileData key:nil token:QNToken complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
[self.upManager putFile:filePath key:nil token:QNToken complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
NSLog(@"info ===== %@", info);
NSLog(@"key ===== %@", key);
NSLog(@"resp ===== %@", resp);
......
......@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSMicrophoneUsageDescription</key>
<string>App需要您的同意,才能访问麦克风</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>App需要您的同意,才能访问相册</string>
<key>CFBundleDevelopmentRegion</key>
......
......@@ -69,7 +69,7 @@
- (IBAction)sendMeg:(UIButton *)sender {
//发送消息
[[OffcnIMSDKiOS defaultService] sendMsgWithMsg_fromID:self.fromId msg_toID:self.toId msg_type:OffcnSDKMsgTypeText text:@"你好" fileData:nil Finished:^(BOOL success, id response, NSString *errorMessage) {
[[OffcnIMSDKiOS defaultService] sendMsgWithMsg_fromID:self.fromId msg_toID:self.toId msg_type:OffcnSDKMsgTypeText text:@"你好" filePath:nil Finished:^(BOOL success, id response, NSString *errorMessage) {
}];
}
......@@ -117,8 +117,8 @@
- (IBAction)uploadFile:(UIButton *)sender {
//上传
NSData *imageData = UIImageJPEGRepresentation(self.pickImage, 0.5);
[[OffcnIMSDKiOS defaultService] sendMsgWithMsg_fromID:self.fromId msg_toID:self.toId msg_type:OffcnSDKMsgTypePicture text:nil fileData:imageData Finished:^(BOOL success, id response, NSString *errorMessage) {
NSString *filePath = [self getImagePath:self.pickImage];
[[OffcnIMSDKiOS defaultService] sendMsgWithMsg_fromID:self.fromId msg_toID:self.toId msg_type:OffcnSDKMsgTypePicture text:nil filePath:filePath Finished:^(BOOL success, id response, NSString *errorMessage) {
}];
}
......@@ -157,6 +157,32 @@
NSLog(@"访问相册错误");
}
}
//照片获取本地路径转换
-(NSString *)getImagePath:(UIImage *)Image{
NSString *filePath = nil;
NSData *data = nil;
if (UIImagePNGRepresentation(Image) == nil) {
data = UIImageJPEGRepresentation(Image, 1.0);
} else {
data = UIImagePNGRepresentation(Image);
}
//图片保存的路径
//这里将图片放在沙盒的documents文件夹中
NSString *DocumentsPath = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
//文件管理器
NSFileManager *fileManager = [NSFileManager defaultManager];
//把刚刚图片转换的data对象拷贝至沙盒中
[fileManager createDirectoryAtPath:DocumentsPath withIntermediateDirectories:YES attributes:nil error:nil];
NSString *ImagePath = [[NSString alloc] initWithFormat:@"/theFirstImage.png"];
[fileManager createFileAtPath:[DocumentsPath stringByAppendingString:ImagePath] contents:data attributes:nil];
//得到选择后沙盒中图片的完整路径
filePath = [[NSString alloc] initWithFormat:@"%@%@", DocumentsPath, ImagePath];
return filePath;
}
//可旋转屏幕
......
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