diff --git a/redstar.xcodeproj/project.pbxproj b/redstar.xcodeproj/project.pbxproj index e681677ca459f14dcdbd888369ff93316cf5644e..e8987ed7d9a3ebcdb818129c006511d3057b05e9 100644 --- a/redstar.xcodeproj/project.pbxproj +++ b/redstar.xcodeproj/project.pbxproj @@ -1694,6 +1694,7 @@ baseConfigurationReference = 6C6D8B0ECF8531E34D0DFF6B /* Pods.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_PREFIX_HEADER = "$(SRCROOT)/redstar/redstar.pch"; INFOPLIST_FILE = redstar/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 7.0; @@ -1708,6 +1709,7 @@ baseConfigurationReference = 13B0DDED3E0E584D79B395CF /* Pods.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_PREFIX_HEADER = "$(SRCROOT)/redstar/redstar.pch"; INFOPLIST_FILE = redstar/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 7.0; diff --git a/redstar.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/redstar.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate index d3bfe825fe15dfc19302ec5e8c6e54bdd9c9583d..6692c4970b5db9f4165e1fa058a19405c5448495 100644 Binary files a/redstar.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate and b/redstar.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/redstar/Classes/Macro/Url.h b/redstar/Classes/Macro/Url.h index 4d9ef221c125906c02b02a760ffc720626d0820d..f07dee35271cebed0163ef1f06a87e5c9bb9e584 100644 --- a/redstar/Classes/Macro/Url.h +++ b/redstar/Classes/Macro/Url.h @@ -18,6 +18,8 @@ // QuestionList #define kQuestionListURL @"redstar-server/rest/question/query" +#define kQuestionDetailURL @"redstar-server/rest/question/get/" + // InspectList获å–å£ç¢‘列表 #define kInspectListURL @"redstar-server/rest/praise/query" diff --git a/redstar/Classes/Module/Comment/View/CommentView.m b/redstar/Classes/Module/Comment/View/CommentView.m index e021e29fca3cef95b4a4ab4837a2db014d8be16f..25a34675187c69fdd9765911dc1dbaf78c115cba 100644 --- a/redstar/Classes/Module/Comment/View/CommentView.m +++ b/redstar/Classes/Module/Comment/View/CommentView.m @@ -273,7 +273,6 @@ // 设置圆角 _sureBtn.layer.cornerRadius = 4; - _sureBtn.layer.masksToBounds = YES; _sureBtn.translatesAutoresizingMaskIntoConstraints = NO; _sureBtn.backgroundColor = kLoginButtonBackGroundColor; [_sureBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; diff --git a/redstar/Classes/Module/Function/OnLine/View/OnLineFooterView.m b/redstar/Classes/Module/Function/OnLine/View/OnLineFooterView.m index 3cfdd87ff8bb78b88020fad7b3555d3160f7b5aa..b87232967e8247e87ce4918ad524245e8f1add79 100644 --- a/redstar/Classes/Module/Function/OnLine/View/OnLineFooterView.m +++ b/redstar/Classes/Module/Function/OnLine/View/OnLineFooterView.m @@ -268,7 +268,6 @@ _saveButton = [[UIButton alloc] init]; _saveButton.backgroundColor = kNavigationBarColor; _saveButton.layer.cornerRadius = 5; - _saveButton.layer.masksToBounds = YES; _saveButton.translatesAutoresizingMaskIntoConstraints = NO; [self addSubview:_saveButton]; diff --git a/redstar/Classes/Module/Function/Picture/PictureList/Cell/PictureTableCell.m b/redstar/Classes/Module/Function/Picture/PictureList/Cell/PictureTableCell.m index af5fc0764384f555a8f365e967e70f9d5612e78f..f2102f964b60b1f8698e94e4fffb9e43302ee57f 100644 --- a/redstar/Classes/Module/Function/Picture/PictureList/Cell/PictureTableCell.m +++ b/redstar/Classes/Module/Function/Picture/PictureList/Cell/PictureTableCell.m @@ -89,7 +89,6 @@ _hotLabel.textColor = [UIColor whiteColor]; _hotLabel.text = @"HOT"; _hotLabel.textAlignment = NSTextAlignmentCenter; - _hotLabel.layer.masksToBounds = YES; _hotLabel.layer.cornerRadius = 3; [self.contentView addSubview:_hotLabel]; diff --git a/redstar/Classes/Module/Function/Question/QuestionDetail/Cell/QuestionDescribeCell.m b/redstar/Classes/Module/Function/Question/QuestionDetail/Cell/QuestionDescribeCell.m index accfb80e5732917e5a5ab2062596227bc0436015..7d1c58269ca89e72c05f7564cf1c69f249939d5c 100644 --- a/redstar/Classes/Module/Function/Question/QuestionDetail/Cell/QuestionDescribeCell.m +++ b/redstar/Classes/Module/Function/Question/QuestionDetail/Cell/QuestionDescribeCell.m @@ -207,7 +207,6 @@ _feedbackBackView = [[UIView alloc] init]; _feedbackBackView.translatesAutoresizingMaskIntoConstraints = NO; _feedbackBackView.layer.cornerRadius = 5; - _feedbackBackView.layer.masksToBounds = YES; _feedbackBackView.layer.borderWidth = 1; _feedbackBackView.layer.borderColor = kQuestionFeedBackTitleCGColor; [self.contentView addSubview:_feedbackBackView]; diff --git a/redstar/Classes/Module/Function/Question/QuestionDetail/View/QuestionDetailFooterView.m b/redstar/Classes/Module/Function/Question/QuestionDetail/View/QuestionDetailFooterView.m index 9791d4a9017e9f421823995ef222283abf658fb2..3b72250449c60af8b7201cab0d55d0f62b8227b0 100644 --- a/redstar/Classes/Module/Function/Question/QuestionDetail/View/QuestionDetailFooterView.m +++ b/redstar/Classes/Module/Function/Question/QuestionDetail/View/QuestionDetailFooterView.m @@ -43,7 +43,6 @@ // 设置圆角 _addButon.layer.cornerRadius = 5; - _addButon.layer.masksToBounds = YES; _addButon.translatesAutoresizingMaskIntoConstraints = NO; _addButon.backgroundColor = kLoginButtonBackGroundColor; [_addButon setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; diff --git a/redstar/Classes/Module/Function/Question/QuestionDetail/ViewController/QuestionDetailViewController.m b/redstar/Classes/Module/Function/Question/QuestionDetail/ViewController/QuestionDetailViewController.m index fe48e5eb62568a3e24bfad18dc2c4c5f1c4c1725..0eeaf8d847580509b7bcfae754da3221c624688e 100644 --- a/redstar/Classes/Module/Function/Question/QuestionDetail/ViewController/QuestionDetailViewController.m +++ b/redstar/Classes/Module/Function/Question/QuestionDetail/ViewController/QuestionDetailViewController.m @@ -47,7 +47,8 @@ self.test3Array = [NSArray arrayWithObjects:@"2015-09-10 10:21:43", @"2015-10-27 11:21:43", nil]; - + // 问题详情 + [self requestQestionDetail]; } - (void)viewWillAppear:(BOOL)animated @@ -65,6 +66,20 @@ } #pragma mark - Private Methods +- (void)requestQestionDetail +{ + + NSDictionary *dict = [[NSUserDefaults standardUserDefaults] objectForKey:@"loginData"]; + NSString *user_uuid = dict[@"user_uuid"]; + + NSString *url = [NSString stringWithFormat:@"%@%@%@?userUuid=%@", kRedStarURL, kQuestionListURL, _question.uuid,user_uuid]; + + HttpClient *httpClient = [[HttpClient alloc] initWithUrl:url]; + [httpClient getQuestionDetailWithParameters:nil completion:^(id response, NSError *error) { + NSLog(@"response = %@", response); + }]; +} + - (void)setupNav { UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 40, 30)]; @@ -121,6 +136,7 @@ } +// æäº¤è¯„论 - (void)submitComment:(UIButton *)sender { NSNumber *count = [NSNumber numberWithInteger:_commentView.starBar.starNumber]; diff --git a/redstar/Classes/Module/Function/Question/QuestionList/Cell/QuestionListTableCell.m b/redstar/Classes/Module/Function/Question/QuestionList/Cell/QuestionListTableCell.m index 0f5b91e285138dcaaf2031cee7338b0f33b73f9c..460cdf9c4d8b3bac1b286de782159c4646550ab5 100644 --- a/redstar/Classes/Module/Function/Question/QuestionList/Cell/QuestionListTableCell.m +++ b/redstar/Classes/Module/Function/Question/QuestionList/Cell/QuestionListTableCell.m @@ -86,7 +86,6 @@ _hotLabel.textColor = [UIColor whiteColor]; _hotLabel.text = @"HOT"; _hotLabel.textAlignment = NSTextAlignmentCenter; - _hotLabel.layer.masksToBounds = YES; _hotLabel.layer.cornerRadius = 3; [self.contentView addSubview:_hotLabel]; diff --git a/redstar/Classes/Module/Function/Question/QuestionList/ViewController/QuestionViewController.m b/redstar/Classes/Module/Function/Question/QuestionList/ViewController/QuestionViewController.m index b72babec4d7c62fd8e561245a1f908ded6cb150b..757f2711688e60e2d5448c0fc5a35f094280a4ae 100644 --- a/redstar/Classes/Module/Function/Question/QuestionList/ViewController/QuestionViewController.m +++ b/redstar/Classes/Module/Function/Question/QuestionList/ViewController/QuestionViewController.m @@ -94,13 +94,20 @@ self.allQuestionArray = [NSMutableArray array]; // è¯·æ±‚åœ°å€ NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL]; - + NSDictionary *dict = [[NSUserDefaults standardUserDefaults] objectForKey:@"loginData"]; + NSString *user_uuid = dict[@"user_uuid"]; // è¯·æ±‚å‚æ•° - NSDictionary *parameters = @{@"user":@"5a74170150b940ae0150b940f8450083", + NSDictionary *parameters = @{@"user":user_uuid, @"scope":@"all", + @"group":@"", @"category":@"", - @"type":@"" - //,@"state":@"resolved" + @"contentLike":@"", + @"keyword":@"", + @"state":@"created", + @"submitTimeFrom":@"", + @"submitTimeTo":@"", + @"pageNumber":@(1), + @"pageSize":@(10) }; // å‘起请求 @@ -114,6 +121,7 @@ NSDictionary *dataDict = (NSDictionary *)response[@"data"]; NSDictionary *recordsDict = (NSDictionary *)dataDict[@"records"]; NSLog(@"问题与知识列表recods = %@", recordsDict); + NSLog(@"error = %@", error); for (NSDictionary *questionDict in recordsDict) { QuestionModel *question = [[QuestionModel alloc] init]; [question setValuesForKeysWithDictionary:questionDict]; diff --git a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/InspectDetailFooterView.m b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/InspectDetailFooterView.m index 99540e529872add2a1920006d870b27f6738e0ac..3b7221293c2c488284cbb0bee606151be6cc1629 100644 --- a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/InspectDetailFooterView.m +++ b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/InspectDetailFooterView.m @@ -190,7 +190,6 @@ _reportBtn.titleLabel.font = [UIFont systemFontOfSize:20.0]; _reportBtn.backgroundColor = kNavigationBarColor; _reportBtn.layer.cornerRadius = 5.0; - _reportBtn.layer.masksToBounds = YES; [_reportBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [self addSubview:_reportBtn]; } diff --git a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/TakePhotoView.h b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/TakePhotoView.h index aaea4bb1aca60308bde679cf547b4eabe60e189f..125154563299370a72d7eb2dc87a8350cf0169e0 100644 --- a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/TakePhotoView.h +++ b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/TakePhotoView.h @@ -27,5 +27,6 @@ @property (nonatomic, strong) id <TakePhotoDelegate>delegate; - (BOOL)deleClose:(UIButton *)btn; - +- (UIButton *)createButtonWithImage:(id)imageNameOrImage andSeletor : (SEL)selector; +- (void)changeOld:(UIButton *)btn; @end diff --git a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/TakePhotoView.m b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/TakePhotoView.m index 0526027d420009d9afd2462cc8f36cde9e0a30e8..9bfe86cc8bcafdfa522131ed38e361535c479752 100644 --- a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/TakePhotoView.m +++ b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/View/TakePhotoView.m @@ -124,7 +124,7 @@ // é•¿æŒ‰æ·»åŠ åˆ é™¤æŒ‰é’® -- (void)longPress : (UIGestureRecognizer *)gester +- (void)longPress:(UIGestureRecognizer *)gester { if (gester.state == UIGestureRecognizerStateBegan) { @@ -196,13 +196,28 @@ } } +- (void)saveImage:(UIImage *)currentImage { + + + + + +// NSLog(@"newPath = %@", newPath); +// // NSMutableArray *arr = [[NSMutableArray alloc] init]; +// //把图片转æ¢ä¸ºBase64çš„å—符串 +// NSData *data = UIImageJPEGRepresentation(currentImage, 0.4); +// NSString *base64Str = [data base64EncodedStringWithOptions:0]; +//// [arr addObject:image64]; +// //写入plist文件as +// [base64Str writeToFile:newPath atomically:NO]; +} + #pragma mark - UIImagePickerController ä»£ç†æ–¹æ³• --(void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info +- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage]; //UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage]; - if (editTag == -1) { // 创建一个新的控件 UIButton *btn = [self createButtonWithImage:image andSeletor:@selector(changeOld:)]; @@ -211,11 +226,16 @@ [self.images addObject:image]; if (self.subviews.count - 1 == MaxImageCount) { [[self.subviews lastObject] setHidden:YES]; - } - } - else - { + + //èŽ·å–æ²™ç›’路径, + NSString *path_sandox = NSHomeDirectory(); + //创建一个å˜å‚¨plist文件的路径 + NSString *newPath = [path_sandox stringByAppendingPathComponent:@"/Documents/pic.plist"]; + + + + } else { // æ ¹æ®tag修改需è¦ç¼–辑的控件 UIButton *btn = (UIButton *)[self viewWithTag:editTag]; int index = (int)[self.images indexOfObject:[btn imageForState:UIControlStateNormal]]; diff --git a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectSettleViewController.m b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectSettleViewController.m index 9a40a3af987d70a3e21ed2c4b6ff6a771430a974..eaf2aac5ae7a17fc68ff90fa7a7a0e9dbe5992ba 100644 --- a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectSettleViewController.m +++ b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectSettleViewController.m @@ -13,7 +13,6 @@ #import "CheckPicViewController.h" #import "HttpClient.h" - #define kInspectSettleCell @"InspectSettleCell" @interface InspectSettleViewController () <UITableViewDelegate, UITableViewDataSource, TakePhotoDelegate> @@ -44,6 +43,7 @@ [self.tableView registerClass:[InspectSettleCell class] forCellReuseIdentifier:kInspectSettleCell]; + self.tableView.tableFooterView = self.footerView; self.footerView.takePhotoView.delegate = self; @@ -102,6 +102,7 @@ // cell显示的内容 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + InspectSettleCell *cell=[tableView dequeueReusableCellWithIdentifier:kInspectSettleCell]; if (!cell) { cell = [[InspectSettleCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kInspectSettleCell]; @@ -111,7 +112,6 @@ cell.introLabel.text = @"å‚考说明"; cell.introDetailLabel.text = @"å—ä½“ä»¥ç®€ä½“ä¸æ–‡ä¸ºä¸»ï¼›å†…容贴近活动主题;悬挂牢固,以ä¸å½±å“顾客æµè§ˆä½“验为佳"; return cell; - } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath @@ -119,11 +119,6 @@ } -//// cell的高度 -//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath -//{ -// return 200; -//} // section高度 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section @@ -148,7 +143,7 @@ _tableView.showsVerticalScrollIndicator = NO; _tableView.showsHorizontalScrollIndicator = NO; _tableView.rowHeight = UITableViewAutomaticDimension; - _tableView.estimatedRowHeight = 150.0; + _tableView.estimatedRowHeight = 200.0; [self.view addSubview:_tableView]; NSLayoutConstraint *tableTop = [NSLayoutConstraint constraintWithItem:_tableView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeTop multiplier:1.0 constant:0]; diff --git a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/Cell/InspectListCell.m b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/Cell/InspectListCell.m index b342c0f592e8ae1557023d0bbd10ad6e09729165..043b3928a6ad7a534a3b89e564bbfbd48e1557a6 100644 --- a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/Cell/InspectListCell.m +++ b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/Cell/InspectListCell.m @@ -58,6 +58,10 @@ self.multiplier = (CGFloat)taskList.reportCount / taskList.questionCount; } + if (self.multiplier > 1) { + self.multiplier = 1.0; + } + UIImage *image = [UIImage imageNamed:@"progress-bar"]; image = [image resizableImageWithCapInsets:UIEdgeInsetsZero resizingMode:UIImageResizingModeTile]; self.alreadyView.image = image; @@ -260,8 +264,8 @@ _allView = [[UIView alloc] init]; _allView.translatesAutoresizingMaskIntoConstraints = NO; _allView.layer.cornerRadius = 3; - _allView.layer.masksToBounds = YES; _allView.layer.borderWidth = 1; + _allView.layer.masksToBounds = YES; _allView.layer.borderColor = kUsernameBorderColor; [self.contentView addSubview:_allView]; @@ -300,7 +304,7 @@ NSLayoutConstraint *overDateBottom = [NSLayoutConstraint constraintWithItem:_alreadyView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.allView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:-1]; [self.allView addConstraint:overDateBottom]; - NSLayoutConstraint *overDatewidth = [NSLayoutConstraint constraintWithItem:_alreadyView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:self.allView attribute:NSLayoutAttributeWidth multiplier:_multiplier constant:0]; + NSLayoutConstraint *overDatewidth = [NSLayoutConstraint constraintWithItem:_alreadyView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:self.allView attribute:NSLayoutAttributeWidth multiplier:_multiplier constant:-1]; [self.allView addConstraint:overDatewidth]; } diff --git a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/ViewController/InspectListViewController.m b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/ViewController/InspectListViewController.m index 21c9e23b3eb723e92c0ddb9a556c73d4e8521e5f..3ce77fa3808a206912b1126de4c1a9fafc10be2f 100644 --- a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/ViewController/InspectListViewController.m +++ b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectList/ViewController/InspectListViewController.m @@ -50,6 +50,8 @@ { [super viewDidLoad]; + self.view.backgroundColor = [UIColor whiteColor]; + UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 40, 30)]; [customLab setTextColor:[UIColor whiteColor]]; [customLab setText:@"巡检列表"]; diff --git a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectTask/ViewController/InspectTaskViewController.m b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectTask/ViewController/InspectTaskViewController.m index 5c795ee162f1e3a1b6fe0333f130be5715bca973..366b0d7e3ccbeb867bcf3006d717165ae9f83dee 100644 --- a/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectTask/ViewController/InspectTaskViewController.m +++ b/redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectTask/ViewController/InspectTaskViewController.m @@ -19,6 +19,7 @@ #import "HttpClient.h" #import "TaskDetailModel.h" +#import <MBProgressHUD.h> #define kTaskSortCell @"InspectTaskSortCell" @@ -94,7 +95,7 @@ HttpClient *httpClient = [[HttpClient alloc] initWithUrl:url]; __block InspectTaskViewController *weakSelf = self; - + [MBProgressHUD showHUDAddedTo:self.view animated:YES]; [httpClient getPraiseDetailWithParameters:nil completion:^(id response, NSError *error) { NSLog(@"å£ç¢‘巡检明细PraiseDetail = %@", response); NSDictionary *dataDict = response[@"data"]; @@ -114,6 +115,8 @@ self.tableView.delegate = self; self.tableView.dataSource = self; + [MBProgressHUD hideHUDForView:self.view animated:YES]; + }]; } diff --git a/redstar/Classes/Module/Login/View/LoginView.m b/redstar/Classes/Module/Login/View/LoginView.m index 136b1071d6ce3912058c4f4ebec979952985507e..24d1ef891409606a8eff131d9bb5032c6fee7d9c 100644 --- a/redstar/Classes/Module/Login/View/LoginView.m +++ b/redstar/Classes/Module/Login/View/LoginView.m @@ -156,7 +156,6 @@ _usernameView = [[UIView alloc] init]; } _usernameView.layer.cornerRadius = 5; - _usernameView.layer.masksToBounds = YES; _usernameView.layer.borderWidth = 1; _usernameView.layer.borderColor = kUsernameBorderColor; _usernameView.translatesAutoresizingMaskIntoConstraints = NO; @@ -187,7 +186,6 @@ _passwordView = [[UIView alloc] init]; } _passwordView.layer.cornerRadius = 5; - _passwordView.layer.masksToBounds = YES; _passwordView.layer.borderWidth = 1; _passwordView.layer.borderColor = kPasswordBorderColor; _passwordView.translatesAutoresizingMaskIntoConstraints = NO; @@ -385,7 +383,6 @@ } // 设置圆角 _loginButton.layer.cornerRadius = 5; - _loginButton.layer.masksToBounds = YES; _loginButton.translatesAutoresizingMaskIntoConstraints = NO; _loginButton.backgroundColor = kLoginButtonBackGroundColor; [_loginButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; diff --git a/redstar/Classes/Module/Login/ViewController/LoginViewController.m b/redstar/Classes/Module/Login/ViewController/LoginViewController.m index f17a195c72dc5b510a9e51db705b63aa5291ce13..6f8cb5030723d6e00c695ec978be06b58a8f08f4 100644 --- a/redstar/Classes/Module/Login/ViewController/LoginViewController.m +++ b/redstar/Classes/Module/Login/ViewController/LoginViewController.m @@ -128,6 +128,7 @@ UIWindow *window = [[UIApplication sharedApplication].windows lastObject]; [MBProgressHUD showHUDAddedTo:window animated:YES]; [httpClient loginWithUsername:self.loginView.usernameTextFiled.text password:self.loginView.passwordTextFiled.text completion:^(id response, NSError *error) { + NSLog(@"response = %@, error = %@", response, error); if ([response[@"message"] isEqualToString:@"ok"]) { // ä¿å˜ç™»é™†ä¿¡æ¯ diff --git a/redstar/Classes/Module/Mine/View/MineTableFooterView.m b/redstar/Classes/Module/Mine/View/MineTableFooterView.m index d177387da5021c19551bc6decc6f94ec41dda67b..947940f7a89adaf4292c600762352ac9fbabac81 100644 --- a/redstar/Classes/Module/Mine/View/MineTableFooterView.m +++ b/redstar/Classes/Module/Mine/View/MineTableFooterView.m @@ -34,7 +34,6 @@ } _quitButton.titleLabel.font = [UIFont systemFontOfSize:19.0]; _quitButton.translatesAutoresizingMaskIntoConstraints = NO; - _quitButton.layer.masksToBounds = YES; _quitButton.layer.cornerRadius = 5.0; [_quitButton setTitle:@"退出登录" forState:UIControlStateNormal]; [self addSubview:_quitButton]; diff --git a/redstar/Classes/Tools/HttpClient/HttpClient.h b/redstar/Classes/Tools/HttpClient/HttpClient.h index 1bde25472ba25fdbeea87624901ce8c88355f45a..cbff5c6215bb29ecf3ea1d0603113eadce088698 100644 --- a/redstar/Classes/Tools/HttpClient/HttpClient.h +++ b/redstar/Classes/Tools/HttpClient/HttpClient.h @@ -25,6 +25,9 @@ typedef void (^completionBlock) (id response, NSError *error); // 获å–问题列表 - (void)getQuestionListWithParameters:(id)parameters completion:(completionBlock)completion; +// 获å–问题详情 +- (void)getQuestionDetailWithParameters:(id)parameters completion:(completionBlock)completion; + // 获å–巡检列表 - (void)getInspectListWithParameters:(id)parameters completion:(completionBlock)completion; diff --git a/redstar/Classes/Tools/HttpClient/HttpClient.m b/redstar/Classes/Tools/HttpClient/HttpClient.m index af7afb1705a99823bc8639278306799cc913d591..94b061f5b5fb866ac62e24242813a8f3e0df9c5a 100644 --- a/redstar/Classes/Tools/HttpClient/HttpClient.m +++ b/redstar/Classes/Tools/HttpClient/HttpClient.m @@ -115,6 +115,15 @@ }]; } +- (void)getQuestionDetailWithParameters:(id)parameters completion:(completionBlock)completion +{ + [self getParameters:parameters completion:^(id response, NSError *error) { + if (completion) { + completion (response, error); + } + }]; +} + // 获å–巡检列表 - (void)getInspectListWithParameters:(id)parameters completion:(completionBlock)completion {