Commit 6efbeb44 authored by 曹云霄's avatar 曹云霄

筛选模块搬迁完成,优化部分图标未显示问题

parent f9bcd7d0
......@@ -124,6 +124,6 @@ SPEC CHECKSUMS:
YXKit: 73d6ffbcf7530f1159e030460207286e9153b080
YXPickerView: 435b7b1362931fe63f2aab25d2810b1cf5ca2226
PODFILE CHECKSUM: 803390eac6c629c22ec9c9ed8f80553ad7072885
PODFILE CHECKSUM: 51bc5ca79a5fd2f00c1a03b75c468220c7321aed
COCOAPODS: 1.2.1
......@@ -124,6 +124,6 @@ SPEC CHECKSUMS:
YXKit: 73d6ffbcf7530f1159e030460207286e9153b080
YXPickerView: 435b7b1362931fe63f2aab25d2810b1cf5ca2226
PODFILE CHECKSUM: 803390eac6c629c22ec9c9ed8f80553ad7072885
PODFILE CHECKSUM: 51bc5ca79a5fd2f00c1a03b75c468220c7321aed
COCOAPODS: 1.2.1
......@@ -138,5 +138,5 @@ then
fi
done <<<"$OTHER_XCASSETS"
printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${BUILD_DIR}/assetcatalog_generated_info.plist"
fi
......@@ -30,5 +30,13 @@ target 'total' do
pod 'FDFullscreenPopGesture', '~> 1.1'
pod 'MZFormSheetPresentationController', '~> 2.4.2'
end
post_install do |installer|
copy_pods_resources_path = "Pods/Target Support Files/Pods-total/Pods-total-resources.sh"
string_to_replace = '--compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"'
assets_compile_with_app_icon_arguments = '--compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${BUILD_DIR}/assetcatalog_generated_info.plist"'
text = File.read(copy_pods_resources_path)
new_contents = text.gsub(string_to_replace, assets_compile_with_app_icon_arguments)
File.open(copy_pods_resources_path, "w") {|file| file.puts new_contents }
end
......@@ -117,6 +117,8 @@
2998EC6A1FCC0BCE007082B9 /* UIScrollView+MJRefresh.m in Sources */ = {isa = PBXBuildFile; fileRef = 2998EC551FCC0BCD007082B9 /* UIScrollView+MJRefresh.m */; };
2998EC6B1FCC0BCE007082B9 /* UIView+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 2998EC571FCC0BCD007082B9 /* UIView+MJExtension.m */; };
29AC60641D2A6ACE003B9675 /* ReceivedOilModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29AC60631D2A6ACE003B9675 /* ReceivedOilModel.m */; };
29B1C6DC1FCD315100EFC812 /* Patrol_PatrolInspectResult.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29B1C6DB1FCD315000EFC812 /* Patrol_PatrolInspectResult.storyboard */; };
29B1C6DE1FCD353A00EFC812 /* Patrol_Filter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29B1C6DD1FCD353A00EFC812 /* Patrol_Filter.storyboard */; };
29B501D41D1A7747003D4E74 /* OilOrderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B501D31D1A7747003D4E74 /* OilOrderTableViewCell.m */; };
29B501D81D1A8972003D4E74 /* FirstTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B501D71D1A8972003D4E74 /* FirstTableViewCell.m */; };
29B501DB1D1A897C003D4E74 /* SecondTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B501DA1D1A897C003D4E74 /* SecondTableViewCell.m */; };
......@@ -671,8 +673,11 @@
2998EC551FCC0BCD007082B9 /* UIScrollView+MJRefresh.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+MJRefresh.m"; sourceTree = "<group>"; };
2998EC561FCC0BCD007082B9 /* UIView+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+MJExtension.h"; sourceTree = "<group>"; };
2998EC571FCC0BCD007082B9 /* UIView+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+MJExtension.m"; sourceTree = "<group>"; };
2998EC6C1FCCFE87007082B9 /* total.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = total.entitlements; path = total/total.entitlements; sourceTree = "<group>"; };
29AC60621D2A6ACE003B9675 /* ReceivedOilModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReceivedOilModel.h; sourceTree = "<group>"; };
29AC60631D2A6ACE003B9675 /* ReceivedOilModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReceivedOilModel.m; sourceTree = "<group>"; };
29B1C6DB1FCD315000EFC812 /* Patrol_PatrolInspectResult.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Patrol_PatrolInspectResult.storyboard; sourceTree = "<group>"; };
29B1C6DD1FCD353A00EFC812 /* Patrol_Filter.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Patrol_Filter.storyboard; sourceTree = "<group>"; };
29B501D21D1A7747003D4E74 /* OilOrderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OilOrderTableViewCell.h; sourceTree = "<group>"; };
29B501D31D1A7747003D4E74 /* OilOrderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OilOrderTableViewCell.m; sourceTree = "<group>"; };
29B501D61D1A8972003D4E74 /* FirstTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FirstTableViewCell.h; sourceTree = "<group>"; };
......@@ -1391,6 +1396,7 @@
292D0BC21FCBBCDA00B48C13 /* FilterManager */ = {
isa = PBXGroup;
children = (
29B1C6DD1FCD353A00EFC812 /* Patrol_Filter.storyboard */,
292D0BC31FCBBCDA00B48C13 /* Cells */,
292D0BCA1FCBBCDA00B48C13 /* Controllers */,
292D0BD51FCBBCDA00B48C13 /* Models */,
......@@ -2177,6 +2183,7 @@
29F5C4131FCBAB400052CBF1 /* PatroIInspectionResults(VI巡检结果) */ = {
isa = PBXGroup;
children = (
29B1C6DB1FCD315000EFC812 /* Patrol_PatrolInspectResult.storyboard */,
29F5C4141FCBAB400052CBF1 /* Controller */,
29F5C4231FCBAB400052CBF1 /* Model */,
29F5C42A1FCBAB400052CBF1 /* View */,
......@@ -2368,6 +2375,7 @@
3506ECB51BA00E3400897EBE = {
isa = PBXGroup;
children = (
2998EC6C1FCCFE87007082B9 /* total.entitlements */,
3506ECC01BA00E3400897EBE /* total(中化道达尔) */,
3506ECDA1BA00E3400897EBE /* totalTests */,
3506ECBF1BA00E3400897EBE /* Products */,
......@@ -3589,6 +3597,9 @@
com.apple.BackgroundModes = {
enabled = 1;
};
com.apple.Push = {
enabled = 1;
};
};
};
};
......@@ -3638,6 +3649,7 @@
295FE1F31D17FDDC00DF5B77 /* BusinessCollectionReusableView.xib in Resources */,
35BC8C731BFC106300D0E694 /* city.txt in Resources */,
357FC28F1BFDBA3300D93FFE /* Actions.json in Resources */,
29B1C6DE1FCD353A00EFC812 /* Patrol_Filter.storyboard in Resources */,
29F143E61D1940DE00083975 /* SaveCommitView.xib in Resources */,
2998EC661FCC0BCE007082B9 /* MJRefresh.bundle in Resources */,
292D0C061FCBCF1200B48C13 /* star_sel@3x.png in Resources */,
......@@ -3651,6 +3663,7 @@
294154501D1D1ED500B3B761 /* wareHouseView.xib in Resources */,
29F143EF1D1956A000083975 /* HeaderView.xib in Resources */,
2933CC4F1D20FF87000F8EE6 /* SeeObtainHeaderView.xib in Resources */,
29B1C6DC1FCD315100EFC812 /* Patrol_PatrolInspectResult.storyboard in Resources */,
3506ED9D1BA0166700897EBE /* selected_star@2x.png in Resources */,
295FE1E01D17E9B600DF5B77 /* BusinessStoryBoard.storyboard in Resources */,
2978ED441D1B7CF600159B4A /* DeleteSectionView.xib in Resources */,
......@@ -4268,8 +4281,10 @@
baseConfigurationReference = CFA5B9B7D49DF5246CE1BBC5 /* Pods-total.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = total/total.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer: jie zhang (9V9955H2BK)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
......@@ -4303,8 +4318,10 @@
baseConfigurationReference = 79DE38EEF10DB014EE707286 /* Pods-total.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = total/total.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer: jie zhang (9V9955H2BK)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
......
......@@ -92,8 +92,6 @@
NSLog(@"rescode: %d, \ntags: %@, \nalias: %@\n", iResCode, tags , alias);
}
#pragma mark enterprise alertView 企业版提示
- (void)enterpriseUpdate{
......@@ -104,8 +102,8 @@
// 获取服务器更新信息
[ self getDataFromServer];
}
//请求服务器更新信息
- (void)getDataFromServer{
__weak typeof(self)weakSelf = self;
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
......@@ -14,9 +18,9 @@
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
......@@ -11,17 +15,17 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ABj-DR-Dgw">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="形状-1-副本-3" translatesAutoresizingMaskIntoConstraints="NO" id="ABj-DR-Dgw">
<rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="建仓、订油、配油、收油" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lI7-rC-erM">
<rect key="frame" x="18" y="0.0" width="357" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="lI7-rC-erM" secondAttribute="trailing" id="7d8-4K-JEu"/>
<constraint firstAttribute="trailing" secondItem="ABj-DR-Dgw" secondAttribute="trailing" id="AWg-vl-LdU"/>
......@@ -40,4 +44,7 @@
<point key="canvasLocation" x="459.5" y="200"/>
</view>
</objects>
<resources>
<image name="形状-1-副本-3" width="540" height="30"/>
</resources>
</document>
......@@ -26,7 +26,7 @@
#import "GTOPioneeringListViewController.h"
#import "GTOPatrolPlanListViewController.h"
#import "PatrolTaskViewController.h"
#import "InspectionTableViewController.h"
@interface BusinessViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
/**
......@@ -63,7 +63,7 @@
{
if (!_datasArray) {
_datasArray = [NSMutableArray array];
for (int i=0; i<4; i++) {
for (int i=0; i<5; i++) {
NSMutableArray *array = [NSMutableArray array];
[_datasArray addObject:array];
}
......@@ -118,19 +118,31 @@
NSDictionary *dict = @{@"image":[imageArray objectAtIndex:i],@"title":[titleArray objectAtIndex:i]};
[_datasArray[2] addObject:dict];
}
//开发、HSE
//VI检查
for (int i=0; i<3; i++) {
NSArray *imageArray = [NSArray arrayWithObjects:
@"function_repairSee_icon"
,@"function_licenceSee_icon"
,@"function_licenceSee_icon",nil];
NSArray *titleArray = [NSArray arrayWithObjects:
@"拓站"
,@"HSE巡检"
,@"VI巡检",nil];
@"VI检查"
,@"临时检查"
,@"VI检查结果",nil];
NSDictionary *dict = @{@"image":[imageArray objectAtIndex:i],@"title":[titleArray objectAtIndex:i]};
[_datasArray[3] addObject:dict];
}
//开发、HSE
for (int i=0; i<2; i++) {
NSArray *imageArray = [NSArray arrayWithObjects:
@"function_repairSee_icon"
,@"function_licenceSee_icon"
,nil];
NSArray *titleArray = [NSArray arrayWithObjects:
@"拓站"
,@"HSE巡检",nil];
NSDictionary *dict = @{@"image":[imageArray objectAtIndex:i],@"title":[titleArray objectAtIndex:i]};
[_datasArray[4] addObject:dict];
}
}
return _datasArray;
}
......@@ -142,6 +154,7 @@
@"通用"
,@"工程"
,@"建仓、订油、配油、收油"
,@"VI检查"
,@"开发、HSE", nil];
}
return _sectionTitleArray;
......@@ -171,15 +184,20 @@
,@"SeeOrderViewController"
,@"NewObtainViewController"
,@"SeeOrderViewController", nil];
//VI检查
NSArray *viExamine = [NSArray arrayWithObjects:
@"PatrolTaskViewController"
,@"PatrolTaskViewController"
,@"PatrolTaskViewController", nil];
//开发、HSE
NSArray *development = [NSArray arrayWithObjects:
@"GTOPioneeringListViewController"
,@"GTOPatrolPlanListViewController"
,@"PatrolTaskViewController", nil];
,@"GTOPatrolPlanListViewController", nil];
//统一管理
[_controllerArray addObject:general];
[_controllerArray addObject:project];
[_controllerArray addObject:oil];
[_controllerArray addObject:viExamine];
[_controllerArray addObject:development];
}
return _controllerArray;
......@@ -232,12 +250,18 @@
,@"501001"
,@"501102"
,@"501101", nil];
//VI检查
NSArray *viExamine = [NSArray arrayWithObjects:
@"500501,500502,500503"
,@"500201,500202,500203"
,@"500201,500202,500203",nil];
//开发、HSE
NSArray *development = [NSArray arrayWithObjects:
@"500501,500502,500503"
,@"500201,500202,500203"
,@"500201,500202,500203",nil];
_permissionsArray = [NSMutableArray arrayWithObjects:general,project,order,development, nil];
_permissionsArray = [NSMutableArray arrayWithObjects:general,project,order,viExamine,development, nil];
}
return _permissionsArray;
}
......@@ -334,7 +358,13 @@
sectionView.backgrundImageView.image = [image resizableImageWithCapInsets:UIEdgeInsetsMake(10, 10, 30, 30)resizingMode:UIImageResizingModeStretch];
}
break;
case 3://开发、HSE
case 3://VI检查
{
UIImage *image = [UIImage imageNamed:@"形状-1-副本-3"];
sectionView.backgrundImageView.image = [image resizableImageWithCapInsets:UIEdgeInsetsMake(10, 10, 30, 30) resizingMode:UIImageResizingModeStretch];
}
break;
case 4://开发、HSE
{
UIImage *image = [UIImage imageNamed:@"形状-1-副本-3"];
sectionView.backgrundImageView.image = [image resizableImageWithCapInsets:UIEdgeInsetsMake(10, 10, 30, 30) resizingMode:UIImageResizingModeStretch];
......@@ -375,11 +405,12 @@
break;
case 3:
{
if (indexPath.row == 2) {
[self patrol_StoryboardPush:indexPath];
}else {
[self ordinaryPush:indexPath];
}
break;
case 4:
{
[self ordinaryPush:indexPath];
}
break;
......@@ -413,8 +444,13 @@
#pragma mark -巡检storyboard跳转
- (void)patrol_StoryboardPush:(NSIndexPath *)indexPath
{
if (indexPath.item == 2) {
InspectionTableViewController *patrolResultVc = [InspectionTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_PATROLINSPECTRESULT];
[self PushViewController:patrolResultVc animated:YES];
}else {
PatrolTaskViewController *patrolTask = [PatrolTaskViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_PATROLINSPECT];
[self PushViewController:patrolTask animated:YES];
}
}
//根据个人查看权和本人查看权的范围确定是否有菜单权限
......
......@@ -232,7 +232,7 @@ NSString *const CELL = @"CustomInspectionTableViewCell";
- (void)updateHeaderView:(InspectionResultDetailsModel *)model;
{
self.title = model.store_name;
self.supervisionNameLabel.text = model.f_user_name;
self.supervisionNameLabel.text = model.user_name;
self.taskBegineTimeLabel.text = model.beginTime;
self.taskFinishTimeLabel.text = model.endTime;
self.totalScoreLabel.text = [NSString stringWithFormat:@"%.2lf",model.score];
......
......@@ -87,25 +87,14 @@
@implementation InspectionTableViewController
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
// self.headerView.hidden = NO;
// [self.navigationController.navigationBar addSubview:self.headerView];
}
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
// self.headerView.hidden = YES;
// [self.headerView removeFromSuperview];
}
- (void)viewDidLoad {
[super viewDidLoad];
[ICRUserUtil sharedInstance].f_user_uuid = @"2c9802135fa55b48015fa57f291101aa";
[ICRUserUtil sharedInstance].f_enterprise_uuid = @"2c9802135fa48878015fa488b5420151";
[self uiConfigAction];
[self addChooseButton];
}
#pragma mark - UI
......@@ -115,8 +104,6 @@
self.taskNumberTitleLabel.text = @"任务数";
self.supervisorTitleLabel.text = @"督导人数";
self.storeNumberTitleLabel.text = @"门店次数";
// self.headerView.alpha = self.tableView.mj_offsetY;
// self.headerView.frame = CGRectMake(0, 44, ScreenSize.width, 50);
}
#pragma mark -添加筛选按钮
......
......@@ -26,13 +26,13 @@
@property (nonatomic, copy) NSString *store_uuid;
@property (nonatomic, copy) NSString *f_user_code;
@property (nonatomic, copy) NSString *user_code;
@property (nonatomic, copy) NSString *store_code;
@property (nonatomic, copy) NSString *f_user_uuid;
@property (nonatomic, copy) NSString *user_uuid;
@property (nonatomic, copy) NSString *f_user_name;
@property (nonatomic, copy) NSString *user_name;
@property (nonatomic, copy) NSString *store_name;
......
......@@ -95,7 +95,7 @@
break;
case kICRQestionTypeScore://3评分类
{
_contentHeight = [self calculateStringHeight:[NSString stringWithFormat:@"%@分",self.score] size: CGSizeMake(ScreenSize.width-72-15, CGFLOAT_MAX)];
_contentHeight = [self calculateStringHeight:[NSString stringWithFormat:@"%@%@",self.score,@"分"] size: CGSizeMake(ScreenSize.width-72-15, CGFLOAT_MAX)];
}
break;
case kICRQestionTypeStoreInv://4库存调查类
......
......@@ -95,11 +95,11 @@
@property (nonatomic, strong) NSArray<Results> *results;
@property (nonatomic, copy) NSString *f_user_uuid;
@property (nonatomic, copy) NSString *user_uuid;
@property (nonatomic, copy) NSString *f_user_name;
@property (nonatomic, copy) NSString *user_name;
@property (nonatomic, copy) NSString *f_user_code;
@property (nonatomic, copy) NSString *user_code;
@end
......
......@@ -19,7 +19,7 @@
#pragma mark - 赋值
- (void)setModel:(Inspectors *)model
{
self.supervisionNameLabel.text = [NSString stringWithFormat:@"%@",model.f_user_name];
self.supervisionNameLabel.text = [NSString stringWithFormat:@"%@",model.user_name];
CGFloat storesCount = model.personStoreCount;
self.taskProgressLabel.text = [NSString stringWithFormat:@"%.0f%@(%ld/%.0f%@)",(model.finishCount/storesCount)*100.0,@"%",model.finishCount,storesCount,@"店"];
[self.progressView setProgress:model.finishCount / storesCount animated:YES];
......
......@@ -68,7 +68,6 @@
}else{
[self.standardVC hide];
}
}
- (IBAction)actionAttachment:(UIButton *)sender {
if (sender.isSelected && self.cellModel.viewModel.state.type != PatrolExamStateProcessing) {
......
......@@ -12,4 +12,9 @@
@property (weak, nonatomic) IBOutlet RadioButton *btnYes;
@property (weak, nonatomic) IBOutlet RadioButton *btnNo;
/**
忽略(无此项)
*/
@property (weak, nonatomic) IBOutlet RadioButton *btnIgnore;
@end
......@@ -26,18 +26,34 @@
if ([detail.index isEqualToNumber:@1]) {
self.btnYes.selected = YES;
self.btnNo.selected = NO;
self.btnIgnore.selected = NO;
}else if ([detail.index isEqualToNumber:@2]){
self.btnNo.selected = YES;
self.btnYes.selected = NO;
self.btnIgnore.selected = NO;
}else if ([detail.index isEqualToNumber:@3]){
self.btnNo.selected = NO;
self.btnYes.selected = NO;
self.btnIgnore.selected = YES;
}else {
self.btnYes.selected = NO;
self.btnNo.selected = NO;
self.btnIgnore.selected = NO;
}
}else {
[self.btnNo deselectAllButtons];
}
}
/**
选项点击事件
@param sender RadioButton
sender.tag
0 表示是
1 表示否
2 表示无此项
*/
- (IBAction)actionTap:(RadioButton *)sender {
ZJPatrolDetail_results_answers *answer = self.cellModel.getAnswer;
if (answer.details.count == 0) {
......@@ -48,8 +64,10 @@
ZJPatrolDetail_results_answers_details *detail = answer.details[0];
if (sender.tag == 0) {
detail.index = @1;
}else{
}else if (sender.tag == 1) {
detail.index = @2;
}else {
detail.index = @3;
}
self.cellModel.viewModel.blockAnswerAction();
//刷新标题图标
......@@ -57,3 +75,18 @@
}
@end
......@@ -24,6 +24,7 @@
{
self.delegate = self;
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
[[UIApplication sharedApplication] setStatusBarHidden:NO];
}
#pragma mark -重写push方法
......@@ -32,7 +33,7 @@
if (self.viewControllers.count > 0) {
viewController.hidesBottomBarWhenPushed = YES;
self.tabBarController.tabBar.hidden = YES;
viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:TCImage(@"back_icon") style:UIBarButtonItemStyleDone target:self action:@selector(backBarButtonItemClick)];
viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:TCImage(@"back") style:UIBarButtonItemStyleDone target:self action:@selector(backBarButtonItemClick)];
}
[super pushViewController:viewController animated:animated];
}
......
......@@ -17,6 +17,15 @@
* @param message 提示信息
* @param completed 完成回调
*/
- (void)showAlertViewController:(NSString *)message withCompleted:(void(^)())completed;
- (void)showAlertViewController:(NSString *)message withCompleted:(void(^)(void))completed;
/**
弹出框(默认从上向下动画,居中)
@param controller UIViewController
@param size 弹出框大小
*/
- (void)showController:(UIViewController *)controller size:(CGSize)size;
@end
......@@ -7,7 +7,7 @@
//
#import "BaseViewController.h"
#import "MZFormSheetPresentationController-Bridging-Header.h"
@interface BaseViewController ()
@end
......@@ -18,7 +18,6 @@
[super viewDidLoad];
[self createBackBtn];
[self uiConfigAction];
}
#pragma mark -创建返回按钮
......@@ -46,7 +45,7 @@
}
#pragma mark -UIAlertView
- (void)showAlertViewController:(NSString *)message withCompleted:(void(^)())completed
- (void)showAlertViewController:(NSString *)message withCompleted:(void(^)(void))completed
{
UIAlertController *alertVc = [UIAlertController alertControllerWithTitle:@"提示" message:message preferredStyle:UIAlertControllerStyleAlert];
[alertVc addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil]];
......@@ -58,19 +57,15 @@
[self presentViewController:alertVc animated:YES completion:nil];
}
#pragma mark -设置共用属性
- (void)uiConfigAction
#pragma mark -弹出框
- (void)showController:(UIViewController *)controller size:(CGSize)size
{
MZFormSheetPresentationViewController *formSheetController = [[MZFormSheetPresentationViewController alloc] initWithContentViewController:controller];
formSheetController.contentViewControllerTransitionStyle = MZFormSheetPresentationTransitionStyleSlideFromTop;
formSheetController.presentationController.shouldCenterVertically = YES;
formSheetController.presentationController.shouldDismissOnBackgroundViewTap = MZFormSheetPresentationTransitionStyleSlideFromTop;
formSheetController.presentationController.contentViewSize = size;
[self presentViewController:formSheetController animated:YES completion:nil];
}
- (void)dealloc
......
This diff is collapsed.
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "arrow.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "arrow@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "arrow@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "arrowopen@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "arrowopen@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "arrowturnoff@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "arrowturnoff@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "chooseBg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "chooseBg@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "complete.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "complete@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "complete@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "inspect_detail_info@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "inspect_detail_info@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "inspect_detail_location@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "inspect_detail_location@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "inspect_detail_top_bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "inspect_detail_top_bg@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
......@@ -2,13 +2,12 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "back.png"
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "back@2x.png"
"filename" : "inspect_result_noupload.png",
"scale" : "2x"
},
{
"idiom" : "universal",
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "inspect_result_noupload_Japan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "inspect_result_noupload_Japan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "location@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "location@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "location_red@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "location_red@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "not_ check@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "not_ check@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "person@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "person@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "result_back_icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "result_back_icon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "result_bottom_btn@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "result_bottom_btn@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "result_cercle_back@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "result_cercle_back@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "result_quicklook_commend.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "result_quicklook_commend@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "result_quicklook_commend@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "result_quicklook_comment.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "result_quicklook_comment@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "result_quicklook_comment@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "result_quicklook_rightIcon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "result_quicklook_rightIcon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "result_quicklook_rightIcon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "result_suo@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "result_suo@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "result_suofang@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "result_suofang@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "right.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "right@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "right@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"filename" : "store.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "store@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "store@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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