This commit is contained in:
wu736139669
2015-06-05 17:16:50 +08:00
parent 326d5a5645
commit 68d4ee5791
3 changed files with 38 additions and 44 deletions
@@ -1737,7 +1737,7 @@
moduleName = "Ash_AWord" moduleName = "Ash_AWord"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Main/NoteViewController.m" urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Main/NoteViewController.m"
timestampString = "455187536.087896" timestampString = "455188451.593269"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "274" startingLineNumber = "274"
@@ -1752,7 +1752,7 @@
moduleName = "Ash_AWord" moduleName = "Ash_AWord"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Main/NoteViewController.m" urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Main/NoteViewController.m"
timestampString = "455187536.088105" timestampString = "455188451.59343"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "274" startingLineNumber = "274"
@@ -2089,11 +2089,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Tool/UIImageView+Reloading.m" filePath = "Ash_AWord/Utility/Tool/UIImageView+Reloading.m"
timestampString = "455184836.765948" timestampString = "455188181.165459"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "223" startingLineNumber = "228"
endingLineNumber = "223" endingLineNumber = "228"
landmarkName = "-reloadImageURL" landmarkName = "-reloadImageURL"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@@ -2146,22 +2146,6 @@
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.m"
timestampString = "455186870.912233"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "422"
endingLineNumber = "422"
landmarkName = "-view:singleTapDetected:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
@@ -2181,46 +2165,46 @@
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Tool/UIImageView+Reloading.m" filePath = "Ash_AWord/Utility/Tool/UIImageView+Reloading.m"
timestampString = "455187141.673951" timestampString = "455188181.165459"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "241" startingLineNumber = "246"
endingLineNumber = "241" endingLineNumber = "246"
landmarkName = "-reloadImageURL" landmarkName = "-reloadImageURL"
landmarkType = "5"> landmarkType = "5">
<Locations> <Locations>
<Location <Location
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__33-[UIImageView(SY) reloadImageURL]_block_invoke122" symbolName = "__33-[UIImageView(SY) reloadImageURL]_block_invoke131"
moduleName = "Ash_AWord" moduleName = "Ash_AWord"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/Utility/Tool/UIImageView+Reloading.m" urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/Utility/Tool/UIImageView+Reloading.m"
timestampString = "455187536.104458" timestampString = "455188451.603758"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "241" startingLineNumber = "246"
endingLineNumber = "241" endingLineNumber = "246"
offsetFromSymbolStart = "27"> offsetFromSymbolStart = "27">
</Location> </Location>
<Location <Location
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
symbolName = "__33-[UIImageView(SY) reloadImageURL]_block_invoke122" symbolName = "__33-[UIImageView(SY) reloadImageURL]_block_invoke131"
moduleName = "Ash_AWord" moduleName = "Ash_AWord"
usesParentBreakpointCondition = "Yes" usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/Utility/Tool/UIImageView+Reloading.m" urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/Utility/Tool/UIImageView+Reloading.m"
timestampString = "455187536.104893" timestampString = "455188451.60398"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "241" startingLineNumber = "246"
endingLineNumber = "241" endingLineNumber = "246"
offsetFromSymbolStart = "34"> offsetFromSymbolStart = "34">
</Location> </Location>
</Locations> </Locations>
@@ -2233,11 +2217,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Tool/UIImageView+Reloading.m" filePath = "Ash_AWord/Utility/Tool/UIImageView+Reloading.m"
timestampString = "455187738.062961" timestampString = "455188412.22173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "322" startingLineNumber = "332"
endingLineNumber = "322" endingLineNumber = "332"
landmarkName = "-sy_handleTapEvent:" landmarkName = "-sy_handleTapEvent:"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
+15 -5
View File
@@ -68,16 +68,21 @@ static char imageOriginalModelKey;
progressView.frame = self.bounds; progressView.frame = self.bounds;
progressView.hidden = YES; progressView.hidden = YES;
progressView.backgroundColor = [UIColor clearColor]; 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 setTitle:@"图片加载中" forState:UIControlStateDisabled];
progressView.titleLabel.shadowColor = [UIColor whiteColor]; progressView.titleLabel.shadowColor = [UIColor whiteColor];
progressView.titleLabel.shadowOffset = CGSizeMake(1, 1); progressView.titleLabel.shadowOffset = CGSizeMake(1, 1);
[progressView setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal]; [progressView setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
[progressView setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled]; [progressView setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];
progressView.titleLabel.adjustsFontSizeToFitWidth = YES; progressView.titleLabel.adjustsFontSizeToFitWidth = YES;
// CGSize size = CGSizeMake(progressView.frame.size.width,2000); CGSize size = CGSizeMake(progressView.frame.size.width,2000);
// CGSize labelsize = [progressView.titleLabel.text sizeWithFont:progressView.titleLabel.font constrainedToSize:size lineBreakMode:NSLineBreakByCharWrapping]; 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); 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.center = CGPointMake(self.bounds.size.width/2, self.bounds.size.height/2);
[progressView addTarget:self action:@selector(reloadImageURL) forControlEvents:UIControlEventTouchUpInside]; [progressView addTarget:self action:@selector(reloadImageURL) forControlEvents:UIControlEventTouchUpInside];
progressView.enabled = NO; progressView.enabled = NO;
@@ -242,7 +247,12 @@ static char imageOriginalModelKey;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
// [pv.titleLabel setText:[NSString stringWithFormat:@"图片加载中%.1f %%",pvalue*100]]; // [pv.titleLabel setText:[NSString stringWithFormat:@"图片加载中%.1f %%",pvalue*100]];
pv.center = CGPointMake(self.bounds.size.width/2, self.bounds.size.height/2); 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; pv.hidden = NO;
}); });
+1 -1
View File
@@ -63,7 +63,7 @@
<action selector="shareBtnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="nYN-ew-TWw"/> <action selector="shareBtnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="nYN-ew-TWw"/>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kWq-q0-MPl"> <button hidden="YES" opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kWq-q0-MPl">
<rect key="frame" x="8" y="71" width="304" height="139"/> <rect key="frame" x="8" y="71" width="304" height="139"/>
<state key="normal"> <state key="normal">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>