IphoneBIMe/IphoneBIMe.xcodeproj/project.pbxproj
@@ -267,6 +267,7 @@ 2CFB177B2101CB0E00B6BF1A /* PBModelsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFB177A2101CB0E00B6BF1A /* PBModelsModel.m */; }; 2CFB177E2101CC1200B6BF1A /* PBModelsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFB177D2101CC1200B6BF1A /* PBModelsTableViewCell.m */; }; 2CFD790624C02CA9006B6E75 /* PBInputCodeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFD790524C02CA8006B6E75 /* PBInputCodeTableViewCell.m */; }; 4C07019729B85E4000F29889 /* PBNewVehicleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C07019629B85E4000F29889 /* PBNewVehicleTableViewCell.m */; }; 4C385C912988F3DF00D9F626 /* SGScanViewConfigure.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C385C742988F3DF00D9F626 /* SGScanViewConfigure.m */; }; 4C385C922988F3DF00D9F626 /* SGScanView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C385C752988F3DF00D9F626 /* SGScanView.m */; }; 4C385C932988F3DF00D9F626 /* SGQRCode.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 4C385C782988F3DF00D9F626 /* SGQRCode.bundle */; }; @@ -1760,6 +1761,8 @@ 2CFD790424C02CA8006B6E75 /* PBInputCodeTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PBInputCodeTableViewCell.h; sourceTree = "<group>"; }; 2CFD790524C02CA8006B6E75 /* PBInputCodeTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PBInputCodeTableViewCell.m; sourceTree = "<group>"; }; 2E141B7B69B652435715D5BB /* Pods-IphoneBIMe.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IphoneBIMe.release.xcconfig"; path = "Pods/Target Support Files/Pods-IphoneBIMe/Pods-IphoneBIMe.release.xcconfig"; sourceTree = "<group>"; }; 4C07019529B85E4000F29889 /* PBNewVehicleTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PBNewVehicleTableViewCell.h; sourceTree = "<group>"; }; 4C07019629B85E4000F29889 /* PBNewVehicleTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PBNewVehicleTableViewCell.m; sourceTree = "<group>"; }; 4C385C722988F3DF00D9F626 /* SGQRCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SGQRCode.h; sourceTree = "<group>"; }; 4C385C742988F3DF00D9F626 /* SGScanViewConfigure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SGScanViewConfigure.m; sourceTree = "<group>"; }; 4C385C752988F3DF00D9F626 /* SGScanView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SGScanView.m; sourceTree = "<group>"; }; @@ -4392,6 +4395,8 @@ 4C93503528CB170600476008 /* PBImgAndNameCollectionViewCell.m */, 4C385CA0298A068E00D9F626 /* PBNewPersonTableViewCell.h */, 4C385CA1298A068E00D9F626 /* PBNewPersonTableViewCell.m */, 4C07019529B85E4000F29889 /* PBNewVehicleTableViewCell.h */, 4C07019629B85E4000F29889 /* PBNewVehicleTableViewCell.m */, ); path = Views; sourceTree = "<group>"; @@ -4459,7 +4464,7 @@ TargetAttributes = { 2C2A6EF020F88F1000218D5C = { CreatedOnToolsVersion = 9.2; ProvisioningStyle = Manual; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.Push = { enabled = 1; @@ -4804,6 +4809,7 @@ 2CC012BF2418E46000A39754 /* PBTagModel.m in Sources */, 2C0F113A2511EBC800A510DE /* PBAddExamineViewController.m in Sources */, 2CB70E3D25B989C900EDF368 /* NSDictionary+log.m in Sources */, 4C07019729B85E4000F29889 /* PBNewVehicleTableViewCell.m in Sources */, 2CD83F9C2106FADF006111C7 /* PBDrawingsInfoModel.m in Sources */, 2C16563C212C1D75007CA9FD /* PBPersonModel.m in Sources */, 2C5DCEDF2154FDBE00A68B28 /* PGGCryptoDES.m in Sources */, @@ -5068,8 +5074,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_ENTITLEMENTS = IphoneBIMe/IphoneBIMe.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1.3; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_ASSET_PATHS = ""; @@ -5130,7 +5136,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.probim.zhonghe; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = zhonghePP; PROVISIONING_PROFILE_SPECIFIER = ""; TARGETED_DEVICE_FAMILY = 1; VALIDATE_WORKSPACE = NO; }; @@ -5143,11 +5149,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_ENTITLEMENTS = IphoneBIMe/IphoneBIMe.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1.3; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = PQM7L66DSE; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -5204,7 +5210,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.probim.zhonghe; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = zhonghePP; PROVISIONING_PROFILE_SPECIFIER = ""; TARGETED_DEVICE_FAMILY = 1; VALIDATE_WORKSPACE = NO; }; IphoneBIMe/IphoneBIMe.xcodeproj/xcshareddata/xcschemes/IphoneBIMe.xcscheme
@@ -31,7 +31,7 @@ </Testables> </TestAction> <LaunchAction buildConfiguration = "Release" buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" IphoneBIMe/IphoneBIMe/Classes/Login/ViewControllers/PBLoginViewController.m
@@ -13,6 +13,8 @@ #import <JPUSHService.h> #import "PGGCryptoDES.h" #import "PBEnterpriseCodeController.h" #import "PBSitePerViewController.h" #import "PBProjectModel.h" #define bim365Code @"300012" @interface PBLoginViewController ()<UITextFieldDelegate> @property (nonatomic, weak) UILabel *codeL; @@ -228,6 +230,14 @@ }]; // [loginBtn circleViewWithRadius:6]; UIButton *clockBtn = [UIButton z_textButton:@"打卡" boldFontSize:16 normalColor:PBColor(40, 58, 79)]; [clockBtn addTarget:self action:@selector(clockAction) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:clockBtn]; [clockBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(loginBtn.mas_bottom).offset(20); make.right.equalTo(loginBtn); }]; UILabel *agreeL = [UILabel z_labelWithText:@"登录代表同意" Color:DescColor isBold:YES Font:12]; [self.view addSubview:agreeL]; [agreeL mas_makeConstraints:^(MASConstraintMaker *make) { @@ -256,6 +266,16 @@ }else { self.passwordTF.secureTextEntry = YES; } } - (void)clockAction { PBSitePerViewController *moduleVC = [[PBSitePerViewController alloc] init]; moduleVC.isFromLogin = YES; PBProjectModel *projectModel = [[PBProjectModel alloc] init]; projectModel.organizeid = @"726970e7-005a-42d7-8ab4-0703d9d02957"; moduleVC.projectModel = projectModel; UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:moduleVC]; nav.modalPresentationStyle = UIModalPresentationFullScreen; [self presentViewController:nav animated:YES completion:nil]; } #pragma mark -查看协议 - (void)agreementAction { @@ -494,13 +514,13 @@ // @"Check" : @"1" // }; _bim365Data = @{ @"ModelApi" : @"http://39.129.29.216:6081", @"ModelApi" : @"https://bime.shinewing.com:6081", @"Panorama": @"errurl", @"NewApi" : @"http://39.129.29.216:6082", @"NewApi" : @"https://bime.shinewing.com:6082", @"AppApi" : @"errurl", @"Web" : @"http://39.129.29.216:6080", @"NewWeb" : @"http://39.129.29.216:6080", @"LogoUrl" : @"http://39.129.29.216:6080/Content/function/Login/images/Simple_logo.png", @"Web" : @"https://bime.shinewing.com:6080", @"NewWeb" : @"https://bime.shinewing.com:6080", @"LogoUrl" : @"https://bime.shinewing.com:6080/Content/function/Login/images/Simple_logo.png", @"CompanyName" : @"管理平台", @"Code" : bim365Code, @"StarName" : @"", IphoneBIMe/IphoneBIMe/Classes/Project/Schedule/ViewControllers/PBSitePerViewController.h
@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN @interface PBSitePerViewController : UIViewController @property (nonatomic, assign) BOOL isFromLogin; @property (nonatomic, strong) PBProjectModel *projectModel; @property (nonatomic, strong) PBSchedulePlanModel *schedulePlanModel; @property (nonatomic, strong) PBScheduleListModel *scheduleListModel; IphoneBIMe/IphoneBIMe/Classes/Project/Schedule/ViewControllers/PBSitePerViewController.m
@@ -11,6 +11,7 @@ #import "PBSchedulePlanModel.h" #import "PBScheduleHeaderView.h" #import "PBNewPersonTableViewCell.h" #import "PBNewVehicleTableViewCell.h" #import "PBPerPlanModel.h" #import "PBSitePerModel.h" #import "PBEditTimeView.h" @@ -21,6 +22,7 @@ #import <AMapLocationKit/AMapLocationKit.h> static NSString *const CellID = @"CellID"; static NSString *const VCellID = @"VCellID"; @interface PBSitePerViewController ()<UITableViewDataSource, UITableViewDelegate, AMapLocationManagerDelegate> @property (nonatomic, strong) NSArray *dataList; @property (nonatomic, strong) NSArray *typeDataList; @@ -35,6 +37,7 @@ @property (nonatomic, assign) BOOL isAdd; @property (nonatomic, strong) AMapLocationManager *locationManager; @property (nonatomic, copy) NSString *place; @property (nonatomic, copy) NSString *type; @end @implementation PBSitePerViewController @@ -57,7 +60,7 @@ } - (void)setupNav { self.title = @"现场人员"; self.title = @"填报"; PBBackNavItem *backNav = [PBBackNavItem backNacItem]; backNav.title = @"返回"; [backNav addTarget:self action:@selector(backItemAction) forControlEvents:UIControlEventTouchUpInside]; @@ -68,7 +71,11 @@ // self.navigationItem.rightBarButtonItem = saveNavItem; } - (void)backItemAction { [self.navigationController popViewControllerAnimated:YES]; if (self.isFromLogin) { [self dismissViewControllerAnimated:YES completion:nil]; } else { [self.navigationController popViewControllerAnimated:YES]; } } //- (void)saveAction{ // [YJProgressHUD showProgress:@"正在保存..." inView:self.view]; @@ -188,6 +195,7 @@ self.tableView.rowHeight = UITableViewAutomaticDimension; self.tableView.estimatedRowHeight = 100.f; [self.tableView registerClass:[PBNewPersonTableViewCell class] forCellReuseIdentifier:CellID]; [self.tableView registerClass:[PBNewVehicleTableViewCell class] forCellReuseIdentifier:VCellID]; [self.view addSubview:self.tableView]; if (@available(iOS 15.0, *)) { @@ -265,7 +273,15 @@ NSLog(@"第一次授权成功"); QQQRCodeVC *VC = [[QQQRCodeVC alloc] init]; VC.getPersonBlock = ^(NSString * _Nonnull personId) { [self getFillUserInfoWithID:personId]; NSArray *array = [personId componentsSeparatedByString:@"&"]; if (array.count == 2) { self.type = array[1]; if ([self.type isEqualToString:@"0"]) {// 人员 [self getFillUserInfoWithID:array[0]]; }else {// 车辆 [self getFillCarInfoWithID:array[0]]; } } }; [self.navigationController pushViewController:VC animated:YES]; @@ -277,7 +293,15 @@ NSLog(@"SGPermissionStatusAuthorized"); QQQRCodeVC *VC = [[QQQRCodeVC alloc] init]; VC.getPersonBlock = ^(NSString * _Nonnull personId) { [self getFillUserInfoWithID:personId]; NSArray *array = [personId componentsSeparatedByString:@"&"]; if (array.count == 2) { self.type = array[1]; if ([self.type isEqualToString:@"0"]) {// 人员 [self getFillUserInfoWithID:array[0]]; }else {// 车辆 [self getFillCarInfoWithID:array[0]]; } } }; [self.navigationController pushViewController:VC animated:YES]; @@ -330,6 +354,23 @@ } }]; } - (void)getFillCarInfoWithID:(NSString *)guid { [[PBNetworkTools sharedTools] GetCarInfoWithID:guid andCallBack:^(NSURLSessionDataTask *task, id response, NSError *error) { if (error) { NSLog(@"%@",error); [YJProgressHUD showMessage:@"加载失败" inView:self.view]; return; } NSString *str = [[NSString alloc] initWithData:response encoding:NSUTF8StringEncoding]; PBNetworkModel *networkModel = [PBNetworkModel yy_modelWithJSON:str]; if (networkModel.Ret == 1) { self.dataList = @[networkModel.Data]; [self.tableView reloadData]; }else { [YJProgressHUD showMessage:networkModel.Msg inView:self.view]; } }]; } - (void)getPositioning { [YJProgressHUD showProgress:@"" inView:self.view]; [AMapLocationManager updatePrivacyShow:(AMapPrivacyShowStatusDidShow) privacyInfo:AMapPrivacyInfoStatusDidContain]; @@ -366,21 +407,37 @@ NSInteger type = btn.tag - 90; NSDictionary *dict = self.dataList[0]; [YJProgressHUD showProgress:@"" inView:self.view]; [[PBNetworkTools sharedTools] aEntryOrExitWithOrganizeId:self.projectModel.organizeid andFillingUserId:[dict valueForKey:@"Id"] andProgressParentId:@"" andProgressTreeId:@"" andProgressProjectId:@"" andAddress:self.place andType:type andCallBack:^(NSURLResponse *response, id responseObject, NSError *error) { if (error) { NSLog(@"%@",error); [YJProgressHUD showMessage:@"操作失败" inView:self.view]; return; } NSString *str = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; PBNetworkModel *networkModel = [PBNetworkModel yy_modelWithJSON:str]; if (networkModel.Ret == 1) { [YJProgressHUD showSuccess:@"操作成功" inview:self.view]; }else { [YJProgressHUD showMessage:networkModel.Msg inView:self.view]; } }]; if ([self.type isEqualToString:@"0"]) { [[PBNetworkTools sharedTools] aEntryOrExitWithOrganizeId:self.projectModel.organizeid andFillingUserId:[dict valueForKey:@"Id"] andProgressParentId:@"" andProgressTreeId:@"" andProgressProjectId:@"" andAddress:self.place andType:type andCallBack:^(NSURLResponse *response, id responseObject, NSError *error) { if (error) { NSLog(@"%@",error); [YJProgressHUD showMessage:@"操作失败" inView:self.view]; return; } NSString *str = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; PBNetworkModel *networkModel = [PBNetworkModel yy_modelWithJSON:str]; if (networkModel.Ret == 1) { [YJProgressHUD showSuccess:@"操作成功" inview:self.view]; }else { [YJProgressHUD showMessage:networkModel.Msg inView:self.view]; } }]; }else { [[PBNetworkTools sharedTools] CarEntryOrExitWithOrganizeId:self.projectModel.organizeid andFillingId:[dict valueForKey:@"Id"] andProgressParentId:@"" andProgressTreeId:@"" andProgressProjectId:@"" andAddress:self.place andType:type andCallBack:^(NSURLResponse *response, id responseObject, NSError *error) { if (error) { NSLog(@"%@",error); [YJProgressHUD showMessage:@"操作失败" inView:self.view]; return; } NSString *str = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; PBNetworkModel *networkModel = [PBNetworkModel yy_modelWithJSON:str]; if (networkModel.Ret == 1) { [YJProgressHUD showSuccess:@"操作成功" inview:self.view]; }else { [YJProgressHUD showMessage:networkModel.Msg inView:self.view]; } }]; } } @@ -391,10 +448,17 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { NSDictionary *item = self.dataList[indexPath.row]; PBNewPersonTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellID forIndexPath:indexPath]; cell.dict = item; cell.selectionStyle = UITableViewCellSelectionStyleNone; return cell; if ([self.type isEqualToString:@"0"]) { PBNewPersonTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellID forIndexPath:indexPath]; cell.dict = item; cell.selectionStyle = UITableViewCellSelectionStyleNone; return cell; }else { PBNewVehicleTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:VCellID forIndexPath:indexPath]; cell.dict = item; cell.selectionStyle = UITableViewCellSelectionStyleNone; return cell; } } - (void)setSchedulePlanModel:(PBSchedulePlanModel *)schedulePlanModel{ @@ -440,6 +504,9 @@ } return _sitePersonArrM; } - (void)setIsFromLogin:(BOOL)isFromLogin { _isFromLogin = isFromLogin; } /* #pragma mark - Navigation IphoneBIMe/IphoneBIMe/Classes/Project/Schedule/Views/PBNewVehicleTableViewCell.h
New file @@ -0,0 +1,17 @@ // // PBNewVehicleTableViewCell.h // IphoneBIMe // // Created by ZhangJF on 2023/3/8. // Copyright © 2023 ProBIM. All rights reserved. // #import <UIKit/UIKit.h> NS_ASSUME_NONNULL_BEGIN @interface PBNewVehicleTableViewCell : UITableViewCell @property (nonatomic, strong) NSDictionary *dict; @end NS_ASSUME_NONNULL_END IphoneBIMe/IphoneBIMe/Classes/Project/Schedule/Views/PBNewVehicleTableViewCell.m
New file @@ -0,0 +1,129 @@ // // PBNewVehicleTableViewCell.m // IphoneBIMe // // Created by ZhangJF on 2023/3/8. // Copyright © 2023 ProBIM. All rights reserved. // #import "PBNewVehicleTableViewCell.h" @interface PBNewVehicleTableViewCell() @property (nonatomic, weak) UILabel *nameL; @property (nonatomic, weak) UILabel *genderL; @property (nonatomic, weak) UILabel *unitL; @property (nonatomic, weak) UILabel *typeL; @property (nonatomic, weak) UILabel *idCardL; @property (nonatomic, weak) UILabel *telL; @property (nonatomic, weak) UILabel *lotL; @end @implementation PBNewVehicleTableViewCell - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { [self setupUI]; } return self; } - (void)setupUI { UILabel *nameTitleL = [UILabel z_labelWithText:@"车牌号: " Color:[UIColor z_colorWithR:51 G:51 B:51] isBold:YES Font:14]; [self.contentView addSubview:nameTitleL]; [nameTitleL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.contentView).offset(8); make.left.equalTo(self.contentView).offset(12); make.height.equalTo(@44); make.width.equalTo(@74); }]; UILabel *nameL = [UILabel z_labelWithText:@"京A·374758" Color:[UIColor z_colorWithR:108 G:108 B:108] isBold:NO Font:14]; nameL.layer.cornerRadius = 4; nameL.layer.borderWidth = 1.f; nameL.layer.borderColor = [[UIColor z_colorWithR:108 G:108 B:108] CGColor]; [self.contentView addSubview:nameL]; [nameL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(nameTitleL); make.height.equalTo(@44); make.left.equalTo(nameTitleL.mas_right); make.right.equalTo(self.contentView).offset(-12); }]; UILabel *genderTitleL = [UILabel z_labelWithText:@"随车人员: " Color:[UIColor z_colorWithR:51 G:51 B:51] isBold:YES Font:14]; [self.contentView addSubview:genderTitleL]; [genderTitleL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(nameTitleL.mas_bottom).offset(8); make.left.equalTo(self.contentView).offset(12); make.height.equalTo(@44); make.width.equalTo(@74); }]; UILabel *genderL = [UILabel z_labelWithText:@"李八" Color:[UIColor z_colorWithR:108 G:108 B:108] isBold:NO Font:14]; genderL.layer.cornerRadius = 4; genderL.layer.borderWidth = 1.f; genderL.layer.borderColor = [[UIColor z_colorWithR:108 G:108 B:108] CGColor]; [self.contentView addSubview:genderL]; [genderL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(genderTitleL); make.height.equalTo(@44); make.left.equalTo(genderTitleL.mas_right); make.right.equalTo(self.contentView).offset(-12); }]; UILabel *unitTitleL = [UILabel z_labelWithText:@"车辆类型: " Color:[UIColor z_colorWithR:51 G:51 B:51] isBold:YES Font:14]; [self.contentView addSubview:unitTitleL]; [unitTitleL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(genderTitleL.mas_bottom).offset(8); make.left.equalTo(self.contentView).offset(12); make.height.equalTo(@44); make.width.equalTo(@74); }]; UILabel *unitL = [UILabel z_labelWithText:@"挖掘机" Color:[UIColor z_colorWithR:108 G:108 B:108] isBold:NO Font:14]; unitL.layer.cornerRadius = 4; unitL.layer.borderWidth = 1.f; unitL.layer.borderColor = [[UIColor z_colorWithR:108 G:108 B:108] CGColor]; [self.contentView addSubview:unitL]; [unitL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(unitTitleL); make.height.equalTo(@44); make.left.equalTo(unitTitleL.mas_right); make.right.equalTo(self.contentView).offset(-12); }]; UILabel *lotTitleL = [UILabel z_labelWithText:@"标段: " Color:[UIColor z_colorWithR:51 G:51 B:51] isBold:YES Font:14]; [self.contentView addSubview:lotTitleL]; [lotTitleL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(unitTitleL.mas_bottom).offset(8); make.left.equalTo(self.contentView).offset(12); make.height.equalTo(@44); make.width.equalTo(@74); make.bottom.equalTo(self.contentView); }]; UILabel *lotL = [UILabel z_labelWithText:@"" Color:[UIColor z_colorWithR:108 G:108 B:108] isBold:NO Font:14]; lotL.layer.cornerRadius = 4; lotL.layer.borderWidth = 1.f; lotL.layer.borderColor = [[UIColor z_colorWithR:108 G:108 B:108] CGColor]; [self.contentView addSubview:lotL]; [lotL mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(lotTitleL); make.height.equalTo(@44); make.left.equalTo(lotTitleL.mas_right); make.right.equalTo(self.contentView).offset(-12); }]; self.nameL = nameL; self.genderL = genderL; self.unitL = unitL; self.lotL = lotL; } - (void)setDict:(NSDictionary *)dict { _dict = dict; self.nameL.text = [NSString stringWithFormat:@" %@", [dict valueForKey:@"CarNumber"]]; self.genderL.text = [NSString stringWithFormat:@" %@", [dict valueForKey:@"CarPersonnel"]]; self.unitL.text = [NSString stringWithFormat:@" %@", [dict valueForKey:@"CartType"]]; self.lotL.text = [NSString stringWithFormat:@" %@", [dict valueForKey:@"Tenders"]]; } - (void)awakeFromNib { [super awakeFromNib]; // Initialization code } - (void)setSelected:(BOOL)selected animated:(BOOL)animated { [super setSelected:selected animated:animated]; // Configure the view for the selected state } @end IphoneBIMe/IphoneBIMe/Classes/Tools/PBNetworkTools.h
@@ -321,6 +321,10 @@ - (void)GetFillUserInfoWithID:(NSString *)guid andCallBack:(void (^) (NSURLSessionDataTask *task,id response, NSError *error))callBack; // 现场人员填报 - (void)aEntryOrExitWithOrganizeId:(NSString *)organizeId andFillingUserId:(NSString *)fillingUserId andProgressParentId:(NSString *)progressParentId andProgressTreeId:(NSString *)progressTreeId andProgressProjectId:(NSString *)progressProjectId andAddress:(NSString *)address andType:(NSInteger)type andCallBack:(void (^) (NSURLResponse *response, id responseObject, NSError *error))callBack; // 获取现场车辆扫描信息 - (void)GetCarInfoWithID:(NSString *)guid andCallBack:(void (^) (NSURLSessionDataTask *task,id response, NSError *error))callBack; // 现场车辆填报 - (void)CarEntryOrExitWithOrganizeId:(NSString *)organizeId andFillingId:(NSString *)fillingId andProgressParentId:(NSString *)progressParentId andProgressTreeId:(NSString *)progressTreeId andProgressProjectId:(NSString *)progressProjectId andAddress:(NSString *)address andType:(NSInteger)type andCallBack:(void (^) (NSURLResponse *response, id responseObject, NSError *error))callBack; // 获取现场人员列表 - (void)GetFillingUserLogPagedWithPageIndex:(NSString *)pageIndex andPageSize:(NSString *)pageSize andOrganizeId:(NSString *)organizeId andProgressProjectId:(NSString *)progressProjectId andCallBack:(void (^) (NSURLSessionDataTask *task,id response, NSError *error))callBack; // 获取视频列表 IphoneBIMe/IphoneBIMe/Classes/Tools/PBNetworkTools.m
@@ -1936,15 +1936,36 @@ - (void)aEntryOrExitWithOrganizeId:(NSString *)organizeId andFillingUserId:(NSString *)fillingUserId andProgressParentId:(NSString *)progressParentId andProgressTreeId:(NSString *)progressTreeId andProgressProjectId:(NSString *)progressProjectId andAddress:(NSString *)address andType:(NSInteger)type andCallBack:(void (^) (NSURLResponse *response, id responseObject, NSError *error))callBack { NSDictionary *dict = @{ @"OrganizeId": organizeId, @"FillingUserId": fillingUserId, @"FillingId": fillingUserId, @"ProgressParentId": progressParentId, @"ProgressTreeId": progressTreeId, @"ProgressProjectId": progressProjectId, @"Address": address, @"Token": Token, @"Type": [NSNumber numberWithInteger:type] }; NSString *url = [NSString stringWithFormat:@"%@/api/Filling/FillingUserLog/EntryOrExit",BaseUrl]; NSString *url = [NSString stringWithFormat:@"%@/api/Filling/FillingLog/UserEntryOrExit",BaseUrl]; [[PBNetworkTools sharedTools] BodyRequestWithType:POST andCookie:NO andUrl:url andParams:dict andCallBack:callBack]; } #pragma mark - 获取现场车辆扫描信息 - (void)GetCarInfoWithID:(NSString *)guid andCallBack:(void (^) (NSURLSessionDataTask *task,id response, NSError *error))callBack { NSDictionary *dict = @{ @"id":guid }; NSString *url = [NSString stringWithFormat:@"%@/api/Filling/FillingCar/GetCarInfo",BaseUrl]; [[PBNetworkTools sharedTools] RequestWithType:GET andCookie:NO andUrl:url andParams:dict andCallBack:callBack]; } #pragma mark - 现场车辆填报 - (void)CarEntryOrExitWithOrganizeId:(NSString *)organizeId andFillingId:(NSString *)fillingId andProgressParentId:(NSString *)progressParentId andProgressTreeId:(NSString *)progressTreeId andProgressProjectId:(NSString *)progressProjectId andAddress:(NSString *)address andType:(NSInteger)type andCallBack:(void (^) (NSURLResponse *response, id responseObject, NSError *error))callBack { NSDictionary *dict = @{ @"OrganizeId": organizeId, @"FillingId": fillingId, @"ProgressParentId": progressParentId, @"ProgressTreeId": progressTreeId, @"ProgressProjectId": progressProjectId, @"Address": address, @"Type": [NSNumber numberWithInteger:type] }; NSString *url = [NSString stringWithFormat:@"%@/api/Filling/FillingLog/CarEntryOrExit",BaseUrl]; [[PBNetworkTools sharedTools] BodyRequestWithType:POST andCookie:NO andUrl:url andParams:dict andCallBack:callBack]; } #pragma mark - 获取现场人员列表
