Commit 1a474ed0 authored by admin's avatar admin

修复抽查任务中显示评论 功能页添加在线抽查按钮

parent bf00a47c
......@@ -95,6 +95,7 @@
8492216D1C5A014A00827AAC /* UIXToolbarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 849221581C5A014A00827AAC /* UIXToolbarView.m */; };
8492216E1C5A014A00827AAC /* ThumbsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8492215A1C5A014A00827AAC /* ThumbsViewController.m */; };
84945F1B1C2A6A6300C1793C /* AboutMeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84945F1A1C2A6A6300C1793C /* AboutMeViewController.m */; };
8495BEBC1C7AB54D004B59B0 /* LookOnLineDealIntroCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8495BEBB1C7AB54D004B59B0 /* LookOnLineDealIntroCell.m */; };
84970DEF1BD8DD8A00C1728A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 84970DEE1BD8DD8A00C1728A /* main.m */; };
84970DFA1BD8DD8A00C1728A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 84970DF91BD8DD8A00C1728A /* Assets.xcassets */; };
84970DFD1BD8DD8A00C1728A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84970DFB1BD8DD8A00C1728A /* LaunchScreen.storyboard */; };
......@@ -387,6 +388,8 @@
8492215A1C5A014A00827AAC /* ThumbsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThumbsViewController.m; sourceTree = "<group>"; };
84945F191C2A6A6300C1793C /* AboutMeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutMeViewController.h; sourceTree = "<group>"; };
84945F1A1C2A6A6300C1793C /* AboutMeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutMeViewController.m; sourceTree = "<group>"; };
8495BEBA1C7AB54D004B59B0 /* LookOnLineDealIntroCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LookOnLineDealIntroCell.h; sourceTree = "<group>"; };
8495BEBB1C7AB54D004B59B0 /* LookOnLineDealIntroCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LookOnLineDealIntroCell.m; sourceTree = "<group>"; };
84970DEA1BD8DD8A00C1728A /* redstar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = redstar.app; sourceTree = BUILT_PRODUCTS_DIR; };
84970DEE1BD8DD8A00C1728A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
84970DF91BD8DD8A00C1728A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
......@@ -1981,6 +1984,8 @@
84014A081C46384700E7963B /* LookOnLineDetailCell.m */,
84CDB2781C56272F009D3866 /* LookReportPicCell.h */,
84CDB2791C56272F009D3866 /* LookReportPicCell.m */,
8495BEBA1C7AB54D004B59B0 /* LookOnLineDealIntroCell.h */,
8495BEBB1C7AB54D004B59B0 /* LookOnLineDealIntroCell.m */,
);
path = Cell;
sourceTree = "<group>";
......@@ -2616,6 +2621,7 @@
8474C5831BE751A2007DCF19 /* CommonFunc.m in Sources */,
8492216C1C5A014A00827AAC /* UINavigationController+NavBarAnimation.m in Sources */,
849221611C5A014A00827AAC /* ReaderMainPagebar.m in Sources */,
8495BEBC1C7AB54D004B59B0 /* LookOnLineDealIntroCell.m in Sources */,
84DC873E1C24E90E00811037 /* AddPicTextTableViewCell.m in Sources */,
848699B31BDF810900859DFE /* InspectTaskViewController.m in Sources */,
84CC34D81C094682002F10E2 /* StandardTableViewCell.m in Sources */,
......
......@@ -2,16 +2,4 @@
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
scope = "0"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
......@@ -60,7 +60,7 @@
[self.pictureBtn setTitle:@"口碑标准" forState:UIControlStateNormal];
[self.questionBtn setTitle:@"问题知识" forState:UIControlStateNormal];
[self.rankBtn setTitle:@"口碑巡检" forState:UIControlStateNormal];
// [self.spotBtn setTitle:@"在线抽查" forState:UIControlStateNormal];
[self.spotBtn setTitle:@"在线抽查" forState:UIControlStateNormal];
//self.lineView.backgroundColor = kSeparateLineViewColor;
}
......
//
// LookOnLineDealIntroCell.h
// redstar
//
// Created by admin on 16/2/22.
// Copyright © 2016年 ZWF. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface LookOnLineDealIntroCell : UITableViewCell
@property (nonatomic, strong) UILabel *introLabel;
@property (nonatomic, strong) UITextView *contentTextView;
@property (nonatomic, strong) UILabel *placeholderLabel2;
@property (nonatomic, strong) UIImageView *backImageView1;
@property (nonatomic, strong) UILabel *commentLabel;
@end
//
// LookOnLineDealIntroCell.m
// redstar
//
// Created by admin on 16/2/22.
// Copyright © 2016年 ZWF. All rights reserved.
//
#import "LookOnLineDealIntroCell.h"
@interface LookOnLineDealIntroCell ()
@end
@implementation LookOnLineDealIntroCell
- (UILabel *)introLabel
{
if (!_introLabel) {
_introLabel = [[UILabel alloc] init];
_introLabel.translatesAutoresizingMaskIntoConstraints = NO;
_introLabel.font = [UIFont systemFontOfSize:15.0];
_introLabel.textColor = kLightBlack;
[self.contentView addSubview:_introLabel];
NSLayoutConstraint *contentTop = [NSLayoutConstraint constraintWithItem:_introLabel attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
[self.contentView addConstraint:contentTop];
NSLayoutConstraint *contentLeft = [NSLayoutConstraint constraintWithItem:_introLabel attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:20];
[self.contentView addConstraint:contentLeft];
NSLayoutConstraint *contentRight = [NSLayoutConstraint constraintWithItem:_introLabel attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeRight multiplier:1.0 constant:-20];
[self.contentView addConstraint:contentRight];
NSLayoutConstraint *contentHeight = [NSLayoutConstraint constraintWithItem:_introLabel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:30];
[self.contentView addConstraint:contentHeight];
}
return _introLabel;
}
- (UIImageView *)backImageView1
{
if (!_backImageView1) {
_backImageView1 = [[UIImageView alloc] init];
_backImageView1.userInteractionEnabled = YES;
_backImageView1.translatesAutoresizingMaskIntoConstraints = NO;
[self.contentView addSubview:_backImageView1];
NSLayoutConstraint *contentTop = [NSLayoutConstraint constraintWithItem:_backImageView1 attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.introLabel attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0];
[self.contentView addConstraint:contentTop];
NSLayoutConstraint *contentLeft = [NSLayoutConstraint constraintWithItem:_backImageView1 attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:20];
[self.contentView addConstraint:contentLeft];
NSLayoutConstraint *contentRight = [NSLayoutConstraint constraintWithItem:_backImageView1 attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeRight multiplier:1.0 constant:-20];
[self.contentView addConstraint:contentRight];
NSLayoutConstraint *contentHeight = [NSLayoutConstraint constraintWithItem:_backImageView1 attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:90];
[self.contentView addConstraint:contentHeight];
}
return _backImageView1;
}
- (UITextView *)contentTextView
{
if (!_contentTextView) {
_contentTextView = [[UITextView alloc] init];
_contentTextView.font = [UIFont systemFontOfSize:15.0];
_contentTextView.translatesAutoresizingMaskIntoConstraints = NO;
[self.backImageView1 addSubview:_contentTextView];
NSLayoutConstraint *contentTop = [NSLayoutConstraint constraintWithItem:_contentTextView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.backImageView1 attribute:NSLayoutAttributeTop multiplier:1.0 constant:1];
[self.backImageView1 addConstraint:contentTop];
NSLayoutConstraint *contentLeft = [NSLayoutConstraint constraintWithItem:_contentTextView attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.backImageView1 attribute:NSLayoutAttributeLeft multiplier:1.0 constant:1];
[self.backImageView1 addConstraint:contentLeft];
NSLayoutConstraint *contentRight = [NSLayoutConstraint constraintWithItem:_contentTextView attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.backImageView1 attribute:NSLayoutAttributeRight multiplier:1.0 constant:-1];
[self.backImageView1 addConstraint:contentRight];
NSLayoutConstraint *contentHeight = [NSLayoutConstraint constraintWithItem:_contentTextView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.backImageView1 attribute:NSLayoutAttributeBottom multiplier:1.0 constant:-1];
[self.backImageView1 addConstraint:contentHeight];
}
return _contentTextView;
}
- (UILabel *)commentLabel
{
if (!_commentLabel) {
_commentLabel = [[UILabel alloc] init];
_commentLabel.translatesAutoresizingMaskIntoConstraints = NO;
_commentLabel.font = [UIFont systemFontOfSize:15.0];
_commentLabel.textColor = kLightBlack;
[self.contentView addSubview:_commentLabel];
NSLayoutConstraint *contentTop = [NSLayoutConstraint constraintWithItem:_commentLabel attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.backImageView1 attribute:NSLayoutAttributeBottom multiplier:1.0 constant:5];
[self.contentView addConstraint:contentTop];
NSLayoutConstraint *contentLeft = [NSLayoutConstraint constraintWithItem:_commentLabel attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:20];
[self.contentView addConstraint:contentLeft];
NSLayoutConstraint *contentRight = [NSLayoutConstraint constraintWithItem:_commentLabel attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeRight multiplier:1.0 constant:-20];
[self.contentView addConstraint:contentRight];
NSLayoutConstraint *contentHeight = [NSLayoutConstraint constraintWithItem:_commentLabel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:30];
[self.contentView addConstraint:contentHeight];
NSLayoutConstraint *contentBottom = [NSLayoutConstraint constraintWithItem:_commentLabel attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:-2];
[self.contentView addConstraint:contentBottom];
}
return _commentLabel;
}
@end
......@@ -59,20 +59,22 @@
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
[dateFormatter setDateFormat:@"yyyy-MM-dd"];
// 当前时间
NSDate *date = [NSDate date];
NSString *strDate = [dateFormatter stringFromDate:date];
NSDate *today = [dateFormatter dateFromString:strDate];
// NSDate *date = [NSDate date];
// NSString *strDate = [dateFormatter stringFromDate:date];
// NSDate *today = [dateFormatter dateFromString:strDate];
NSDate *endTime = [dateFormatter dateFromString:[NSString stringWithFormat:@"%@", lookOnLine.endDate]];
NSCalendar *cal = [NSCalendar currentCalendar];
unsigned int unitFlags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit;
NSDateComponents *d = [cal components:unitFlags fromDate:today toDate:endTime options:0];
if (d.day > 0) {
self.dayLabel.text = [NSString stringWithFormat:@"%ld", (long)d.day];
} else {
self.dayLabel.text = @"0";
}
// NSCalendar *cal = [NSCalendar currentCalendar];
// unsigned int unitFlags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit;
// NSDateComponents *d = [cal components:unitFlags fromDate:today toDate:endTime options:0];
// if (d.day > 0) {
// self.dayLabel.text = [NSString stringWithFormat:@"%ld", (long)d.day];
// } else {
// self.dayLabel.text = @"0";
// }
NSString *endStr = [dateFormatter stringFromDate:endTime];
self.dayLabel.text = [self intervalSinceNow:endStr];
[self.pictureLabel setTitle:@"现场照片" forState:UIControlStateNormal];
self.lineView1.backgroundColor = kSeparateLineColor;
......@@ -80,6 +82,35 @@
}
- (NSString *)intervalSinceNow: (NSString *) theDate
{
NSArray *timeArray=[theDate componentsSeparatedByString:@"."];
theDate=[timeArray objectAtIndex:0];
NSDateFormatter *date=[[NSDateFormatter alloc] init];
[date setDateFormat:@"yyyy-MM-dd"];
NSDate *d=[date dateFromString:theDate];
NSTimeInterval late=[d timeIntervalSince1970]*1;
NSDate* dat = [NSDate date];
NSTimeInterval now=[dat timeIntervalSince1970]*1;
NSString *timeString=@"";
NSTimeInterval cha=late-now;
if (cha/86400>1) {
timeString = [NSString stringWithFormat:@"%f", cha/86400];
timeString = [timeString substringToIndex:timeString.length-7];
timeString=[NSString stringWithFormat:@"%@", timeString];
return timeString;
} else {
return @"0";
}
}
- (UILabel *)titleLabel
{
if (!_titleLabel) {
......
......@@ -21,16 +21,21 @@
#define kLookReportPicCell @"lookReportPicCell"
#import <UIButton+WebCache.h>
#import "LookOnLineDealIntroCell.h"
#define kLookOnLineDealIntroCell @"lookOnLineDealIntroCell"
#import "PictureCommentTableCell.h"
#define kPicCommentsTableCell @"kPictuCommentsTableViewCell"
@interface LookReportDetailViewController ()<UITableViewDelegate, UITableViewDataSource, UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIActionSheetDelegate, UITextViewDelegate>
@property (nonatomic, strong) UITableView *tableView;
@property (nonatomic, strong) LookOnLineFootView *footView;
@property (nonatomic, strong) UIView *footView;
@property (nonatomic, strong) UIActionSheet *selectActionSheet;
@property (nonatomic, strong) NSMutableArray *imageNameArray;
@property (nonatomic, assign) NSInteger rowNumber;
@property (nonatomic, strong) NSMutableArray *commentsArray;
@end
@implementation LookReportDetailViewController
......@@ -43,6 +48,14 @@
self.tableView.delegate = self;
self.tableView.dataSource = self;
self.commentsArray = [NSMutableArray array];
if (_lookOnLine.comments.count != 0) {
for (NSDictionary *commentDict in _lookOnLine.comments) {
[_commentsArray addObject:commentDict];
}
}
if (_lookOnLine.attachments.count == 0) {
self.imageNameArray = [NSMutableArray array];
......@@ -155,15 +168,20 @@
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 2;
return 4;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
if (section == 0) {
return 1;
} else {
} else if (section == 1) {
return _rowNumber;
} else if (section == 2) {
return 1;
} else {
return _commentsArray.count;
//return 1;
}
}
......@@ -179,7 +197,7 @@
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;
} else {
} else if (indexPath.section == 1) {
LookReportPicCell *cell = [tableView dequeueReusableCellWithIdentifier:kLookReportPicCell];
if (!cell) {
cell = [[LookReportPicCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kLookReportPicCell];
......@@ -214,6 +232,32 @@
cell.photoButton2.tag = 1118 + indexPath.row * 2 + 1;
}
return cell;
} else if (indexPath.section == 2) {
LookOnLineDealIntroCell *cell=[tableView dequeueReusableCellWithIdentifier:kLookOnLineDealIntroCell];
if (!cell) {
cell = [[LookOnLineDealIntroCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kLookOnLineDealIntroCell];
}
UIImage *image = [UIImage imageNamed:@"textbox"];
UIImage *resizingName = [image resizableImageWithCapInsets:UIEdgeInsetsMake(1, 1, 24, 24) resizingMode:UIImageResizingModeStretch];
cell.backImageView1.image = resizingName;
cell.introLabel.text = @"处理说明";
cell.contentTextView.text = [NSString stringWithFormat:@"%@", _lookOnLine.processNote];
cell.contentTextView.userInteractionEnabled = NO;
cell.commentLabel.text = @"评论";
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;
} else {
PictureCommentTableCell *cell=[tableView dequeueReusableCellWithIdentifier:kPicCommentsTableCell];
if (!cell) {
cell = [[PictureCommentTableCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kPicCommentsTableCell];
}
NSDictionary *commentDict = _commentsArray[indexPath.row];
cell.suggestLabel.text = [NSString stringWithFormat:@"%@", commentDict[@"comment"]];
cell.peopleLabel.text = [NSString stringWithFormat:@"%@", commentDict[@"commentor_name"]];
cell.dateLabel.text = [NSString stringWithFormat:@"%@", commentDict[@"commentTime"]];
return cell;
}
......@@ -261,19 +305,34 @@
return _tableView;
}
- (LookOnLineFootView *)footView
- (UIView *)footView
{
if (!_footView) {
_footView = [[LookOnLineFootView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 180)];
_footView.contentTextView.userInteractionEnabled = NO;
_footView.contentTextView.text = [NSString stringWithFormat:@"%@", _lookOnLine.processNote];
_footView.placeholderLabel2.hidden = YES;
_footView.backgroundColor = [UIColor whiteColor];
[_footView.resultButton setTitle:@"返回上一页" forState:UIControlStateNormal];
[_footView.resultButton addTarget:self action:@selector(reportRestult:) forControlEvents:UIControlEventTouchUpInside];
_footView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 55)];
UIButton * resultButton = [[UIButton alloc] init];
resultButton.backgroundColor = kNavigationBarColor;
resultButton.frame = CGRectMake(20, 10, kScreenWidth - 40, 35);
[resultButton setTitle:@"返回上一页" forState:UIControlStateNormal];
[resultButton addTarget:self action:@selector(reportRestult:) forControlEvents:UIControlEventTouchUpInside];
[_footView addSubview:resultButton];
}
return _footView;
}
//- (LookOnLineFootView *)footView
//{
// if (!_footView) {
// _footView = [[LookOnLineFootView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 180)];
// _footView.contentTextView.userInteractionEnabled = NO;
// _footView.contentTextView.text = [NSString stringWithFormat:@"%@", _lookOnLine.processNote];
// _footView.placeholderLabel2.hidden = YES;
// _footView.backgroundColor = [UIColor whiteColor];
// [_footView.resultButton setTitle:@"返回上一页" forState:UIControlStateNormal];
// [_footView.resultButton addTarget:self action:@selector(reportRestult:) forControlEvents:UIControlEventTouchUpInside];
// }
// return _footView;
//}
@end
......@@ -794,6 +794,7 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
nav = [[UINavigationController alloc] initWithRootViewController:lookOnLine];
}
} else if ([item.titleLabel.text isEqualToString:@"口碑巡检"]) {
InspectListViewController *inspectListVC = [[InspectListViewController alloc] init];
nav = [[UINavigationController alloc] initWithRootViewController:inspectListVC];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment