Skip to content

Commit f50bdeb

Browse files
committed
项目内冒泡 & 图片压缩
1 parent 341d991 commit f50bdeb

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

Coding_iOS/Controllers/TweetDetailViewController.m

+5-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ - (void)viewDidLoad
5151
{
5252
[super viewDidLoad];
5353
// 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+
}
5758
// 添加myTableView
5859
_myTableView = ({
5960
UITableView *tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain];
@@ -175,6 +176,7 @@ - (void)refreshTweet{
175176
[[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_curTweet.project andBlock:^(id data, NSError *error) {
176177
if (data) {
177178
weakSelf.curTweet.project = data;
179+
weakSelf.title = weakSelf.curTweet.project.name;
178180
weakSelf.curTweet.project_id = [(Project *)data id];
179181
[weakSelf refreshTweet];
180182
}else{

Coding_iOS/Controllers/UserOrProjectTweetsViewController.m

+1
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
330330
}
331331

332332
- (void)goToDetailWithTweet:(Tweet *)curTweet{
333+
curTweet.project = _curTweets.curPro;
333334
TweetDetailViewController *vc = [[TweetDetailViewController alloc] init];
334335
vc.curTweet = curTweet;
335336
__weak typeof(self) weakSelf = self;

Coding_iOS/Models/Tweet.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ - (void)setSelectedAssetURLs:(NSMutableArray *)selectedAssetURLs{
336336
}
337337

338338
- (BOOL)isProjectTweet{
339-
return self.project_id != nil;
339+
return self.project_id != nil || _project != nil;
340340
}
341341
- (void)addASelectedAssetURL:(NSURL *)assetURL{
342342
if (!_selectedAssetURLs) {
@@ -426,4 +426,4 @@ + (instancetype)tweetImageWithAssetURL:(NSURL *)assetURL andImage:(UIImage *)ima
426426
return tweetImg;
427427
}
428428

429-
@end
429+
@end

Coding_iOS/Util/OC_Category/UIImage+Common.m

+5-3
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,12 @@ + (UIImage *)imageWithFileType:(NSString *)fileType{
169169
}
170170

171171
- (NSData *)dataSmallerThan:(NSUInteger)dataLength{
172-
NSData *data = UIImageJPEGRepresentation(self, 1.0);
172+
CGFloat compressionQuality = 1.0;
173+
NSData *data = UIImageJPEGRepresentation(self, compressionQuality);
173174
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);
176178
}
177179
return data;
178180
}

0 commit comments

Comments
 (0)