Skip to content

Commit b86ef1e

Browse files
author
karisli
committed
# 5.6.2
- 预签名url带有中文bugfix / - 跨区域复制bugfix / - 修复开启cocoapods的mutiple_pod_project功能之后编译报错
1 parent 9b83721 commit b86ef1e

File tree

71 files changed

+409
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+409
-304
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 5.6.2
2+
- 预签名url带有中文bugfix / - 跨区域复制bugfix / - 修复开启cocoapods的mutiple_pod_project功能之后编译报错
3+
4+
# 5.6.1
5+
- mta去除idfa
6+
- 增加自定义分片大小接口
7+
- budfix
8+
19
# 5.6.0
210
- 支持归档直传/-mta bugfix
311

QCloudCOSXML.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "QCloudCOSXML"
3-
s.version = "5.6.0"
3+
s.version = "5.6.2"
44
s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
55

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

1515
s.subspec 'Transfer' do |sbt|
1616
sbt.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
17-
sbt.dependency "QCloudCore",'5.6.0'
17+
sbt.dependency "QCloudCore",'5.6.2'
1818
# sbt.static_framework=true
1919
end
2020
end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77

88
#import "QCloudCOSXMLService+Quality.h"
99
#import <objc/runtime.h>
10-
#import <QCloudCore/MTA.h>
11-
#import <QCloudCore/MTAConfig.h>
12-
#import <QCloudCore/MTACrashReporter.h>
13-
#import <QCloudCore/QualityAssuranceDefine.h>
10+
11+
1412
#import <QCloudCore/QCloudCore.h>
1513
#import <QCloudCore/QCloudLogger.h>
1614
#import "QCloudCOSXMLVersion.h"

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.m

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
#import "QCloudCOSXMLService.h"
2828
#import "QCloudCOSXMLService+Configuration.h"
2929
#import "QCloudCOSXMLService+Private.h"
30-
#import <QCloudCore/QCloudThreadSafeMutableDictionary.h>
31-
#import <QCloudCore/QCLoudError.h>
32-
#import "UIDevice+QCloudFCUUID.h"
33-
#if TARGET_OS_IPHONE
30+
#if TARGET_OS_IOS
3431
#import "QCloudLogManager.h"
3532
#endif
3633
QCloudThreadSafeMutableDictionary* QCloudCOSXMLServiceCache()
@@ -61,15 +58,17 @@ - (QCloudHTTPSessionManager*) sessionManager {
6158
@synchronized(self) {
6259
if (self.isHaveBody) {
6360
if (self.configuration.backgroundEnable) {
61+
QCloudLogDebug(@"get background sessionManager: %@ ",[QCloudHTTPSessionManager shareClient]);
6462
return [QCloudHTTPSessionManager sessionManagerWithBackgroundIdentifier:self.configuration.backgroundIdentifier];
6563
}else{
66-
return [QCloudHTTPSessionManager shareClient];;
64+
return [QCloudHTTPSessionManager shareClient];;
6765
}
6866
}else{
6967
return [QCloudHTTPSessionManager shareClient];;
7068
}
71-
69+
7270
}
71+
QCloudLogDebug(@"get client sessionManager: %@ ",[QCloudHTTPSessionManager shareClient]);
7372
return [QCloudHTTPSessionManager shareClient];
7473
}
7574

@@ -78,11 +77,11 @@ + (QCloudCOSXMLService*) registerDefaultCOSXMLWithConfiguration:(QCloudServiceCo
7877
@synchronized (self) {
7978
COSXMLService = [[QCloudCOSXMLService alloc] initWithConfiguration:configuration];
8079
if (!configuration.isCloseShareLog) {
81-
#if TARGET_OS_IPHONE
80+
#if TARGET_OS_IOS
8281
[QCloudLogManager sharedInstance];
83-
#endif
82+
#endif
8483
}
85-
84+
8685
}
8786
return COSXMLService;
8887
}

QCloudCOSXML/Classes/Base/QCloudLogDetailViewController.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

QCloudCOSXML/Classes/Base/QCloudLogDetailViewController.m

Lines changed: 0 additions & 49 deletions
This file was deleted.

QCloudCOSXML/Classes/Base/QCloudLogManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// Created by erichmzhang(张恒铭) on 2018/10/8.
66
//
7-
#if TARGET_OS_IPHONE
7+
88
#import <Foundation/Foundation.h>
99

1010
NS_ASSUME_NONNULL_BEGIN
@@ -16,4 +16,4 @@ NS_ASSUME_NONNULL_BEGIN
1616
@end
1717

1818
NS_ASSUME_NONNULL_END
19-
#endif
19+

QCloudCOSXML/Classes/Base/QCloudLogManager.m

Lines changed: 108 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,114 @@
44
//
55
// Created by erichmzhang(张恒铭) on 2018/10/8.
66
//
7-
#if TARGET_OS_IPHONE
7+
88
#import "QCloudLogManager.h"
9+
910
#import <QCloudCore/QCloudCore.h>
10-
#import "QCloudLogTableViewController.h"
11+
#if TARGET_OS_IOS
12+
#import<UIKit/UIKit.h>
13+
14+
15+
@interface QCloudLogDetailViewController : UIViewController
16+
- (instancetype) initWithLogPath:(NSString *)logPath LogContent:(NSString *)logContent;
17+
@property (nonatomic, strong) NSString *logContent;
18+
@property (nonatomic, strong) NSString *logPath;
19+
@property (nonatomic, strong) UITextView *textView;
20+
@end
21+
22+
@implementation QCloudLogDetailViewController
23+
24+
- (void)viewDidLoad {
25+
[super viewDidLoad];
26+
UIBarButtonItem *barButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"发送" style:UIBarButtonItemStylePlain target:self action:@selector(onHandleShareLog)];
27+
self.navigationItem.rightBarButtonItem = barButtonItem;
28+
self.textView = [[UITextView alloc] initWithFrame:self.view.frame];
29+
[self.view addSubview:self.textView];
30+
}
31+
32+
- (instancetype) initWithLogPath:(NSString *)logPath LogContent:(NSString *)logContent {
33+
self = [super init];
34+
self.logContent = logContent;
35+
self.logPath = logPath;
36+
return self;
37+
}
38+
39+
- (void)onHandleShareLog {
40+
NSURL *url = [NSURL fileURLWithPath:self.logPath];
41+
NSArray *activityItems = @[url];
42+
UIActivityViewController *activityVC = [[UIActivityViewController alloc]initWithActivityItems:activityItems applicationActivities:nil];
43+
[self presentViewController:activityVC animated:YES completion:nil];
44+
45+
46+
}
47+
48+
- (void) viewDidAppear:(BOOL)animated {
49+
[super viewDidAppear:animated];
50+
self.textView.text = self.logContent;
51+
}
52+
53+
54+
55+
@end
56+
@interface QCloudLogTableViewController : UIViewController <UITableViewDelegate,UITableViewDataSource>
57+
@property (nonatomic, strong) UITableView *tableView;
58+
@property (nonatomic, strong) NSArray *logsDirecotryArray;
59+
- (instancetype) initWithLog:(NSArray *)logContent;
60+
@end
61+
62+
@implementation QCloudLogTableViewController
63+
64+
- (void)viewDidLoad {
65+
[super viewDidLoad];
66+
self.tableView = [[UITableView alloc] initWithFrame:self.view.bounds];
67+
self.tableView.delegate = self;
68+
self.tableView.dataSource = self;
69+
[self.view addSubview:self.tableView];
70+
}
71+
72+
- (void) viewDidAppear:(BOOL)animated {
73+
[super viewDidAppear:animated];
74+
[self.tableView reloadData];
75+
}
76+
77+
78+
- (instancetype)initWithLog:(NSArray *)logContent {
79+
self = [super init];
80+
self.logsDirecotryArray = logContent;
81+
return self;
82+
}
83+
84+
#pragma mark - TableViewDelegate
85+
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
86+
return 1;
87+
}
88+
89+
- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
90+
return self.logsDirecotryArray.count;
91+
}
92+
93+
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
94+
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"reuse-cell"];
95+
if (cell == nil) {
96+
cell = [[UITableViewCell alloc] init];
97+
}
98+
cell.textLabel.text = self.logsDirecotryArray[indexPath.row];
99+
return cell;
100+
}
101+
102+
- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
103+
[tableView deselectRowAtIndexPath:indexPath animated:YES];
104+
// shoud detail view
105+
NSString * logPath = [[QCloudLogger sharedLogger].logDirctoryPath stringByAppendingPathComponent:self.logsDirecotryArray[indexPath.row]];
106+
NSData *logData = [[NSFileManager defaultManager] contentsAtPath:logPath];
107+
NSString *logContent = [[NSString alloc] initWithData:logData encoding:NSUTF8StringEncoding];
108+
QCloudLogDetailViewController *viewController = [[QCloudLogDetailViewController alloc] initWithLogPath:logPath LogContent:logContent];
109+
[self.navigationController pushViewController:viewController animated:YES];
110+
}
111+
112+
@end
113+
114+
11115
@implementation QCloudLogManager
12116
+ (instancetype) sharedInstance {
13117
static QCloudLogManager *instance;
@@ -30,7 +134,7 @@ - (void)dealloc {
30134
}
31135
- (void) onHandleAppBecomeActive :(NSNotification *)notification {
32136
if ([self shouldShowLogs]) {
33-
[UIPasteboard generalPasteboard].string = @"";
137+
[UIPasteboard generalPasteboard].string = @"";
34138
[self showLogs];
35139
}
36140
}
@@ -94,4 +198,5 @@ - (UIViewController *)currentViewController {
94198
}
95199

96200
@end
201+
97202
#endif

QCloudCOSXML/Classes/Base/QCloudLogTableViewController.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

QCloudCOSXML/Classes/Base/QCloudLogTableViewController.m

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)