diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 4404c64..1ead5c9 100644
--- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -1737,7 +1737,7 @@
moduleName = "Ash_AWord"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Main/NoteViewController.m"
- timestampString = "455187536.087896"
+ timestampString = "455188451.593269"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "274"
@@ -1752,7 +1752,7 @@
moduleName = "Ash_AWord"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Main/NoteViewController.m"
- timestampString = "455187536.088105"
+ timestampString = "455188451.59343"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "274"
@@ -2089,11 +2089,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Tool/UIImageView+Reloading.m"
- timestampString = "455184836.765948"
+ timestampString = "455188181.165459"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "223"
- endingLineNumber = "223"
+ startingLineNumber = "228"
+ endingLineNumber = "228"
landmarkName = "-reloadImageURL"
landmarkType = "5">
@@ -2146,22 +2146,6 @@
landmarkType = "5">
-
-
-
-
@@ -2233,11 +2217,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Tool/UIImageView+Reloading.m"
- timestampString = "455187738.062961"
+ timestampString = "455188412.22173"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "322"
- endingLineNumber = "322"
+ startingLineNumber = "332"
+ endingLineNumber = "332"
landmarkName = "-sy_handleTapEvent:"
landmarkType = "5">
diff --git a/Ash_AWord/Utility/Tool/UIImageView+Reloading.m b/Ash_AWord/Utility/Tool/UIImageView+Reloading.m
index bb7ea9d..388073c 100644
--- a/Ash_AWord/Utility/Tool/UIImageView+Reloading.m
+++ b/Ash_AWord/Utility/Tool/UIImageView+Reloading.m
@@ -68,16 +68,21 @@ static char imageOriginalModelKey;
progressView.frame = self.bounds;
progressView.hidden = YES;
progressView.backgroundColor = [UIColor clearColor];
- [progressView setTitle:@"点击加载图片" forState:UIControlStateNormal];
+
+ NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:@"点击重新加载图片"];
+ NSRange strRange = {0,[str length]};
+ [str addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:strRange];
+ [progressView setAttributedTitle:str forState:UIControlStateNormal];
+// [progressView setTitle:@"点击加载图片" forState:UIControlStateNormal];
[progressView setTitle:@"图片加载中" forState:UIControlStateDisabled];
progressView.titleLabel.shadowColor = [UIColor whiteColor];
progressView.titleLabel.shadowOffset = CGSizeMake(1, 1);
[progressView setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
[progressView setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];
progressView.titleLabel.adjustsFontSizeToFitWidth = YES;
-// CGSize size = CGSizeMake(progressView.frame.size.width,2000);
-// CGSize labelsize = [progressView.titleLabel.text sizeWithFont:progressView.titleLabel.font constrainedToSize:size lineBreakMode:NSLineBreakByCharWrapping];
-// progressView.frame = CGRectMake(0.0, 0.0, self.bounds.size.width, self.bounds.size.height);
+ CGSize size = CGSizeMake(progressView.frame.size.width,2000);
+ CGSize labelsize = [progressView.titleLabel.text sizeWithFont:progressView.titleLabel.font constrainedToSize:size lineBreakMode:NSLineBreakByCharWrapping];
+ progressView.frame = CGRectMake(0.0, 0.0, labelsize.width, labelsize.height);
progressView.center = CGPointMake(self.bounds.size.width/2, self.bounds.size.height/2);
[progressView addTarget:self action:@selector(reloadImageURL) forControlEvents:UIControlEventTouchUpInside];
progressView.enabled = NO;
@@ -242,7 +247,12 @@ static char imageOriginalModelKey;
dispatch_async(dispatch_get_main_queue(), ^{
// [pv.titleLabel setText:[NSString stringWithFormat:@"图片加载中%.1f %%",pvalue*100]];
pv.center = CGPointMake(self.bounds.size.width/2, self.bounds.size.height/2);
- [pv setTitle:[NSString stringWithFormat:@"图片加载中%.1f %%",pvalue*100] forState:UIControlStateDisabled];
+
+ NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"图片加载中%.1f %%",pvalue*100]];
+ NSRange strRange = {0,[str length]};
+ [str addAttribute:NSForegroundColorAttributeName value:[UIColor lightGrayColor] range:strRange];
+ [pv setAttributedTitle:str forState:UIControlStateDisabled];
+
pv.hidden = NO;
});
diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.xib b/Ash_AWord/Views/Note/NoteTableViewCell.xib
index d054c1b..6bbbd0a 100644
--- a/Ash_AWord/Views/Note/NoteTableViewCell.xib
+++ b/Ash_AWord/Views/Note/NoteTableViewCell.xib
@@ -63,7 +63,7 @@
-