diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index 06b08c9..6e3b2f0 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -57,7 +57,6 @@ A95510981AC39E6A0006D16F /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A95510971AC39E6A0006D16F /* ViewController.m */; }; A955109B1AC39E6A0006D16F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A95510991AC39E6A0006D16F /* Main.storyboard */; }; A955109D1AC39E6A0006D16F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A955109C1AC39E6A0006D16F /* Images.xcassets */; }; - A95510A01AC39E6A0006D16F /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = A955109E1AC39E6A0006D16F /* LaunchScreen.xib */; }; A9617A4F1ACC0D0F0024AE4A /* NoteViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A9617A4E1ACC0D0F0024AE4A /* NoteViewModel.m */; }; A9617A541ACC27860024AE4A /* SetUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9617A521ACC27860024AE4A /* SetUpViewController.m */; }; A9617A551ACC27860024AE4A /* SetUpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9617A531ACC27860024AE4A /* SetUpViewController.xib */; }; @@ -262,7 +261,6 @@ A95510971AC39E6A0006D16F /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; A955109A1AC39E6A0006D16F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; A955109C1AC39E6A0006D16F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - A955109F1AC39E6A0006D16F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; A95510AA1AC39E6A0006D16F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A95510AB1AC39E6A0006D16F /* Ash_AWordTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Ash_AWordTests.m; sourceTree = ""; }; A9617A4D1ACC0D0F0024AE4A /* NoteViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoteViewModel.h; sourceTree = ""; }; @@ -574,7 +572,6 @@ A95510971AC39E6A0006D16F /* ViewController.m */, A95510991AC39E6A0006D16F /* Main.storyboard */, A955109C1AC39E6A0006D16F /* Images.xcassets */, - A955109E1AC39E6A0006D16F /* LaunchScreen.xib */, A955108F1AC39E6A0006D16F /* Supporting Files */, ); path = Ash_AWord; @@ -1285,7 +1282,6 @@ A98F98541ACA29B5007C4594 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, A9617A591ACC2EBC0024AE4A /* mine-setting-icon@2x.png in Resources */, A968627C1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png in Resources */, - A95510A01AC39E6A0006D16F /* LaunchScreen.xib in Resources */, A93442041ACA981D00A6B233 /* Default@2x.png in Resources */, A97DBE401ACAE29E00705682 /* Icon@2x.png in Resources */, A90BA00A1AD6060600728393 /* playButtonPause@2x.png in Resources */, @@ -1477,14 +1473,6 @@ name = Main.storyboard; sourceTree = ""; }; - A955109E1AC39E6A0006D16F /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - A955109F1AC39E6A0006D16F /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; A97C54E41AC933AD0038818A /* UMSocialLocalizable.strings */ = { isa = PBXVariantGroup; children = ( 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 607fd2b..68b7e98 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -729,11 +729,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Pods/MBProgressHUD/MBProgressHUD.m" - timestampString = "450601701.478428" + timestampString = "451831263.244579" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "634" - endingLineNumber = "634" + startingLineNumber = "635" + endingLineNumber = "635" landmarkName = "-drawRect:" landmarkType = "5"> diff --git a/Ash_AWord/Base.lproj/LaunchScreen.xib b/Ash_AWord/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 103db8f..0000000 --- a/Ash_AWord/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ash_AWord/Base.lproj/Main.storyboard b/Ash_AWord/Base.lproj/Main.storyboard index d912f9d..deb4f36 100644 --- a/Ash_AWord/Base.lproj/Main.storyboard +++ b/Ash_AWord/Base.lproj/Main.storyboard @@ -1,13 +1,14 @@ - + - + + - + diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist index 09aa447..dbbe30d 100644 --- a/Ash_AWord/Info.plist +++ b/Ash_AWord/Info.plist @@ -65,8 +65,6 @@ 4 LSRequiresIPhoneOS - UILaunchStoryboardName - LaunchScreen UIMainStoryboardFile Main UIRequiredDeviceCapabilities diff --git a/Ash_AWord/Vender/MBProgressHUD/MBProgressHUD+Util.m b/Ash_AWord/Vender/MBProgressHUD/MBProgressHUD+Util.m index ac92760..7d18173 100644 --- a/Ash_AWord/Vender/MBProgressHUD/MBProgressHUD+Util.m +++ b/Ash_AWord/Vender/MBProgressHUD/MBProgressHUD+Util.m @@ -40,6 +40,11 @@ static MBProgressHUD *activityHUD = nil; HUD.customView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"errormark"]]; HUD.mode = MBProgressHUDModeCustomView; HUD.labelText = msg; + if (msg.length > 12) { +// HUD.labelFont = [UIFont boldSystemFontOfSize:13]; + } + + [HUD show:YES]; [HUD hide:YES afterDelay:delay]; } diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.m b/Ash_AWord/ViewControllers/Login/LoginViewController.m index d317147..1f6af50 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.m +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.m @@ -174,7 +174,7 @@ }]; [[NSNotificationCenter defaultCenter] postNotificationName:kLoginSuccessNotificationName object:nil]; }else{ - [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:loginViewModel.errMessage hidesAfter:2.0]; } } failedBlock:^(NSError *error) { [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; diff --git a/Ash_AWord/ViewControllers/Login/OurLoginViewController.m b/Ash_AWord/ViewControllers/Login/OurLoginViewController.m index aa6af0e..b84f782 100644 --- a/Ash_AWord/ViewControllers/Login/OurLoginViewController.m +++ b/Ash_AWord/ViewControllers/Login/OurLoginViewController.m @@ -114,7 +114,7 @@ }else{ - [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:loginViewModel.errMessage hidesAfter:2.0]; } diff --git a/Ash_AWord/ViewControllers/Login/RegistInfoViewController.m b/Ash_AWord/ViewControllers/Login/RegistInfoViewController.m index 28c4043..a0a0266 100644 --- a/Ash_AWord/ViewControllers/Login/RegistInfoViewController.m +++ b/Ash_AWord/ViewControllers/Login/RegistInfoViewController.m @@ -166,7 +166,7 @@ }else{ - [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:loginViewModel.errMessage hidesAfter:2.0]; } diff --git a/Ash_AWord/ViewControllers/Main/ReportViewController.m b/Ash_AWord/ViewControllers/Main/ReportViewController.m index ffceb13..1c1c389 100644 --- a/Ash_AWord/ViewControllers/Main/ReportViewController.m +++ b/Ash_AWord/ViewControllers/Main/ReportViewController.m @@ -54,7 +54,7 @@ }else{ - [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:loginViewModel.errMessage hidesAfter:1.0]; } } failedBlock:^(NSError *error) { diff --git a/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m b/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m index 8d41894..1331f4d 100644 --- a/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m +++ b/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m @@ -91,7 +91,7 @@ [MBProgressHUD errorHudWithView:self.view label:messagePublihViewModel.errMessage hidesAfter:1.0]; } } failedBlock:^(NSError *error) { - [MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:2.0]; }]; } diff --git a/Ash_AWord/ViewControllers/My/FeedbackViewController.m b/Ash_AWord/ViewControllers/My/FeedbackViewController.m index fc90409..460a573 100644 --- a/Ash_AWord/ViewControllers/My/FeedbackViewController.m +++ b/Ash_AWord/ViewControllers/My/FeedbackViewController.m @@ -73,7 +73,7 @@ if ([loginViewModel success]) { [[NSNotificationCenter defaultCenter] postNotificationName:kLoginSuccessNotificationName object:nil]; - [MBProgressHUD checkHudWithView:nil label:@"举报成功" hidesAfter:1.0]; + [MBProgressHUD checkHudWithView:nil label:@"反馈成功" hidesAfter:1.0]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC*1.0), dispatch_get_main_queue(), ^{ [self.navigationController popViewControllerAnimated:YES]; }); @@ -81,7 +81,7 @@ }else{ [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; - [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:loginViewModel.errMessage hidesAfter:1.0]; } } failedBlock:^(NSError *error) { diff --git a/Ash_AWord/ViewControllers/My/ModifyPassWordViewController.m b/Ash_AWord/ViewControllers/My/ModifyPassWordViewController.m index 631fa7f..1fe9ffd 100644 --- a/Ash_AWord/ViewControllers/My/ModifyPassWordViewController.m +++ b/Ash_AWord/ViewControllers/My/ModifyPassWordViewController.m @@ -114,7 +114,7 @@ }else{ - [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:loginViewModel.errMessage hidesAfter:1.0]; } diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m index 8517a5e..6e855c7 100644 --- a/Ash_AWord/ViewControllers/My/SetUpViewController.m +++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m @@ -37,7 +37,7 @@ { if([AWordUser sharedInstance].isLogin && [AWordUser sharedInstance].loginType==1) return 8; - return 7; + return 6; } -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { @@ -111,14 +111,14 @@ cell.textLabel.text = @"欢迎打5星好评"; break; case 5: - - cell.textLabel.text = @"意见反馈"; - - break; - - case 6: cell.textLabel.text = @"服务条款"; break; + case 6: + + cell.textLabel.text = @"意见反馈"; + break; + + case 7: cell.textLabel.text = @"密码修改"; break; @@ -148,11 +148,12 @@ [self goToAppraisal]; break; case 5: - [self goFeedback]; - break; - case 6: [self showUserNotice]; break; + case 6: + [self goFeedback]; + break; + case 7: [self modifyPsw]; break; diff --git a/Ash_AWord/ViewControllers/My/SetUserInfoViewController.m b/Ash_AWord/ViewControllers/My/SetUserInfoViewController.m index ffc5dae..de925fc 100644 --- a/Ash_AWord/ViewControllers/My/SetUserInfoViewController.m +++ b/Ash_AWord/ViewControllers/My/SetUserInfoViewController.m @@ -161,7 +161,7 @@ }else{ - [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:loginViewModel.errMessage hidesAfter:1.0]; } diff --git a/Ash_AWord/ViewControllers/Note/NotePublishViewController.m b/Ash_AWord/ViewControllers/Note/NotePublishViewController.m index 3deabfc..6b6d297 100644 --- a/Ash_AWord/ViewControllers/Note/NotePublishViewController.m +++ b/Ash_AWord/ViewControllers/Note/NotePublishViewController.m @@ -63,7 +63,7 @@ [MBProgressHUD errorHudWithView:self.view label:notePublishViewModel.errMessage hidesAfter:1.0]; } } failedBlock:^(NSError *error) { - [MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0]; + [MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:2.0]; }]; } diff --git a/Pods/MBProgressHUD/MBProgressHUD.m b/Pods/MBProgressHUD/MBProgressHUD.m index ab086c6..549cb66 100644 --- a/Pods/MBProgressHUD/MBProgressHUD.m +++ b/Pods/MBProgressHUD/MBProgressHUD.m @@ -448,9 +448,10 @@ static const CGFloat kDetailsLabelFontSize = 12.f; - (void)setupLabels { label = [[UILabel alloc] initWithFrame:self.bounds]; - label.adjustsFontSizeToFitWidth = NO; + label.adjustsFontSizeToFitWidth = YES; label.textAlignment = MBLabelAlignmentCenter; label.opaque = NO; + label.numberOfLines = 0; label.backgroundColor = [UIColor clearColor]; label.textColor = self.labelColor; label.font = self.labelFont;