Skip to content

T
total
Commit 9b6a90b1 authored by Sandy's avatar Sandy
Browse files
Options

no message

parent 07989fcf
Show whitespace changes
Inline Side-by-side
Showing with 549 additions and 482 deletions
total/GTOApp/Business/Pioneering/GTONewAddPioneeringViewController.m
View file @ 9b6a90b1
......@@ -6,47 +6,47 @@
// Copyright (c) 2015年 free. All rights reserved.
//
#import "GTOAlertInfoPioneeringViewController.h"
#import "GTONewAddPioneeringViewController.h"
#import "GXFTableViewCell.h"
#import "GXFBottomView.h"
#import "GTOPioneeringTemplateViewController.h"
#import "GTOPatrolTemplate.h"
#import "GTOPioneering.h"
#import "GTOSignViewController.h"
#import "GTOAlertInfoPioneeringViewController.h"
#import "GTOPioneeringTemplateViewController.h"
#import "GTOQuestionManager.h"
#import "GTOSignViewController.h"
#import "GXFBottomView.h"
#import "GXFTableViewCell.h"
#import "GTOQuestion.h"
#import "GTOAnswer.h"
#import "GTOQResultViewController.h"
#import "RETableViewManager.h"
#import "GTOQuestion.h"
#import "ICRPostAttachment.h"
#import "RETableViewManager.h"
#import <BaiduMapAPI/BMapKit.h>
@interface GTONewAddPioneeringViewController ()
<UITableViewDataSource,UITableViewDelegate,GXFBottomViewDelegate,
UITextFieldDelegate,GTOAlertInfoPioneeringViewControllerDelegate>
@interface GTONewAddPioneeringViewController () <
UITableViewDataSource, UITableViewDelegate, GXFBottomViewDelegate,
UITextFieldDelegate, GTOAlertInfoPioneeringViewControllerDelegate>
typedef NS_ENUM(NSUInteger, bottomTag) {
kbottomDelBtnsTag = 0,
kbottomBackBtnsTag
};
#define BOTTOM_TEXT_DELETE @"删除拓站"
#define BOTTOM_TEXT_BACK @"返回列表"
@property (nonatomic, strong) UITableView *c_tableView;
@property (nonatomic, strong) GTOPioneering *d_pioneering;
@property (nonatomic, strong) GTOPatrolTemplate *d_patrolTemplate;
@property (nonatomic, strong) GTOSignViewController *c_signVC;
@property (nonatomic, assign) BOOL isStartPioneering;//
@property (nonatomic, strong) GTOAlertInfoPioneeringViewController *alertInfoVC;
@property (strong, readwrite, nonatomic) RETableViewManager *manager;
@property (strong, readwrite, nonatomic) RETextItem *titleItem;
@property (strong, readwrite, nonatomic) RERadioItem *templeteSelectItem;
@property (strong, readwrite, nonatomic) RETextItem *locationItem;
@property (strong, readwrite, nonatomic) RETextItem *remarkItem;
@property (nonatomic, strong) BMKMapView *c_mapView;
@property (nonatomic, strong) GXFBottomView *bottomV;
@property(nonatomic, strong) UITableView *c_tableView;
@property(nonatomic, strong) GTOPioneering *d_pioneering;
@property(nonatomic, strong) GTOPatrolTemplate *d_patrolTemplate;
@property(nonatomic, strong) GTOSignViewController *c_signVC;
@property(nonatomic, assign) BOOL isStartPioneering; //
@property(nonatomic, strong) GTOAlertInfoPioneeringViewController *alertInfoVC;
@property(strong, readwrite, nonatomic) RETableViewManager *manager;
@property(strong, readwrite, nonatomic) RETextItem *titleItem;
@property(strong, readwrite, nonatomic) RERadioItem *templeteSelectItem;
@property(strong, readwrite, nonatomic) RETextItem *locationItem;
@property(strong, readwrite, nonatomic) RETextItem *remarkItem;
@property(nonatomic, strong) BMKMapView *c_mapView;
@property(nonatomic, strong) GXFBottomView *bottomV;
//重构
@property (nonatomic, strong) NSArray *d_arrCategorys; //问题按区域分
@property(nonatomic, strong) NSArray *d_arrCategorys; //问题按区域分
@end
@implementation GTONewAddPioneeringViewController
......@@ -58,7 +58,6 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
self.title = @"新增拓站";
[self p_initData];
[self p_initWithSubViews];
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
......@@ -67,30 +66,33 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
}
- (void)fetchLocalNoSubmittedPioneering {
ICRDatabaseFetchBlock fetchBlk = ^FMResultSet *(FMDatabase *db) {
NSString * sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE %@=?", [GTOPioneering TableName], @"state"];
NSLog(@"%@",sql);
NSString *sql =
[NSString stringWithFormat:@"SELECT * FROM %@ WHERE %@=?",
[GTOPioneering TableName], @"state"];
NSLog(@"%@", sql);
return [db executeQuery:sql,GTO_PIONEERING_STATE_LOCAL];
return [db executeQuery:sql, GTO_PIONEERING_STATE_LOCAL];
};
__weak typeof(self)weakSelf = self;
__weak typeof(self) weakSelf = self;
ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
__strong __typeof(weakSelf) strongSelf = weakSelf;
if (!fetchedObjects) {
if(_bottomV.tag == kbottomDelBtnsTag) {
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_BACK forState:UIControlStateNormal];
if (_bottomV.tag == kbottomDelBtnsTag) {
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_BACK
forState:UIControlStateNormal];
self.bottomV.tag = kbottomBackBtnsTag;
}
return ;
return;
}
if (!_d_pioneering) {
self.d_pioneering = [[GTOPioneering alloc]init];
self.d_pioneering = [[GTOPioneering alloc] init];
}
_d_pioneering = fetchedObjects[0];
// [strongSelf appearMap];
// [strongSelf appearMap];
//tableview
// tableview
_titleItem.value = _d_pioneering.title;
_templeteSelectItem.value = _d_pioneering.templateName;
_remarkItem.value = _d_pioneering.remark;
......@@ -99,13 +101,13 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
[_templeteSelectItem reloadRowWithAnimation:UITableViewRowAnimationNone];
[_remarkItem reloadRowWithAnimation:UITableViewRowAnimationNone];
_c_tableView.userInteractionEnabled = NO;
//bottomView
// bottomView
if (_bottomV.tag == kbottomBackBtnsTag) {
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_DELETE forState:UIControlStateNormal];
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_DELETE
forState:UIControlStateNormal];
self.bottomV.tag = kbottomDelBtnsTag;
}
[strongSelf p_addAlerInfoPioneeringView];
};
......@@ -115,53 +117,66 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
fetchResultsBlock:fetchResultsBlk];
}
- (void)appearMap {
BOOL condition = _c_signVC.latitudeX || _c_signVC.longitudeY
|| _d_pioneering.longitude || _d_pioneering.latitude;
if(condition) {
BOOL condition = _c_signVC.latitudeX || _c_signVC.longitudeY ||
_d_pioneering.longitude || _d_pioneering.latitude;
if (condition) {
_c_mapView.hidden = NO;
BMKPointAnnotation *pointAnnotation = [[BMKPointAnnotation alloc]init];
BMKPointAnnotation *pointAnnotation = [[BMKPointAnnotation alloc] init];
CLLocationCoordinate2D coor;
coor.latitude = [_c_signVC.latitudeX floatValue];//31.2357360000;//
coor.longitude = [_c_signVC.longitudeY floatValue];//121.5292150000;//
coor.latitude = [_c_signVC.latitudeX floatValue]; // 31.2357360000;//
coor.longitude = [_c_signVC.longitudeY floatValue]; // 121.5292150000;//
pointAnnotation.coordinate = coor;
[_c_mapView addAnnotation:pointAnnotation];
_c_mapView.showsUserLocation = YES;
_c_mapView.centerCoordinate = CLLocationCoordinate2DMake(coor.latitude, coor.longitude);
_c_mapView.centerCoordinate =
CLLocationCoordinate2DMake(coor.latitude, coor.longitude);
_c_mapView.zoomLevel = 17;
}
}
- (void)p_initData {
if (!_d_pioneering) {
self.d_pioneering = [[GTOPioneering alloc]init];
self.d_pioneering = [[GTOPioneering alloc] init];
}
}
- (void)p_initWithSubViews {
CGFloat signBtnW = 120;
UIButton *signBtn = [[UIButton alloc]initWithFrame:CGRectMake(self.view.width - signBtnW,0, signBtnW , 44)];
UIButton *signBtn = [[UIButton alloc]
initWithFrame:CGRectMake(self.view.width - signBtnW, 0, signBtnW, 44)];
signBtn.titleLabel.font = [UIFont systemFontOfSize:20];
[signBtn.titleLabel setTextAlignment:NSTextAlignmentRight];
[signBtn setTitle:@"记录位置" forState:UIControlStateNormal];
[signBtn setTitleColor:GTO_BLUE_TINT_COLOR forState:UIControlStateNormal];
// [signBtn setImage:[UIImage imageNamed:@"icon_nav_start"] forState:UIControlStateNormal];
[signBtn addTarget:self action:@selector(signClicked) forControlEvents:UIControlEventTouchUpInside];
// [signBtn setImage:[UIImage imageNamed:@"icon_nav_start"]
// forState:UIControlStateNormal];
[signBtn addTarget:self
action:@selector(signClicked)
forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:signBtn];
UIImageView *imgV = [[UIImageView alloc]initWithFrame:CGRectMake(self.view.width - signBtn.left - 44, signBtn.y, 44, signBtn.height)];
UIImageView *imgV = [[UIImageView alloc]
initWithFrame:CGRectMake(self.view.width - signBtn.left - 44, signBtn.y,
44, signBtn.height)];
imgV.image = [UIImage imageNamed:@"icon_nav_start"];
//table
self.c_tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, signBtn.bottom,ScreenSize.width, 44 * 3) style:(UITableViewStylePlain)];
// table
self.c_tableView = [[UITableView alloc]
initWithFrame:CGRectMake(0, signBtn.bottom, ScreenSize.width, 44 * 3)
style:(UITableViewStylePlain)];
[self.view addSubview:self.c_tableView];
self.manager = [[RETableViewManager alloc]initWithTableView:self.c_tableView];
self.manager =
[[RETableViewManager alloc] initWithTableView:self.c_tableView];
RETableViewSection *section = [RETableViewSection section];
[self.manager addSection:section];
self.titleItem = [RETextItem itemWithTitle:@"标题：" value:nil placeholder:@"请输入标题"];
self.templeteSelectItem = [RERadioItem itemWithTitle:@"拓站模板：" value:nil selectionHandler:^(RERadioItem *item) {
GTOPioneeringTemplateViewController *VC = [[GTOPioneeringTemplateViewController alloc]init];
self.titleItem =
[RETextItem itemWithTitle:@"标题：" value:nil
placeholder:@"请输入标题"];
self.templeteSelectItem =
[RERadioItem itemWithTitle:@"拓站模板："
value:nil
selectionHandler:^(RERadioItem *item) {
GTOPioneeringTemplateViewController *VC =
[[GTOPioneeringTemplateViewController alloc] init];
VC.purpose = @"explorer";
// if (VC.choseBaseInfo) {
VC.choseBaseInfo = ^(NSArray *templateNames) {
......@@ -173,57 +188,70 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
[self PushViewController:VC animated:YES];
}];
self.remarkItem = [RETextItem itemWithTitle:@"备注" value:nil placeholder:@"输入备注内容"];
self.remarkItem =
[RETextItem itemWithTitle:@"备注" value:nil
placeholder:@"输入备注内容"];
[section addItem:_titleItem];
[section addItem:_templeteSelectItem];
[section addItem:_remarkItem];
IBTUILabel *attentionLbl = [[IBTUILabel alloc]initWithFrame:CGRectMake(10, _c_tableView.bottom + 10, self.view.width, 20) text:@"注：开始拓站店前请先签到" font:[UIFont systemFontOfSize:16] tintColor:[UIColor blackColor] backgroundColor:nil textAlignment:NSTextAlignmentLeft];
IBTUILabel *attentionLbl =
[[IBTUILabel alloc] initWithFrame:CGRectMake(10, _c_tableView.bottom + 10,
self.view.width, 20)
text:@"注：开始拓站店前请先签到"
font:[UIFont systemFontOfSize:16]
tintColor:[UIColor blackColor]
backgroundColor:nil
textAlignment:NSTextAlignmentLeft];
[self.view addSubview:attentionLbl];
CGRect rect = CGRectMake(0,attentionLbl.bottom +20,self.view.width, self.view.height -( attentionLbl.bottom +20) - BottomViewHeight - 20 - 64);
self.c_mapView = [[BMKMapView alloc]initWithFrame:rect];
CGRect rect = CGRectMake(0, attentionLbl.bottom + 20, self.view.width,
self.view.height - (attentionLbl.bottom + 20) -
BottomViewHeight - 20 - 64);
self.c_mapView = [[BMKMapView alloc] initWithFrame:rect];
[self.view addSubview:_c_mapView];
_c_mapView.hidden= YES;
GXFBottomView *bottomV = [[GXFBottomView alloc]initWithFrame:CGRectMake(0, _c_mapView.bottom +20, self.view.width, BottomViewHeight) leftButtonColor:GTO_RED_COLOR rightButtonColor:GTO_BLUE_DEEP_COLOR LeftBtnTitle:@"返回列表"rightBtnTitle:@"开始拓站"];
_c_mapView.hidden = YES;
GXFBottomView *bottomV = [[GXFBottomView alloc]
initWithFrame:CGRectMake(0, _c_mapView.bottom + 20, self.view.width,
BottomViewHeight)
leftButtonColor:GTO_RED_COLOR
rightButtonColor:GTO_BLUE_DEEP_COLOR
LeftBtnTitle:@"返回列表"
rightBtnTitle:@"开始拓站"];
bottomV.delegate = self;
bottomV.tag = kbottomBackBtnsTag;
self.bottomV = bottomV;
[self.view addSubview:_bottomV];
}
- (void)p_pioneeringWithatrolTemplate: (GTOPatrolTemplate *)patrolTemple
{
- (void)p_pioneeringWithatrolTemplate:(GTOPatrolTemplate *)patrolTemple {
[self p_initData];
ICRUserUtil *userU = [ICRUserUtil sharedInstance];
self.d_pioneering.title = _titleItem.value;
self.d_pioneering.remark = _remarkItem.value;
self.d_pioneering.uuid = [userU mobileID];//patrolTemple.uuid;
self.d_pioneering.version = 0;//新建时为0
self.d_pioneering.uuid = [userU mobileID]; // patrolTemple.uuid;
self.d_pioneering.version = 0; //新建时为0
self.d_pioneering.state = GTO_PIONEERING_STATE_LOCAL;
self.d_pioneering.pioneer_uuid = userU.f_user_uuid;
self.d_pioneering.pioneer_name = userU.f_user_name;
self.d_pioneering.pioneer_code = userU.f_user_code;
self.d_pioneering.templateName = patrolTemple.name;
self.d_pioneering.beginDate = [[NSDate date]httpParameterString];
self.d_pioneering.beginDate = [[NSDate date] httpParameterString];
self.d_pioneering.enterprise = userU.f_enterprise_uuid;
self.d_pioneering.create_time = patrolTemple.create_time;//
self.d_pioneering.create_time = patrolTemple.create_time; //
self.d_pioneering.create_id = patrolTemple.create_id;
self.d_pioneering.create_operName = patrolTemple.create_operName;
self.d_pioneering.lastModify_time = patrolTemple.lastModify_time;
self.d_pioneering.lastModify_id = patrolTemple.lastModify_id;
self.d_pioneering.latitude = _c_signVC.latitudeX;//@"38.12"; //
self.d_pioneering.latitude = _c_signVC.latitudeX; //@"38.12"; //
self.d_pioneering.longitude = _c_signVC.longitudeY; //@"89.77"; //
self.d_pioneering.purpose = patrolTemple.purpose;
NSMutableArray *muArrQuestions = [NSMutableArray array];
for(NSDictionary *dictQuestion in patrolTemple.questions) {
for (NSDictionary *dictQuestion in patrolTemple.questions) {
GTOQuestion *question = [GTOQuestion DBObject];
[question praseFromJsonDict:dictQuestion];
question.uuid = [[ICRUserUtil sharedInstance] mobileID];
......@@ -231,28 +259,29 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
[question saveToDBWithHandleData:NULL complete:NULL fail:NULL];
[muArrQuestions addObject:[question dictForCommit]];
}
self.d_pioneering.questions = muArrQuestions;//patrolTemple.questions;//
self.d_pioneering.questions = muArrQuestions; // patrolTemple.questions;//
[self p_pioneeringDisplayResults];
}
- (void)p_savePioneering {
__weak typeof(self)weakSelf = self;
__weak typeof(self) weakSelf = self;
[_d_pioneering saveToDBWithHandleData:NULL
complete:^{
__strong __typeof(weakSelf)strongSelf = weakSelf;
__strong __typeof(weakSelf) strongSelf = weakSelf;
[IBTLoadingView hideHUDWithText:nil];
self.isStartPioneering = YES;
GTOAlertInfoPioneeringViewController *alertInfoVC = [[GTOAlertInfoPioneeringViewController alloc]initWithPioneering:_d_pioneering];
GTOAlertInfoPioneeringViewController *alertInfoVC =
[[GTOAlertInfoPioneeringViewController alloc]
initWithPioneering:_d_pioneering];
self.alertInfoVC = alertInfoVC;
alertInfoVC.delegate = self;
[[UIApplication sharedApplication].keyWindow addSubview:_alertInfoVC.view];
[[UIApplication sharedApplication]
.keyWindow addSubview:_alertInfoVC.view];
}
fail:^(NSError *error) {
[IBTLoadingView hideHUDWithText:error.localizedDescription];
}];
}
- (void)p_pioneeringDisplayResults {
//问题的分类
......@@ -261,19 +290,24 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
NSArray *arrQuestIDs = [_d_pioneering.questions valueForKeyPath:@"uuid"];
ICRDatabaseFetchBlock fetchBlk = ^FMResultSet *(FMDatabase *db) {
NSString * sql = [NSString stringWithFormat:@"SELECT DISTINCT category FROM %@ WHERE %@ IN %@ ORDER BY %@ ASC", [GTOQuestion TableName], @"uuid", [IBTModel ValuePlaceholdersWithCount:uiQuestionsCount], @"uuid"];
NSLog(@"%@",sql);//lineno没有，因为现在后台没有给问题排序
NSString *sql = [NSString
stringWithFormat:@"SELECT DISTINCT category FROM %@ WHERE %@ IN %@ "
@"ORDER BY %@ ASC",
[GTOQuestion TableName], @"uuid",
[IBTModel
ValuePlaceholdersWithCount:uiQuestionsCount],
@"uuid"];
NSLog(@"%@", sql); // lineno没有，因为现在后台没有给问题排序
return [db executeQuery:sql withArgumentsInArray:arrQuestIDs];
};
__weak typeof(self)weakSelf = self;
__weak typeof(self) weakSelf = self;
ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
__strong __typeof(weakSelf) strongSelf = weakSelf;
NSMutableArray *muArr = [NSMutableArray array];
for(GTOQuestion * question in fetchedObjects){
for (GTOQuestion *question in fetchedObjects) {
[muArr addObject:question.category];
}
strongSelf.d_arrCategorys = [NSArray arrayWithArray:muArr];
......@@ -286,43 +320,43 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
fetchResultsBlock:fetchResultsBlk];
}
//答案 （新建任务答案肯定是没有的，所以这个可以不写）
ICRDatabaseFetchBlock fetchBlk = ^FMResultSet *(FMDatabase *db) {
NSString * sql = [NSString stringWithFormat:@"SELECT * FROM %@ WHERE %@ = ?", [GTOAnswer TableName], @"pioneeringUuid"];
NSLog(@"%@",sql);//lineno没有，因为现在后台没有给问题排序
NSString *sql =
[NSString stringWithFormat:@"SELECT * FROM %@ WHERE %@ = ?",
[GTOAnswer TableName], @"pioneeringUuid"];
NSLog(@"%@", sql); // lineno没有，因为现在后台没有给问题排序
return [db executeQuery:sql,_d_pioneering.uuid];
return [db executeQuery:sql, _d_pioneering.uuid];
};
__weak typeof(self)weakSelf = self;
__weak typeof(self) weakSelf = self;
ICRDatabaseFetchResultsBlock fetchResultsBlk = ^(NSArray *fetchedObjects) {
__strong __typeof(weakSelf)strongSelf = weakSelf;
__strong __typeof(weakSelf) strongSelf = weakSelf;
NSMutableArray *muArrDisplayRs = [NSMutableArray array];
for( NSString *category in _d_arrCategorys){
for (NSString *category in _d_arrCategorys) {
//答案
GTODisplayResult *displayR = [[GTODisplayResult alloc]init];
GTODisplayResult *displayR = [[GTODisplayResult alloc] init];
NSMutableArray *muArrAnswers = [NSMutableArray array];
for(GTOAnswer *answer in fetchedObjects){
for (GTOAnswer *answer in fetchedObjects) {
if ([answer.category isEqualToString:category])
//[muArrAnswers addObject:answer];
[muArrAnswers addObject:[answer dictForCommit]];
}
//问题
NSMutableArray *muArrQuestions = [NSMutableArray array];
for(NSDictionary *dict in _d_pioneering.questions){
for (NSDictionary *dict in _d_pioneering.questions) {
if ([dict[@"category"] isEqualToString:category]) {
GTOQuestion *question = [GTOQuestion DBObject];
[question praseFromJsonDict:dict];
// question.uuid = [[ICRUserUtil sharedInstance] mobileID];//给所有问题分配唯一标识
// question.uuid = [[ICRUserUtil sharedInstance]
// mobileID];//给所有问题分配唯一标识
[muArrQuestions addObject:[question dictForCommit]];
}
}
displayR.arrAnswers = muArrAnswers;
......@@ -331,11 +365,9 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
displayR.arrQuestions = muArrQuestions;
// displayR.answerNumber = muArrAnswers.count;
// displayR.questionNumber = muArrQuestions.count;
// displayR.answerNumber = muArrAnswers.count;
// displayR.questionNumber = muArrQuestions.count;
[muArrDisplayRs addObject:[displayR dictForCommit]];
}
// strongSelf.d_arrDisplayResults = muArrDisplayRs;
strongSelf.d_pioneering.arrCategorys = _d_arrCategorys;
......@@ -345,32 +377,33 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
[_c_tableView reloadData];
};
ICRDataBaseController *dbCtrl = [ICRDataBaseController sharedController];
[dbCtrl runFetchForClass:[GTOAnswer class]
fetchBlock:fetchBlk
fetchResultsBlock:fetchResultsBlk];
}
- (void)p_addAlerInfoPioneeringView {
GTOAlertInfoPioneeringViewController *alertInfoVC = [[GTOAlertInfoPioneeringViewController alloc]initWithPioneering:_d_pioneering];
GTOAlertInfoPioneeringViewController *alertInfoVC =
[[GTOAlertInfoPioneeringViewController alloc]
initWithPioneering:_d_pioneering];
self.alertInfoVC = alertInfoVC;
alertInfoVC.delegate = self;
[[UIApplication sharedApplication].keyWindow addSubview:_alertInfoVC.view];
}
#pragma GXFBottomViewDelegate
- (void)bottomView:(GXFBottomView *)bottomView oneButtonClicked:(UIButton *)oneBtn {
- (void)bottomView:(GXFBottomView *)bottomView
oneButtonClicked:(UIButton *)oneBtn {
// if (!self.c_signVC || !self.c_signVC.latitudeX || !self.c_signVC.longitudeY) {
// [IBTLoadingView showTextOnly:@"开始拓站前，请先签到" inView:self.view];
// return;
// }
// if (!self.c_signVC || !self.c_signVC.latitudeX ||
// !self.c_signVC.longitudeY) {
// [IBTLoadingView showTextOnly:@"开始拓站前，请先签到"
// inView:self.view];
// return;
// }
if (!_titleItem.value || _titleItem.value.length <= 0 ) {
if (!_titleItem.value || _titleItem.value.length <= 0) {
[IBTLoadingView showTextOnly:@"请填写标题" inView:self.view];
return;
}
......@@ -379,7 +412,7 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
return;
}
// if (!_isStartPioneering) {//同一个界面点击创建拓站任务，只能创建一次
// if (!_isStartPioneering) {//同一个界面点击创建拓站任务，只能创建一次
if (!_d_pioneering.uuid) {
[self p_pioneeringWithatrolTemplate:_d_patrolTemplate];
......@@ -389,23 +422,26 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
}
_c_tableView.userInteractionEnabled = NO;
if (_bottomV.tag == kbottomBackBtnsTag) {
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_DELETE forState:UIControlStateNormal];
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_DELETE
forState:UIControlStateNormal];
self.bottomV.tag = kbottomDelBtnsTag;
}
}
- (void)bottomView:(GXFBottomView *)bottomView leftButtonClicked:(UIButton *)leftBtn {
- (void)bottomView:(GXFBottomView *)bottomView
leftButtonClicked:(UIButton *)leftBtn {
if (bottomView.tag == kbottomBackBtnsTag) {
[self PopViewControllerAnimated:YES];
return;
}
ICRDataBaseController *dataBaseC = [ICRDataBaseController sharedController];
[dataBaseC.m_dbQueue inDatabase:^(FMDatabase *db) {
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",[GTOPioneering TableName],@"state" ];
BOOL del = [db executeUpdate:strSql,GTO_PIONEERING_STATE_LOCAL];
NSString *strSql =
[NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",
[GTOPioneering TableName], @"state"];
BOOL del = [db executeUpdate:strSql, GTO_PIONEERING_STATE_LOCAL];
if (!del) {
[IBTLoadingView showTextOnly:@"删除失败"];
return ;
return;
}
_d_pioneering = nil;
_titleItem.value = nil;
......@@ -419,39 +455,44 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
[_remarkItem reloadRowWithAnimation:UITableViewRowAnimationNone];
_c_tableView.userInteractionEnabled = YES;
if (_bottomV.tag == kbottomDelBtnsTag) {
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_BACK forState:UIControlStateNormal];
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_BACK
forState:UIControlStateNormal];
self.bottomV.tag = kbottomBackBtnsTag;
}
}];
[self localDelete];
}
//本地删除
- (void)localDelete {
ICRDataBaseController *dataBaseC = [ICRDataBaseController sharedController];
//删除本地答案
[dataBaseC.m_dbQueue inDatabase:^(FMDatabase *db) {
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",[GTOAnswer TableName],@"pioneeringUuid" ];
[db executeUpdate:strSql,_d_pioneering.uuid];
NSString *strSql =
[NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",
[GTOAnswer TableName], @"pioneeringUuid"];
[db executeUpdate:strSql, _d_pioneering.uuid];
}];
//删除本地问题
[dataBaseC.m_dbQueue inDatabase:^(FMDatabase *db) {
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",[GTOQuestion TableName],@"pioneeringUuid" ];
[db executeUpdate:strSql,_d_pioneering.uuid];
NSString *strSql =
[NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",
[GTOQuestion TableName], @"pioneeringUuid"];
[db executeUpdate:strSql, _d_pioneering.uuid];
}];
//删除本地图片
[dataBaseC.m_dbQueue inDatabase:^(FMDatabase *db) {
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",[ICRPostAttachment TableName],@"pioneeringUuid" ];
[db executeUpdate:strSql,_d_pioneering.uuid];
NSString *strSql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE %@=?",
[ICRPostAttachment TableName],
@"pioneeringUuid"];
[db executeUpdate:strSql, _d_pioneering.uuid];
}];
}
- (void)bottomView:(GXFBottomView *)bottomView RightButtonClicked:(UIButton *)rightBtn {
if (!_titleItem.value || _titleItem.value.length <= 0 ) {
- (void)bottomView:(GXFBottomView *)bottomView
RightButtonClicked:(UIButton *)rightBtn {
if (!_titleItem.value || _titleItem.value.length <= 0) {
[IBTLoadingView showTextOnly:@"请填写标题" inView:self.view];
return;
}
......@@ -469,7 +510,8 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
[self p_addAlerInfoPioneeringView];
}
self.bottomV.tag = kbottomDelBtnsTag;
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_DELETE forState:UIControlStateNormal];
[self.bottomV.f_leftBtn setTitle:BOTTOM_TEXT_DELETE
forState:UIControlStateNormal];
return;
}
......@@ -478,34 +520,48 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
}
}
#pragma GTOAlertInfoPioneeringViewControllerDelegate
- (void)alertInfoPioneeringViewController:(GTOAlertInfoPioneeringViewController *)alertInfoPioneering closeClickedWithBtton:(UIButton *)btn {
- (void)alertInfoPioneeringViewController:
(GTOAlertInfoPioneeringViewController *)alertInfoPioneering
closeClickedWithBtton:(UIButton *)btn {
// self.d_isClosed = YES;
[_alertInfoVC.view removeFromSuperview];
}
- (void)alertInfoPioneeringViewController:(GTOAlertInfoPioneeringViewController *)alertInfoPioneering seeResultClickedWithBtton:(UIButton *)btn {
GTOQResultViewController *resultVC = [[GTOQResultViewController alloc]initWithPioneering:_d_pioneering];
- (void)alertInfoPioneeringViewController:
(GTOAlertInfoPioneeringViewController *)alertInfoPioneering
seeResultClickedWithBtton:(UIButton *)btn {
GTOQResultViewController *resultVC =
[[GTOQResultViewController alloc] initWithPioneering:_d_pioneering];
//self.d_isClosed = YES;
// self.d_isClosed = YES;
[_alertInfoVC.view removeFromSuperview];
[self PushViewController:resultVC animated:YES];
}
- (void)alertInfoPioneeringViewController:(GTOAlertInfoPioneeringViewController *)alertInfoPioneering nextClickedWithBtton:(UIButton *)btn {
- (void)alertInfoPioneeringViewController:
(GTOAlertInfoPioneeringViewController *)alertInfoPioneering
nextClickedWithBtton:(UIButton *)btn {
BOOL isAllFinished = YES;
for(NSDictionary *dict in _d_pioneering.arrDisplayResults) {
for (NSDictionary *dict in _d_pioneering.arrDisplayResults) {
GTODisplayResult *displayR = [GTODisplayResult DBObject];
[displayR praseFromJsonDict:dict];
if (displayR.arrAnswers.count < displayR.arrQuestions.count) {
GTOQuestionManager *mgr = [GTOQuestionManager sharedManager];
mgr.d_category = displayR.category;
// [mgr openQuestionVCFromViewControler:self withPioneering:_d_pioneering];
// [mgr openQuestionVCFromViewControler:self
// withPioneering:_d_pioneering];
BOOL notEdit = NO;
if ([_d_pioneering.state isEqualToString:GTO_PIONEERING_STATE_SUBMITTED]) {
if ([_d_pioneering.state
isEqualToString:GTO_PIONEERING_STATE_SUBMITTED]) {
notEdit = YES;
} else {
notEdit = NO;
}
[mgr openQuestionVCFromViewControler:self Licence:nil Pioneering:_d_pioneering IsNotEdit:notEdit ProblemIndex:0];
[self alertInfoPioneeringViewController:alertInfoPioneering closeClickedWithBtton:nil];
[mgr openQuestionVCFromViewControler:self
Licence:nil
Pioneering:_d_pioneering
IsNotEdit:notEdit
ProblemIndex:0];
[self alertInfoPioneeringViewController:alertInfoPioneering
closeClickedWithBtton:nil];
isAllFinished = NO;
break;
}
......@@ -517,25 +573,34 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
[displayR praseFromJsonDict:dictR];
GTOQuestionManager *mgr = [GTOQuestionManager sharedManager];
mgr.d_category = displayR.category;
// [mgr openQuestionVCFromViewControler:self withPioneering:_d_pioneering];
// [mgr openQuestionVCFromViewControler:self
// withPioneering:_d_pioneering];
BOOL notEdit = NO;
if ([_d_pioneering.state isEqualToString:GTO_PIONEERING_STATE_SUBMITTED]) {
notEdit = YES;
} else {
notEdit = NO;
}
[mgr openQuestionVCFromViewControler:self Licence:nil Pioneering:_d_pioneering IsNotEdit:notEdit ProblemIndex:0];
[self alertInfoPioneeringViewController:alertInfoPioneering closeClickedWithBtton:nil];
[mgr openQuestionVCFromViewControler:self
Licence:nil
Pioneering:_d_pioneering
IsNotEdit:notEdit
ProblemIndex:0];
[self alertInfoPioneeringViewController:alertInfoPioneering
closeClickedWithBtton:nil];
}
}
- (void)alertInfoPioneeringViewController:(GTOAlertInfoPioneeringViewController *)alertInfoPioneering didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- (void)alertInfoPioneeringViewController:
(GTOAlertInfoPioneeringViewController *)alertInfoPioneering
didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
GTOQuestionManager *mgr = [GTOQuestionManager sharedManager];
GTODisplayResult *displayR = [GTODisplayResult DBObject];
[displayR praseFromJsonDict:_d_pioneering.arrDisplayResults[indexPath.row]];
mgr.d_category = displayR.category;//alertInfoPioneering.d_arrCategorys[indexPath.row];
// [mgr openQuestionVCFromViewControler:self withPioneering:_d_pioneering];
// [self alertInfoPioneeringViewController:alertInfoPioneering closeClickedWithBtton:nil];
mgr.d_category =
displayR.category; // alertInfoPioneering.d_arrCategorys[indexPath.row];
// [mgr openQuestionVCFromViewControler:self withPioneering:_d_pioneering];
// [self alertInfoPioneeringViewController:alertInfoPioneering
// closeClickedWithBtton:nil];
BOOL notEdit = NO;
if ([_d_pioneering.state isEqualToString:GTO_PIONEERING_STATE_SUBMITTED]) {
......@@ -543,19 +608,24 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
} else {
notEdit = NO;
}
[mgr openQuestionVCFromViewControler:self Licence:nil Pioneering:_d_pioneering IsNotEdit:notEdit ProblemIndex:0];
[mgr openQuestionVCFromViewControler:self
Licence:nil
Pioneering:_d_pioneering
IsNotEdit:notEdit
ProblemIndex:0];
[self alertInfoPioneeringViewController:alertInfoPioneering closeClickedWithBtton:nil];
[self alertInfoPioneeringViewController:alertInfoPioneering
closeClickedWithBtton:nil];
}
//签到
- (void)signClicked {
GTOSignViewController *signVC = [[GTOSignViewController alloc]init];
GTOSignViewController *signVC = [[GTOSignViewController alloc] init];
self.c_signVC = signVC;
[self PushViewController:signVC animated:NO];
}
//- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
//- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell
//*)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
// if (indexPath.row == 2) {
// cell.backgroundColor = [UIColor redColor];
// cell.userInteractionEnabled = NO;
......@@ -584,12 +654,9 @@ typedef NS_ENUM(NSUInteger, bottomTag) {
// return YES;
//}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
@end
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