File tree 4 files changed +13
-8
lines changed
4 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -51,9 +51,10 @@ - (void)viewDidLoad
51
51
{
52
52
[super viewDidLoad ];
53
53
// Do any additional setup after loading the view.
54
- self.title = @" 冒泡详情" ;
55
- [self .navigationItem setRightBarButtonItem: [[UIBarButtonItem alloc ] initWithImage: [UIImage imageNamed: @" share_Nav" ] style: UIBarButtonItemStylePlain target: self action: @selector (rightNavBtnClicked )] animated: NO ];
56
-
54
+ self.title = self.curTweet .project .name ?: @" 冒泡详情" ;
55
+ if (![_curTweet isProjectTweet ]) {
56
+ [self .navigationItem setRightBarButtonItem: [[UIBarButtonItem alloc ] initWithImage: [UIImage imageNamed: @" share_Nav" ] style: UIBarButtonItemStylePlain target: self action: @selector (rightNavBtnClicked )] animated: NO ];
57
+ }
57
58
// 添加myTableView
58
59
_myTableView = ({
59
60
UITableView *tableView = [[UITableView alloc ] initWithFrame: self .view.bounds style: UITableViewStylePlain];
@@ -175,6 +176,7 @@ - (void)refreshTweet{
175
176
[[Coding_NetAPIManager sharedManager ] request_ProjectDetail_WithObj: _curTweet.project andBlock: ^(id data, NSError *error) {
176
177
if (data) {
177
178
weakSelf.curTweet .project = data;
179
+ weakSelf.title = weakSelf.curTweet .project .name ;
178
180
weakSelf.curTweet .project_id = [(Project *)data id ];
179
181
[weakSelf refreshTweet ];
180
182
}else {
Original file line number Diff line number Diff line change @@ -330,6 +330,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
330
330
}
331
331
332
332
- (void )goToDetailWithTweet : (Tweet *)curTweet {
333
+ curTweet.project = _curTweets.curPro ;
333
334
TweetDetailViewController *vc = [[TweetDetailViewController alloc ] init ];
334
335
vc.curTweet = curTweet;
335
336
__weak typeof (self) weakSelf = self;
Original file line number Diff line number Diff line change @@ -336,7 +336,7 @@ - (void)setSelectedAssetURLs:(NSMutableArray *)selectedAssetURLs{
336
336
}
337
337
338
338
- (BOOL )isProjectTweet {
339
- return self.project_id != nil ;
339
+ return self.project_id != nil || _project != nil ;
340
340
}
341
341
- (void )addASelectedAssetURL : (NSURL *)assetURL {
342
342
if (!_selectedAssetURLs) {
@@ -426,4 +426,4 @@ + (instancetype)tweetImageWithAssetURL:(NSURL *)assetURL andImage:(UIImage *)ima
426
426
return tweetImg;
427
427
}
428
428
429
- @end
429
+ @end
Original file line number Diff line number Diff line change @@ -169,10 +169,12 @@ + (UIImage *)imageWithFileType:(NSString *)fileType{
169
169
}
170
170
171
171
- (NSData *)dataSmallerThan : (NSUInteger )dataLength {
172
- NSData *data = UIImageJPEGRepresentation (self, 1.0 );
172
+ CGFloat compressionQuality = 1.0 ;
173
+ NSData *data = UIImageJPEGRepresentation (self, compressionQuality);
173
174
while (data.length > dataLength) {
174
- UIImage *image = [UIImage imageWithData: data];
175
- data = UIImageJPEGRepresentation (image, 0.7 );
175
+ CGFloat mSize = data.length / (1024 * 1000.0 );
176
+ compressionQuality *= pow (0.7 , log (mSize)/ log (3 ));// 大概每压缩 0.7,mSize 会缩小为原来的三分之一
177
+ data = UIImageJPEGRepresentation (self, compressionQuality);
176
178
}
177
179
return data;
178
180
}
You can’t perform that action at this time.
0 commit comments