diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index f63328d..06b08c9 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -185,6 +185,8 @@ A99AA12C1ADCCB3C00574B12 /* MessagePublihViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A99AA1291ADCCB3C00574B12 /* MessagePublihViewModel.m */; }; A99AA12D1ADCCB3C00574B12 /* MessageViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A99AA12B1ADCCB3C00574B12 /* MessageViewModel.m */; }; A99AA12F1ADD028400574B12 /* Icon120.png in Resources */ = {isa = PBXBuildFile; fileRef = A99AA12E1ADD028400574B12 /* Icon120.png */; }; + A9B4A9541AEDC3620017C655 /* FeedbackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B4A9521AEDC3620017C655 /* FeedbackViewController.m */; }; + A9B4A9551AEDC3620017C655 /* FeedbackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9B4A9531AEDC3620017C655 /* FeedbackViewController.xib */; }; A9B4E39F1AC9908E00A1DBDF /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9B4E39C1AC9908E00A1DBDF /* libMobClickLibrary.a */; }; A9BE23BF1ACD8CA20032171A /* libSocialSina.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BE23BD1ACD8CA20032171A /* libSocialSina.a */; }; A9E2711B1ADB97ED000B1542 /* Default-568h.png in Resources */ = {isa = PBXBuildFile; fileRef = A9E271191ADB97ED000B1542 /* Default-568h.png */; }; @@ -471,6 +473,9 @@ A99AA12A1ADCCB3C00574B12 /* MessageViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageViewModel.h; sourceTree = ""; }; A99AA12B1ADCCB3C00574B12 /* MessageViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageViewModel.m; sourceTree = ""; }; A99AA12E1ADD028400574B12 /* Icon120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon120.png; sourceTree = ""; }; + A9B4A9511AEDC3620017C655 /* FeedbackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedbackViewController.h; sourceTree = ""; }; + A9B4A9521AEDC3620017C655 /* FeedbackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedbackViewController.m; sourceTree = ""; }; + A9B4A9531AEDC3620017C655 /* FeedbackViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FeedbackViewController.xib; sourceTree = ""; }; A9B4E39C1AC9908E00A1DBDF /* libMobClickLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMobClickLibrary.a; sourceTree = ""; }; A9B4E39D1AC9908E00A1DBDF /* MobClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClick.h; sourceTree = ""; }; A9B4E39E1AC9908E00A1DBDF /* MobClickSocialAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClickSocialAnalytics.h; sourceTree = ""; }; @@ -620,6 +625,9 @@ A98536881AEBDDAB000312BF /* ModifyPassWordViewController.h */, A98536891AEBDDAB000312BF /* ModifyPassWordViewController.m */, A985368A1AEBDDAB000312BF /* ModifyPassWordViewController.xib */, + A9B4A9511AEDC3620017C655 /* FeedbackViewController.h */, + A9B4A9521AEDC3620017C655 /* FeedbackViewController.m */, + A9B4A9531AEDC3620017C655 /* FeedbackViewController.xib */, ); path = My; sourceTree = ""; @@ -1284,6 +1292,7 @@ A97DBE481ACAE7F600705682 /* smalliconWeixin@2x.png in Resources */, A97DBE441ACAE61400705682 /* first-login-qq@2x.png in Resources */, A9FAD42D1AC923E2007ADC10 /* MessageViewController.xib in Resources */, + A9B4A9551AEDC3620017C655 /* FeedbackViewController.xib in Resources */, A98F986C1ACA2FA9007C4594 /* BaseRefreshViewController.xib in Resources */, A955109D1AC39E6A0006D16F /* Images.xcassets in Resources */, A97DBE4C1ACAEBE300705682 /* first-login-sina@2x.png in Resources */, @@ -1453,6 +1462,7 @@ A98D659D1AD37F18008668EE /* MessageTableViewCell.m in Sources */, A96862711ACCF13300DDAA6B /* PSTCollectionViewController.m in Sources */, A96862431ACCF0B400DDAA6B /* MWCaptionView.m in Sources */, + A9B4A9541AEDC3620017C655 /* FeedbackViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; 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 89055fe..251f1f8 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -282,11 +282,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/SetUpViewController.m" - timestampString = "451665615.942671" + timestampString = "451790257.979938" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "85" - endingLineNumber = "85" + startingLineNumber = "86" + endingLineNumber = "86" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -1586,5 +1586,37 @@ landmarkType = "5"> + + + + + + + + diff --git a/Ash_AWord/ViewControllers/My/FeedbackViewController.h b/Ash_AWord/ViewControllers/My/FeedbackViewController.h new file mode 100644 index 0000000..e3acd3f --- /dev/null +++ b/Ash_AWord/ViewControllers/My/FeedbackViewController.h @@ -0,0 +1,16 @@ +// +// FeedbackViewController.h +// Ash_AWord +// +// Created by xmfish on 15/4/27. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import +#import "UIPlaceHolderTextView.h" + +@interface FeedbackViewController : UIViewController +@property (weak, nonatomic) IBOutlet UIPlaceHolderTextView *contentTextView; +- (IBAction)completeBtnClick:(id)sender; + +@end diff --git a/Ash_AWord/ViewControllers/My/FeedbackViewController.m b/Ash_AWord/ViewControllers/My/FeedbackViewController.m new file mode 100644 index 0000000..bc973dc --- /dev/null +++ b/Ash_AWord/ViewControllers/My/FeedbackViewController.m @@ -0,0 +1,67 @@ +// +// FeedbackViewController.m +// Ash_AWord +// +// Created by xmfish on 15/4/27. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import "FeedbackViewController.h" + +@interface FeedbackViewController () + +@end + +@implementation FeedbackViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + self.navigationItem.title = @"意见反馈"; + [self customViewDidLoad]; + _contentTextView.placeholder = @"感谢您提出宝贵的意见"; + _contentTextView.delegate = self; + + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"确定" style:UIBarButtonItemStyleDone target:self action:@selector(completeBtnClick:)]; + + UITapGestureRecognizer *singleRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTap:)]; + singleRecognizer.numberOfTapsRequired = 1; + [self.view addGestureRecognizer:singleRecognizer]; +} +-(void)singleTap:(UITapGestureRecognizer*)recognizer +{ + [self.view endEditing:YES]; +} + +//当用户按下return键或者按回车键，keyboard消失 + +-(BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text +{ + if ([text isEqualToString:@"\n"]) { + [textView resignFirstResponder]; + + } + return YES; + +} +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +- (IBAction)completeBtnClick:(id)sender { + if(_contentTextView.text.length <= 0){ + [MBProgressHUD errorHudWithView:nil label:@"请输入内容" hidesAfter:1.0]; + } +} +@end diff --git a/Ash_AWord/ViewControllers/My/FeedbackViewController.xib b/Ash_AWord/ViewControllers/My/FeedbackViewController.xib new file mode 100644 index 0000000..0f33198 --- /dev/null +++ b/Ash_AWord/ViewControllers/My/FeedbackViewController.xib @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m index 3840ede..306389a 100644 --- a/Ash_AWord/ViewControllers/My/SetUpViewController.m +++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m @@ -11,6 +11,7 @@ #import "UMSocial.h" #import "ModifyPassWordViewController.h" #import "AppDelegate.h" +#import "FeedbackViewController.h" @interface SetUpViewController () @end @@ -34,8 +35,8 @@ -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { if([AWordUser sharedInstance].isLogin) - return 7; - return 6; + return 8; + return 7; } -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { @@ -110,13 +111,15 @@ break; case 5: - cell.textLabel.text = @"用户须知"; + cell.textLabel.text = @"意见反馈"; break; case 6: cell.textLabel.text = @"密码修改"; break; - + case 7: + cell.textLabel.text = @"用户须知"; + break; default: break; } @@ -143,17 +146,25 @@ [self goToAppraisal]; break; case 5: - [self showUserNotice]; + [self goFeedback]; break; case 6: [self modifyPsw]; break; + case 7: + [self showUserNotice]; + break; default: break; } } #pragma mark 跳到App Store评价 +-(void)goFeedback +{ + FeedbackViewController* feedbackViewController = [[FeedbackViewController alloc] init]; + [self.navigationController pushViewController:feedbackViewController animated:YES]; +} -(void)modifyPsw { ModifyPassWordViewController* modifyPassWordViewController = [[ModifyPassWordViewController alloc] init];