Skip to content

Commit

Permalink
# 5.6.2
Browse files Browse the repository at this point in the history
- 预签名url带有中文bugfix / - 跨区域复制bugfix / - 修复开启cocoapods的mutiple_pod_project功能之后编译报错
  • Loading branch information
karisli committed Jul 11, 2019
1 parent 9b83721 commit b86ef1e
Show file tree
Hide file tree
Showing 71 changed files with 409 additions and 304 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 5.6.2
- 预签名url带有中文bugfix / - 跨区域复制bugfix / - 修复开启cocoapods的mutiple_pod_project功能之后编译报错

# 5.6.1
- mta去除idfa
- 增加自定义分片大小接口
- budfix

# 5.6.0
- 支持归档直传/-mta bugfix

Expand Down
6 changes: 3 additions & 3 deletions QCloudCOSXML.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "QCloudCOSXML"
s.version = "5.6.0"
s.version = "5.6.2"
s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"

s.homepage = "https://cloud.tencent.com/"
Expand All @@ -9,12 +9,12 @@ s.version = "5.6.0"
s.source = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
s.ios.deployment_target = '8.0'
s.source_files = 'QCloudCOSXML/Classes/**/*'
s.dependency "QCloudCore",'5.6.0'
s.dependency "QCloudCore",'5.6.2'
s.static_framework = true

s.subspec 'Transfer' do |sbt|
sbt.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
sbt.dependency "QCloudCore",'5.6.0'
sbt.dependency "QCloudCore",'5.6.2'
# sbt.static_framework=true
end
end
6 changes: 2 additions & 4 deletions QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@

#import "QCloudCOSXMLService+Quality.h"
#import <objc/runtime.h>
#import <QCloudCore/MTA.h>
#import <QCloudCore/MTAConfig.h>
#import <QCloudCore/MTACrashReporter.h>
#import <QCloudCore/QualityAssuranceDefine.h>


#import <QCloudCore/QCloudCore.h>
#import <QCloudCore/QCloudLogger.h>
#import "QCloudCOSXMLVersion.h"
Expand Down
17 changes: 8 additions & 9 deletions QCloudCOSXML/Classes/Base/QCloudCOSXMLService.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
#import "QCloudCOSXMLService.h"
#import "QCloudCOSXMLService+Configuration.h"
#import "QCloudCOSXMLService+Private.h"
#import <QCloudCore/QCloudThreadSafeMutableDictionary.h>
#import <QCloudCore/QCLoudError.h>
#import "UIDevice+QCloudFCUUID.h"
#if TARGET_OS_IPHONE
#if TARGET_OS_IOS
#import "QCloudLogManager.h"
#endif
QCloudThreadSafeMutableDictionary* QCloudCOSXMLServiceCache()
Expand Down Expand Up @@ -61,15 +58,17 @@ - (QCloudHTTPSessionManager*) sessionManager {
@synchronized(self) {
if (self.isHaveBody) {
if (self.configuration.backgroundEnable) {
QCloudLogDebug(@"get background sessionManager: %@ ",[QCloudHTTPSessionManager shareClient]);
return [QCloudHTTPSessionManager sessionManagerWithBackgroundIdentifier:self.configuration.backgroundIdentifier];
}else{
return [QCloudHTTPSessionManager shareClient];;
return [QCloudHTTPSessionManager shareClient];;
}
}else{
return [QCloudHTTPSessionManager shareClient];;
}

}
QCloudLogDebug(@"get client sessionManager: %@ ",[QCloudHTTPSessionManager shareClient]);
return [QCloudHTTPSessionManager shareClient];
}

Expand All @@ -78,11 +77,11 @@ + (QCloudCOSXMLService*) registerDefaultCOSXMLWithConfiguration:(QCloudServiceCo
@synchronized (self) {
COSXMLService = [[QCloudCOSXMLService alloc] initWithConfiguration:configuration];
if (!configuration.isCloseShareLog) {
#if TARGET_OS_IPHONE
#if TARGET_OS_IOS
[QCloudLogManager sharedInstance];
#endif
#endif
}

}
return COSXMLService;
}
Expand Down
17 changes: 0 additions & 17 deletions QCloudCOSXML/Classes/Base/QCloudLogDetailViewController.h

This file was deleted.

49 changes: 0 additions & 49 deletions QCloudCOSXML/Classes/Base/QCloudLogDetailViewController.m

This file was deleted.

4 changes: 2 additions & 2 deletions QCloudCOSXML/Classes/Base/QCloudLogManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Created by erichmzhang(张恒铭) on 2018/10/8.
//
#if TARGET_OS_IPHONE

#import <Foundation/Foundation.h>

NS_ASSUME_NONNULL_BEGIN
Expand All @@ -16,4 +16,4 @@ NS_ASSUME_NONNULL_BEGIN
@end

NS_ASSUME_NONNULL_END
#endif

111 changes: 108 additions & 3 deletions QCloudCOSXML/Classes/Base/QCloudLogManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,114 @@
//
// Created by erichmzhang(张恒铭) on 2018/10/8.
//
#if TARGET_OS_IPHONE

#import "QCloudLogManager.h"

#import <QCloudCore/QCloudCore.h>
#import "QCloudLogTableViewController.h"
#if TARGET_OS_IOS
#import<UIKit/UIKit.h>


@interface QCloudLogDetailViewController : UIViewController
- (instancetype) initWithLogPath:(NSString *)logPath LogContent:(NSString *)logContent;
@property (nonatomic, strong) NSString *logContent;
@property (nonatomic, strong) NSString *logPath;
@property (nonatomic, strong) UITextView *textView;
@end

@implementation QCloudLogDetailViewController

- (void)viewDidLoad {
[super viewDidLoad];
UIBarButtonItem *barButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"发送" style:UIBarButtonItemStylePlain target:self action:@selector(onHandleShareLog)];
self.navigationItem.rightBarButtonItem = barButtonItem;
self.textView = [[UITextView alloc] initWithFrame:self.view.frame];
[self.view addSubview:self.textView];
}

- (instancetype) initWithLogPath:(NSString *)logPath LogContent:(NSString *)logContent {
self = [super init];
self.logContent = logContent;
self.logPath = logPath;
return self;
}

- (void)onHandleShareLog {
NSURL *url = [NSURL fileURLWithPath:self.logPath];
NSArray *activityItems = @[url];
UIActivityViewController *activityVC = [[UIActivityViewController alloc]initWithActivityItems:activityItems applicationActivities:nil];
[self presentViewController:activityVC animated:YES completion:nil];


}

- (void) viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
self.textView.text = self.logContent;
}



@end
@interface QCloudLogTableViewController : UIViewController <UITableViewDelegate,UITableViewDataSource>
@property (nonatomic, strong) UITableView *tableView;
@property (nonatomic, strong) NSArray *logsDirecotryArray;
- (instancetype) initWithLog:(NSArray *)logContent;
@end

@implementation QCloudLogTableViewController

- (void)viewDidLoad {
[super viewDidLoad];
self.tableView = [[UITableView alloc] initWithFrame:self.view.bounds];
self.tableView.delegate = self;
self.tableView.dataSource = self;
[self.view addSubview:self.tableView];
}

- (void) viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[self.tableView reloadData];
}


- (instancetype)initWithLog:(NSArray *)logContent {
self = [super init];
self.logsDirecotryArray = logContent;
return self;
}

#pragma mark - TableViewDelegate
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
return 1;
}

- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return self.logsDirecotryArray.count;
}

- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"reuse-cell"];
if (cell == nil) {
cell = [[UITableViewCell alloc] init];
}
cell.textLabel.text = self.logsDirecotryArray[indexPath.row];
return cell;
}

- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
[tableView deselectRowAtIndexPath:indexPath animated:YES];
// shoud detail view
NSString * logPath = [[QCloudLogger sharedLogger].logDirctoryPath stringByAppendingPathComponent:self.logsDirecotryArray[indexPath.row]];
NSData *logData = [[NSFileManager defaultManager] contentsAtPath:logPath];
NSString *logContent = [[NSString alloc] initWithData:logData encoding:NSUTF8StringEncoding];
QCloudLogDetailViewController *viewController = [[QCloudLogDetailViewController alloc] initWithLogPath:logPath LogContent:logContent];
[self.navigationController pushViewController:viewController animated:YES];
}

@end


@implementation QCloudLogManager
+ (instancetype) sharedInstance {
static QCloudLogManager *instance;
Expand All @@ -30,7 +134,7 @@ - (void)dealloc {
}
- (void) onHandleAppBecomeActive :(NSNotification *)notification {
if ([self shouldShowLogs]) {
[UIPasteboard generalPasteboard].string = @"";
[UIPasteboard generalPasteboard].string = @"";
[self showLogs];
}
}
Expand Down Expand Up @@ -94,4 +198,5 @@ - (UIViewController *)currentViewController {
}

@end

#endif
17 changes: 0 additions & 17 deletions QCloudCOSXML/Classes/Base/QCloudLogTableViewController.h

This file was deleted.

66 changes: 0 additions & 66 deletions QCloudCOSXML/Classes/Base/QCloudLogTableViewController.m

This file was deleted.

0 comments on commit b86ef1e

Please sign in to comment.