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
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment version="2304" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Inspection Table View Controller-->
<scene sceneID="HgA-Un-cXb">
<objects>
<viewController storyboardIdentifier="InspectionTableViewController" id="xvq-47-kfF" customClass="InspectionTableViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="H41-CP-sRp"/>
<viewControllerLayoutGuide type="bottom" id="pDw-hn-rz4"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="qKj-Ig-VCC">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="s80-Rh-XrJ">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<view key="tableHeaderView" clipsSubviews="YES" contentMode="scaleToFill" id="cN3-9P-rMc">
<rect key="frame" x="0.0" y="0.0" width="375" height="0.0"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ucw-bJ-0cy">
<rect key="frame" x="0.0" y="25" width="125" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="VaN-u8-bJB"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="35"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="任务数" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sPi-3V-mgb">
<rect key="frame" x="0.0" y="83" width="125" height="12"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ifu-8g-IkJ">
<rect key="frame" x="125" y="25" width="125" height="50"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="35"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="督导人数" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B0i-kW-V90">
<rect key="frame" x="125" y="83" width="125" height="12"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="门店次数" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yE3-77-mFt">
<rect key="frame" x="250" y="83" width="125" height="12"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qOP-f6-vrO">
<rect key="frame" x="125" y="25" width="1" height="60"/>
<color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="GhL-pD-7d7"/>
<constraint firstAttribute="height" constant="60" id="wcd-MN-3o5"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3lR-bU-E2u">
<rect key="frame" x="250" y="25" width="1" height="60"/>
<color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="OMf-4b-zmE"/>
<constraint firstAttribute="width" constant="1" id="rlk-jQ-qly"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h9y-4i-xGy">
<rect key="frame" x="250" y="25" width="125" height="50"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="35"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.2901960784" green="0.57254901960000004" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="qOP-f6-vrO" firstAttribute="top" secondItem="Ucw-bJ-0cy" secondAttribute="top" id="1R1-aD-dmU"/>
<constraint firstItem="B0i-kW-V90" firstAttribute="top" secondItem="Ifu-8g-IkJ" secondAttribute="bottom" constant="8" id="1oF-3A-Kkz"/>
<constraint firstItem="qOP-f6-vrO" firstAttribute="leading" secondItem="Ucw-bJ-0cy" secondAttribute="trailing" id="4Gl-6N-qzA"/>
<constraint firstItem="h9y-4i-xGy" firstAttribute="width" secondItem="Ucw-bJ-0cy" secondAttribute="width" id="6qZ-rW-Os0"/>
<constraint firstItem="Ifu-8g-IkJ" firstAttribute="height" secondItem="Ucw-bJ-0cy" secondAttribute="height" id="8jz-gR-vOB"/>
<constraint firstItem="yE3-77-mFt" firstAttribute="leading" secondItem="h9y-4i-xGy" secondAttribute="leading" id="9X2-yZ-44d"/>
<constraint firstItem="yE3-77-mFt" firstAttribute="trailing" secondItem="h9y-4i-xGy" secondAttribute="trailing" id="9vS-yF-7He"/>
<constraint firstItem="yE3-77-mFt" firstAttribute="centerY" secondItem="B0i-kW-V90" secondAttribute="centerY" id="A1K-9a-hiO"/>
<constraint firstItem="Ifu-8g-IkJ" firstAttribute="width" secondItem="Ucw-bJ-0cy" secondAttribute="width" id="Bsa-da-6eO"/>
<constraint firstItem="sPi-3V-mgb" firstAttribute="leading" secondItem="Ucw-bJ-0cy" secondAttribute="leading" id="FmK-iD-xg9"/>
<constraint firstItem="B0i-kW-V90" firstAttribute="trailing" secondItem="Ifu-8g-IkJ" secondAttribute="trailing" id="HZ0-qU-HIl"/>
<constraint firstItem="Ucw-bJ-0cy" firstAttribute="leading" secondItem="cN3-9P-rMc" secondAttribute="leading" id="LEX-Wa-tuh"/>
<constraint firstItem="3lR-bU-E2u" firstAttribute="centerY" secondItem="qOP-f6-vrO" secondAttribute="centerY" id="M2E-PV-tlO"/>
<constraint firstItem="Ucw-bJ-0cy" firstAttribute="top" secondItem="cN3-9P-rMc" secondAttribute="top" constant="25" id="Ptx-e8-wOr"/>
<constraint firstItem="Ifu-8g-IkJ" firstAttribute="centerY" secondItem="Ucw-bJ-0cy" secondAttribute="centerY" id="SL3-aN-7v0"/>
<constraint firstItem="h9y-4i-xGy" firstAttribute="leading" secondItem="Ifu-8g-IkJ" secondAttribute="trailing" id="Wbr-aO-DMM"/>
<constraint firstAttribute="trailing" secondItem="h9y-4i-xGy" secondAttribute="trailing" id="Yo9-sV-cHz"/>
<constraint firstItem="h9y-4i-xGy" firstAttribute="centerY" secondItem="Ifu-8g-IkJ" secondAttribute="centerY" id="aBb-fa-HhP"/>
<constraint firstItem="3lR-bU-E2u" firstAttribute="leading" secondItem="Ifu-8g-IkJ" secondAttribute="trailing" id="afG-hS-erN"/>
<constraint firstItem="sPi-3V-mgb" firstAttribute="trailing" secondItem="Ucw-bJ-0cy" secondAttribute="trailing" id="cen-JU-VZm"/>
<constraint firstItem="Ifu-8g-IkJ" firstAttribute="leading" secondItem="Ucw-bJ-0cy" secondAttribute="trailing" id="kGu-qL-phQ"/>
<constraint firstItem="h9y-4i-xGy" firstAttribute="height" secondItem="Ucw-bJ-0cy" secondAttribute="height" id="q1b-Uo-OFe"/>
<constraint firstItem="B0i-kW-V90" firstAttribute="leading" secondItem="Ifu-8g-IkJ" secondAttribute="leading" id="r0e-dC-n3G"/>
<constraint firstItem="sPi-3V-mgb" firstAttribute="top" secondItem="Ucw-bJ-0cy" secondAttribute="bottom" constant="8" id="vIl-tc-adk"/>
</constraints>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="InspectionPlanTableViewCell" rowHeight="226" id="GeO-1c-bvb" customClass="InspectionPlanTableViewCell">
<rect key="frame" x="0.0" y="55.5" width="375" height="226"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GeO-1c-bvb" id="5SH-BP-Y7j">
<rect key="frame" x="0.0" y="0.0" width="375" height="225.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" scrollEnabled="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="56" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Y0i-cN-lxX">
<rect key="frame" x="-0.5" y="-0.5" width="375" height="225.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SupervisionHeaderTableViewCell" rowHeight="50" id="nis-K6-Tu2" customClass="SupervisionHeaderTableViewCell">
<rect key="frame" x="0.0" y="28" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nis-K6-Tu2" id="djJ-iQ-bm5">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张俊豪" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j0W-Qd-rbB">
<rect key="frame" x="5" y="17" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="50%(1/2)店" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wLC-Ok-9HH">
<rect key="frame" x="312" y="18" width="58" height="14"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" red="0.2901960784" green="0.57254901960000004" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="X9n-d8-bl3">
<rect key="frame" x="0.0" y="47" width="375" height="1"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EeQ-48-DXr" customClass="M13ProgressViewStripedBar">
<rect key="frame" x="63" y="15" width="234" height="20"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="o25-Q1-taS"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="EeQ-48-DXr" firstAttribute="centerY" secondItem="j0W-Qd-rbB" secondAttribute="centerY" id="0wj-yo-fhH"/>
<constraint firstAttribute="trailing" secondItem="wLC-Ok-9HH" secondAttribute="trailing" constant="5" id="2N0-2M-e2Q"/>
<constraint firstItem="wLC-Ok-9HH" firstAttribute="centerY" secondItem="j0W-Qd-rbB" secondAttribute="centerY" id="3og-sW-hRo"/>
<constraint firstItem="EeQ-48-DXr" firstAttribute="leading" secondItem="j0W-Qd-rbB" secondAttribute="trailing" constant="15" id="E1p-F2-Nm5"/>
<constraint firstItem="j0W-Qd-rbB" firstAttribute="leading" secondItem="djJ-iQ-bm5" secondAttribute="leading" constant="5" id="HFP-Qw-OBB"/>
<constraint firstItem="wLC-Ok-9HH" firstAttribute="leading" secondItem="EeQ-48-DXr" secondAttribute="trailing" constant="15" id="MGp-hg-vBC"/>
<constraint firstItem="j0W-Qd-rbB" firstAttribute="centerY" secondItem="djJ-iQ-bm5" secondAttribute="centerY" id="hjG-Xg-kf1"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="progressView" destination="EeQ-48-DXr" id="1vX-zi-e7I"/>
<outlet property="supervisionNameLabel" destination="j0W-Qd-rbB" id="bBv-1a-VSk"/>
<outlet property="taskProgressLabel" destination="wLC-Ok-9HH" id="Qkp-ZR-mC8"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SupervisionTableViewCell" rowHeight="50" id="NPX-TP-b4O" customClass="SupervisionTableViewCell">
<rect key="frame" x="0.0" y="78" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NPX-TP-b4O" id="ca2-IB-tLU">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="unfinished" translatesAutoresizingMaskIntoConstraints="NO" id="z22-cw-uts">
<rect key="frame" x="15" y="19" width="14" height="13"/>
<constraints>
<constraint firstAttribute="width" constant="14" id="8Ud-nz-Nel"/>
<constraint firstAttribute="height" constant="13" id="xtb-Cf-fgt"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新北市门店" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EX7-36-LLM">
<rect key="frame" x="39" y="16.5" width="152.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5/10" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8aR-hu-6Nf">
<rect key="frame" x="211.5" y="16.5" width="28.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ghG-Ya-BBg">
<rect key="frame" x="0.0" y="49" width="375" height="1"/>
<color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="8Kq-dP-pnf"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right" translatesAutoresizingMaskIntoConstraints="NO" id="lj1-V6-A9t">
<rect key="frame" x="357" y="19" width="8" height="13"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="8" id="Fr2-Da-3G5"/>
<constraint firstAttribute="width" constant="8" id="Owk-fl-B1X"/>
<constraint firstAttribute="height" constant="13" id="avh-ad-yCK"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="13" id="orH-jW-sxc"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="40分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xGv-k8-CIa">
<rect key="frame" x="305" y="16.5" width="32" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="z22-cw-uts" firstAttribute="centerY" secondItem="ca2-IB-tLU" secondAttribute="centerY" id="1Bh-lz-DMb"/>
<constraint firstAttribute="trailing" secondItem="lj1-V6-A9t" secondAttribute="trailing" constant="10" id="6Ql-P2-590"/>
<constraint firstItem="z22-cw-uts" firstAttribute="leading" secondItem="ca2-IB-tLU" secondAttribute="leading" constant="15" id="9Jm-Be-eqI"/>
<constraint firstAttribute="bottom" secondItem="ghG-Ya-BBg" secondAttribute="bottom" id="B3n-wr-4PN"/>
<constraint firstItem="xGv-k8-CIa" firstAttribute="centerY" secondItem="lj1-V6-A9t" secondAttribute="centerY" id="DwG-er-VHt"/>
<constraint firstItem="EX7-36-LLM" firstAttribute="leading" secondItem="z22-cw-uts" secondAttribute="trailing" constant="10" id="PZU-XQ-Ap6"/>
<constraint firstItem="lj1-V6-A9t" firstAttribute="centerY" secondItem="ca2-IB-tLU" secondAttribute="centerY" id="UL6-p8-BdF"/>
<constraint firstItem="EX7-36-LLM" firstAttribute="centerY" secondItem="ca2-IB-tLU" secondAttribute="centerY" id="W2J-SN-aa0"/>
<constraint firstItem="8aR-hu-6Nf" firstAttribute="leading" secondItem="EX7-36-LLM" secondAttribute="trailing" constant="20" id="YcA-HH-VaC"/>
<constraint firstItem="lj1-V6-A9t" firstAttribute="leading" secondItem="xGv-k8-CIa" secondAttribute="trailing" constant="20" id="gVd-VL-cIh"/>
<constraint firstAttribute="trailing" secondItem="ghG-Ya-BBg" secondAttribute="trailing" id="pK2-nv-NKa"/>
<constraint firstItem="8aR-hu-6Nf" firstAttribute="centerX" secondItem="ca2-IB-tLU" secondAttribute="centerX" multiplier="1.2" id="qbu-9v-QO6"/>
<constraint firstItem="ghG-Ya-BBg" firstAttribute="leading" secondItem="ca2-IB-tLU" secondAttribute="leading" id="vuo-0e-Ys0"/>
<constraint firstItem="8aR-hu-6Nf" firstAttribute="centerY" secondItem="ca2-IB-tLU" secondAttribute="centerY" id="zh7-Fk-0VY"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="finishProgressLabel" destination="8aR-hu-6Nf" id="ZXC-Ux-97l"/>
<outlet property="scoreLabel" destination="xGv-k8-CIa" id="jr8-TW-4b4"/>
<outlet property="storesNameLabel" destination="EX7-36-LLM" id="o8K-z0-MlH"/>
<outlet property="taskStateImageView" destination="z22-cw-uts" id="u9Z-zi-IGu"/>
</connections>
</tableViewCell>
</prototypes>
</tableView>
</subviews>
</tableViewCellContentView>
<color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="supervisionTableView" destination="Y0i-cN-lxX" id="fTu-9F-pUH"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="InspectionHeaderTableViewCell" id="ynB-AX-2iY" customClass="InspectionHeaderTableViewCell">
<rect key="frame" x="0.0" y="281.5" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ynB-AX-2iY" id="K4a-nI-Wz1">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sa1-Rl-c3T">
<rect key="frame" x="0.0" y="0.0" width="5" height="44"/>
<color key="backgroundColor" red="0.2901960784" green="0.57254901960000004" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="5" id="z2e-E7-o7a"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="八月常规巡检" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q9f-cv-fHH">
<rect key="frame" x="20" y="12" width="98" height="20"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tdd-Iz-LlB">
<rect key="frame" x="-0.5" y="42.5" width="375" height="1"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="进行中" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iyI-aU-deR">
<rect key="frame" x="319" y="12" width="49" height="20"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
<color key="textColor" red="0.50196078430000002" green="0.74901960779999999" blue="0.20392156859999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="sa1-Rl-c3T" secondAttribute="bottom" id="872-Xv-ibC"/>
<constraint firstItem="iyI-aU-deR" firstAttribute="centerY" secondItem="K4a-nI-Wz1" secondAttribute="centerY" id="BxZ-X5-z9o"/>
<constraint firstItem="sa1-Rl-c3T" firstAttribute="leading" secondItem="K4a-nI-Wz1" secondAttribute="leading" id="Ds8-HA-L9s"/>
<constraint firstItem="iyI-aU-deR" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Q9f-cv-fHH" secondAttribute="trailing" constant="15" id="IFq-sG-WBU"/>
<constraint firstAttribute="trailing" secondItem="iyI-aU-deR" secondAttribute="trailing" constant="7" id="R2o-P3-ex0"/>
<constraint firstItem="Q9f-cv-fHH" firstAttribute="leading" secondItem="sa1-Rl-c3T" secondAttribute="trailing" constant="15" id="ZHx-HD-xLB"/>
<constraint firstItem="sa1-Rl-c3T" firstAttribute="top" secondItem="K4a-nI-Wz1" secondAttribute="top" id="pZh-0h-kOE"/>
<constraint firstItem="Q9f-cv-fHH" firstAttribute="centerY" secondItem="K4a-nI-Wz1" secondAttribute="centerY" id="qeG-mB-JXL"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="planNameLabel" destination="Q9f-cv-fHH" id="dMb-cJ-O4X"/>
<outlet property="planStateLabel" destination="iyI-aU-deR" id="0h0-L8-f7F"/>
</connections>
</tableViewCell>
</prototypes>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="s80-Rh-XrJ" secondAttribute="trailing" id="6ae-Kq-H4n"/>
<constraint firstItem="pDw-hn-rz4" firstAttribute="top" secondItem="s80-Rh-XrJ" secondAttribute="bottom" id="7me-Je-e51"/>
<constraint firstItem="s80-Rh-XrJ" firstAttribute="leading" secondItem="qKj-Ig-VCC" secondAttribute="leading" id="B8S-EF-7jn"/>
<constraint firstItem="s80-Rh-XrJ" firstAttribute="top" secondItem="H41-CP-sRp" secondAttribute="bottom" id="WeO-kf-B74"/>
</constraints>
</view>
<connections>
<outlet property="planNumberLabel" destination="Ucw-bJ-0cy" id="05k-Ub-6UU"/>
<outlet property="storeNumberTitleLabel" destination="yE3-77-mFt" id="16U-ZM-iN4"/>
<outlet property="storesNumberLabel" destination="h9y-4i-xGy" id="oY8-ZO-pud"/>
<outlet property="supervisionNumberLabel" destination="Ifu-8g-IkJ" id="Qow-TV-OIO"/>
<outlet property="supervisorTitleLabel" destination="B0i-kW-V90" id="JDv-uw-8uy"/>
<outlet property="tableView" destination="s80-Rh-XrJ" id="tFc-YV-Qap"/>
<outlet property="taskNumberTitleLabel" destination="sPi-3V-mgb" id="oih-EX-1Qx"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="PST-gS-4P7" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2051" y="161"/>
</scene>
<!--Inspection Detail Table View Controller-->
<scene sceneID="nMe-zq-bff">
<objects>
<tableViewController storyboardIdentifier="InspectionDetailTableViewController" id="bBv-YA-vca" customClass="InspectionDetailTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="6Su-sX-smv">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="eWw-xA-zTf" customClass="InspectionDetailTopView">
<rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mrb-NB-BQl">
<rect key="frame" x="0.0" y="0.0" width="375" height="122"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pIT-bc-dlt">
<rect key="frame" x="269.5" y="37.5" width="25" height="48"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="39E-1O-QiT">
<rect key="frame" x="266" y="19.5" width="31" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DAT-nL-GVt">
<rect key="frame" x="15" y="25" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="22"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u44-rr-O28">
<rect key="frame" x="15" y="30" width="158" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gaK-WZ-oQc">
<rect key="frame" x="15" y="35" width="158" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5gz-mV-0rc">
<rect key="frame" x="188" y="40" width="1" height="42"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="0.5" id="OOq-Ts-f7f"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dYd-Tu-cnB">
<rect key="frame" x="189" y="85.5" width="186" height="25"/>
<constraints>
<constraint firstAttribute="height" constant="25" id="yi0-CI-SmT"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" image="storeLocationIcon">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
</subviews>
<color key="backgroundColor" red="0.2470588235" green="0.52549019610000003" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="5gz-mV-0rc" firstAttribute="centerY" secondItem="Mrb-NB-BQl" secondAttribute="centerY" id="1kK-br-qP1"/>
<constraint firstItem="pIT-bc-dlt" firstAttribute="centerY" secondItem="Mrb-NB-BQl" secondAttribute="centerY" id="2wU-HG-6LT"/>
<constraint firstItem="u44-rr-O28" firstAttribute="top" secondItem="DAT-nL-GVt" secondAttribute="bottom" constant="5" id="4wk-jI-FKk"/>
<constraint firstItem="dYd-Tu-cnB" firstAttribute="centerX" secondItem="pIT-bc-dlt" secondAttribute="centerX" id="5cN-Ik-TDs"/>
<constraint firstItem="DAT-nL-GVt" firstAttribute="top" secondItem="Mrb-NB-BQl" secondAttribute="top" constant="25" id="6BO-z1-NyL"/>
<constraint firstAttribute="bottom" secondItem="5gz-mV-0rc" secondAttribute="bottom" constant="40" id="C5z-EC-K2n"/>
<constraint firstAttribute="trailing" secondItem="dYd-Tu-cnB" secondAttribute="trailing" id="EOg-qj-5Cp"/>
<constraint firstItem="39E-1O-QiT" firstAttribute="centerX" secondItem="pIT-bc-dlt" secondAttribute="centerX" id="EX0-16-xss"/>
<constraint firstItem="dYd-Tu-cnB" firstAttribute="top" secondItem="pIT-bc-dlt" secondAttribute="bottom" id="Gxi-V1-njJ"/>
<constraint firstItem="dYd-Tu-cnB" firstAttribute="leading" secondItem="5gz-mV-0rc" secondAttribute="trailing" id="JPa-BE-Gc1"/>
<constraint firstItem="gaK-WZ-oQc" firstAttribute="trailing" secondItem="u44-rr-O28" secondAttribute="trailing" id="Tni-Ee-CXF"/>
<constraint firstItem="u44-rr-O28" firstAttribute="leading" secondItem="DAT-nL-GVt" secondAttribute="leading" id="bg8-Uk-vYQ"/>
<constraint firstItem="5gz-mV-0rc" firstAttribute="leading" secondItem="u44-rr-O28" secondAttribute="trailing" constant="15" id="cdB-RS-thc"/>
<constraint firstItem="gaK-WZ-oQc" firstAttribute="top" secondItem="u44-rr-O28" secondAttribute="bottom" constant="5" id="dsv-Tk-YoM"/>
<constraint firstItem="DAT-nL-GVt" firstAttribute="leading" secondItem="Mrb-NB-BQl" secondAttribute="leading" constant="15" id="iVm-SN-sDA"/>
<constraint firstItem="pIT-bc-dlt" firstAttribute="centerX" secondItem="Mrb-NB-BQl" secondAttribute="centerX" multiplier="1.5" id="kEU-TF-n0w"/>
<constraint firstItem="5gz-mV-0rc" firstAttribute="top" secondItem="Mrb-NB-BQl" secondAttribute="top" constant="40" id="khB-V9-oDM"/>
<constraint firstItem="pIT-bc-dlt" firstAttribute="top" secondItem="39E-1O-QiT" secondAttribute="bottom" id="nwI-WP-73p"/>
<constraint firstItem="gaK-WZ-oQc" firstAttribute="leading" secondItem="u44-rr-O28" secondAttribute="leading" id="vvx-8t-HdA"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="检查项" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QC6-RO-4Zx">
<rect key="frame" x="15" y="132" width="46" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A2c-Ft-Idj">
<rect key="frame" x="260" y="123.5" width="100" height="35"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="HtX-3m-Z2F"/>
<constraint firstAttribute="height" constant="35" id="rfN-30-eZI"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="全部展开" image="arrowturnoff">
<color key="titleColor" red="0.2470588235" green="0.52549019610000003" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected" image="arrowopen"/>
<connections>
<action selector="allOpenOrCloseButtonClickAction:" destination="bBv-YA-vca" eventType="touchUpInside" id="Um3-ou-baD"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Mrb-NB-BQl" firstAttribute="top" secondItem="eWw-xA-zTf" secondAttribute="top" id="FJV-4v-ubb"/>
<constraint firstAttribute="bottom" secondItem="QC6-RO-4Zx" secondAttribute="bottom" constant="10" id="GNo-SE-cJp"/>
<constraint firstItem="QC6-RO-4Zx" firstAttribute="top" secondItem="Mrb-NB-BQl" secondAttribute="bottom" constant="10" id="Heh-Dz-4cS"/>
<constraint firstItem="QC6-RO-4Zx" firstAttribute="leading" secondItem="eWw-xA-zTf" secondAttribute="leading" constant="15" id="XZa-TO-i1N"/>
<constraint firstItem="A2c-Ft-Idj" firstAttribute="centerY" secondItem="QC6-RO-4Zx" secondAttribute="centerY" id="aBE-d9-pME"/>
<constraint firstItem="Mrb-NB-BQl" firstAttribute="leading" secondItem="eWw-xA-zTf" secondAttribute="leading" id="pZt-rz-Lbu"/>
<constraint firstAttribute="trailing" secondItem="A2c-Ft-Idj" secondAttribute="trailing" constant="15" id="thv-8L-j2c"/>
<constraint firstAttribute="trailing" secondItem="Mrb-NB-BQl" secondAttribute="trailing" id="xof-r8-Izl"/>
</constraints>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="InspectionDetailsSectionTableViewCell" rowHeight="50" id="Zxd-vm-rpS" customClass="InspectionDetailsSectionTableViewCell">
<rect key="frame" x="0.0" y="215.5" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Zxd-vm-rpS" id="AFv-iz-vIl">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="店内情况" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aRJ-7M-ms3">
<rect key="frame" x="15" y="16" width="65.5" height="19.5"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FMM-FO-BlG">
<rect key="frame" x="0.0" y="49.5" width="375" height="1"/>
<color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="99a-hq-3R8"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="aRJ-7M-ms3" firstAttribute="centerY" secondItem="AFv-iz-vIl" secondAttribute="centerY" id="0hJ-Mr-ycA"/>
<constraint firstItem="FMM-FO-BlG" firstAttribute="leading" secondItem="AFv-iz-vIl" secondAttribute="leading" id="Eod-4r-m1F"/>
<constraint firstAttribute="trailing" secondItem="FMM-FO-BlG" secondAttribute="trailing" id="Kv5-wG-xuL"/>
<constraint firstItem="aRJ-7M-ms3" firstAttribute="leading" secondItem="AFv-iz-vIl" secondAttribute="leading" constant="15" id="xy9-Sf-abp"/>
<constraint firstAttribute="bottom" secondItem="FMM-FO-BlG" secondAttribute="bottom" id="yAU-Vb-2Y3"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="categoryTitleLabel" destination="aRJ-7M-ms3" id="tga-aO-umL"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="bBv-YA-vca" id="FtT-bU-Utu"/>
<outlet property="delegate" destination="bBv-YA-vca" id="eYr-Jv-hnf"/>
</connections>
</tableView>
<connections>
<outlet property="allSectionOpenButton" destination="A2c-Ft-Idj" id="kUE-Rk-6hH"/>
<outlet property="checkItemsLabel" destination="QC6-RO-4Zx" id="t2d-OG-3lI"/>
<outlet property="storeButton" destination="dYd-Tu-cnB" id="Gkh-Tk-70E"/>
<outlet property="supervisionNameLabel" destination="DAT-nL-GVt" id="O0m-ks-CH2"/>
<outlet property="taskBegineTimeLabel" destination="u44-rr-O28" id="Fne-kS-rZ0"/>
<outlet property="taskFinishTimeLabel" destination="gaK-WZ-oQc" id="Vyq-Rh-qaN"/>
<outlet property="totalScoreLabel" destination="pIT-bc-dlt" id="TLi-1D-Sw9"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="yVc-ir-W2E" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1339.5" y="-635.5"/>
</scene>
<!--Inspection Answer View Controller-->
<scene sceneID="YaH-BV-0HC">
<objects>
<tableViewController storyboardIdentifier="InspectionAnswerViewController" id="qXf-wp-nVq" customClass="InspectionAnswerViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="131" sectionHeaderHeight="28" sectionFooterHeight="28" id="Sbl-79-kDa">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="InspectionAnswerTableViewCell" rowHeight="72" id="62z-HN-n7Y" customClass="InspectionAnswerTableViewCell">
<rect key="frame" x="0.0" y="28" width="375" height="72"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="62z-HN-n7Y" id="hrx-wx-tmO">
<rect key="frame" x="0.0" y="0.0" width="375" height="72"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="adasdas " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VWf-zl-NYm">
<rect key="frame" x="15" y="10" width="345" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.2470588235" green="0.52549019610000003" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="nini" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ail-Be-qGe">
<rect key="frame" x="15" y="37" width="345" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.2470588235" green="0.52549019610000003" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="VWf-zl-NYm" secondAttribute="trailing" constant="15" id="9VJ-tP-bfJ"/>
<constraint firstItem="VWf-zl-NYm" firstAttribute="top" secondItem="hrx-wx-tmO" secondAttribute="top" constant="10" id="KFS-oj-OOk"/>
<constraint firstItem="ail-Be-qGe" firstAttribute="leading" secondItem="hrx-wx-tmO" secondAttribute="leading" constant="15" id="KaK-Mh-u4g"/>
<constraint firstItem="ail-Be-qGe" firstAttribute="top" secondItem="VWf-zl-NYm" secondAttribute="bottom" constant="10" id="h2k-gp-16Y"/>
<constraint firstAttribute="trailing" secondItem="ail-Be-qGe" secondAttribute="trailing" constant="15" id="nfo-yQ-6O9"/>
<constraint firstItem="VWf-zl-NYm" firstAttribute="leading" secondItem="hrx-wx-tmO" secondAttribute="leading" constant="15" id="uxY-y9-69U"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="contentLabel" destination="VWf-zl-NYm" id="TPz-7N-Irs"/>
<outlet property="remarkContentLabel" destination="ail-Be-qGe" id="bkJ-RE-isu"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="InspectionAnswerSectionView" rowHeight="50" id="ccW-kg-24C" customClass="InspectionAnswerSectionView">
<rect key="frame" x="0.0" y="100" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ccW-kg-24C" id="1nY-7e-tnH">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrowright" translatesAutoresizingMaskIntoConstraints="NO" id="klG-4p-T5q">
<rect key="frame" x="10" y="18" width="10" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="14" id="45p-Sv-PDi"/>
<constraint firstAttribute="width" constant="10" id="jR2-dy-M4n"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="50分" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="isC-uv-anA">
<rect key="frame" x="339.5" y="18" width="27.5" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" text="1.是否每个展厅都有人员参加聚会" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D6X-kS-8g8">
<rect key="frame" x="30" y="16.5" width="210" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="isC-uv-anA" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="D6X-kS-8g8" secondAttribute="trailing" constant="10" id="8ss-ol-rbv"/>
<constraint firstAttribute="trailing" secondItem="isC-uv-anA" secondAttribute="trailing" constant="8" id="Je0-nH-1ut"/>
<constraint firstItem="D6X-kS-8g8" firstAttribute="leading" secondItem="klG-4p-T5q" secondAttribute="trailing" constant="10" id="Kup-ix-wca"/>
<constraint firstItem="klG-4p-T5q" firstAttribute="centerY" secondItem="1nY-7e-tnH" secondAttribute="centerY" id="Kxl-qO-sVS"/>
<constraint firstItem="klG-4p-T5q" firstAttribute="leading" secondItem="1nY-7e-tnH" secondAttribute="leading" constant="10" id="h33-xS-mjr"/>
<constraint firstItem="D6X-kS-8g8" firstAttribute="centerY" secondItem="klG-4p-T5q" secondAttribute="centerY" id="iGF-Kd-SyD"/>
<constraint firstItem="isC-uv-anA" firstAttribute="centerY" secondItem="1nY-7e-tnH" secondAttribute="centerY" id="pA6-8P-t1O"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="arrowImageView" destination="klG-4p-T5q" id="YZG-kZ-wJp"/>
<outlet property="scoreLabel" destination="isC-uv-anA" id="zlP-tz-DdS"/>
<outlet property="titleLabel" destination="D6X-kS-8g8" id="Pvr-I2-rrU"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="qXf-wp-nVq" id="oOm-qb-EiV"/>
<outlet property="delegate" destination="qXf-wp-nVq" id="9bX-Xw-xEj"/>
</connections>
</tableView>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KgZ-cE-a7u" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2050.5" y="-584.5"/>
</scene>
<!--Inspection Photo View Controller-->
<scene sceneID="xJt-ad-gIR">
<objects>
<collectionViewController storyboardIdentifier="InspectionPhotoViewController" id="fpO-ud-jcm" customClass="InspectionPhotoViewController" sceneMemberID="viewController">
<collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="7Vq-GG-dIW">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="TQQ-HS-Uxj">
<size key="itemSize" width="140" height="119"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="InspectionPhotoCollectionViewCell" id="qIP-lP-rsZ" customClass="InspectionPhotoCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="140" height="119"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="140" height="119"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="C82-mA-a9y">
<rect key="frame" x="0.0" y="0.0" width="140" height="119"/>
</imageView>
</subviews>
</view>
<constraints>
<constraint firstItem="C82-mA-a9y" firstAttribute="top" secondItem="qIP-lP-rsZ" secondAttribute="top" id="04c-68-AmL"/>
<constraint firstItem="C82-mA-a9y" firstAttribute="leading" secondItem="qIP-lP-rsZ" secondAttribute="leading" id="gsV-KJ-f47"/>
<constraint firstAttribute="bottom" secondItem="C82-mA-a9y" secondAttribute="bottom" id="ib4-XM-pA4"/>
<constraint firstAttribute="trailing" secondItem="C82-mA-a9y" secondAttribute="trailing" id="rAu-ep-t3K"/>
</constraints>
<connections>
<outlet property="inspectionImageView" destination="C82-mA-a9y" id="1mI-bl-rZe"/>
</connections>
</collectionViewCell>
</cells>
<connections>
<outlet property="dataSource" destination="fpO-ud-jcm" id="zZH-EO-rzI"/>
<outlet property="delegate" destination="fpO-ud-jcm" id="A4m-Ug-HRr"/>
</connections>
</collectionView>
<connections>
<outlet property="inspectionCollectionFlowLayout" destination="TQQ-HS-Uxj" id="AMl-Y6-b59"/>
<outlet property="inspectionPhotoCollectionView" destination="7Vq-GG-dIW" id="IDd-Sb-5ac"/>
</connections>
</collectionViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Fk0-dO-xs6" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2726.5" y="-567.5"/>
</scene>
</scenes>
<resources>
<image name="arrowopen" width="13" height="11"/>
<image name="arrowright" width="5" height="8"/>
<image name="arrowturnoff" width="13" height="11"/>
<image name="right" width="8" height="13"/>
<image name="storeLocationIcon" width="13" height="18"/>
<image name="unfinished" width="14" height="13"/>
</resources>
</document>
......@@ -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
......@@ -411,7 +411,7 @@
<constraint firstAttribute="height" constant="35" id="QNv-IE-kzY"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="標準サンプル" image="patrol_exam_book" backgroundImage="patrol_exam_btn_bg">
<state key="normal" title="参考标准" image="patrol_exam_book" backgroundImage="patrol_exam_btn_bg">
<color key="titleColor" red="0.22078338929999999" green="0.53145974870000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected">
......@@ -484,15 +484,14 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a0Z-TS-x2W">
<rect key="frame" x="16" y="0.0" width="171.5" height="55.5"/>
<rect key="frame" x="0.0" y="0.0" width="125" height="56"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b6w-7H-Sr8" customClass="RadioButton">
<rect key="frame" x="55" y="12" width="60" height="30"/>
<rect key="frame" x="31.5" y="12.5" width="62.5" height="31"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="Xgu-AE-ZjX"/>
<constraint firstAttribute="height" constant="30" id="vGO-Lk-gmk"/>
<constraint firstAttribute="width" secondItem="b6w-7H-Sr8" secondAttribute="height" multiplier="1:0.5" id="s77-bb-s75"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="是" backgroundImage="yes_or_no">
<color key="titleColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
......@@ -507,20 +506,20 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="b6w-7H-Sr8" firstAttribute="centerX" secondItem="a0Z-TS-x2W" secondAttribute="centerX" id="SdK-Ie-Zqq"/>
<constraint firstItem="b6w-7H-Sr8" firstAttribute="centerY" secondItem="a0Z-TS-x2W" secondAttribute="centerY" id="tG8-mg-OXB"/>
<constraint firstItem="b6w-7H-Sr8" firstAttribute="width" secondItem="a0Z-TS-x2W" secondAttribute="width" multiplier="0.5" id="2Ob-pA-WCe"/>
<constraint firstItem="b6w-7H-Sr8" firstAttribute="centerX" secondItem="a0Z-TS-x2W" secondAttribute="centerX" id="Hz3-Kp-pi5"/>
<constraint firstItem="b6w-7H-Sr8" firstAttribute="centerY" secondItem="a0Z-TS-x2W" secondAttribute="centerY" id="q01-WS-6mm"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bdU-cd-PoN">
<rect key="frame" x="187.5" y="0.0" width="171.5" height="55.5"/>
<rect key="frame" x="125" y="0.0" width="125" height="56"/>
<subviews>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oty-Ot-G0r" customClass="RadioButton">
<rect key="frame" x="55.5" y="13" width="60" height="30"/>
<rect key="frame" x="31.5" y="12.5" width="62.5" height="31"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="aLY-bF-TZu"/>
<constraint firstAttribute="width" constant="60" id="cuj-Bo-Yr6"/>
<constraint firstAttribute="width" secondItem="oty-Ot-G0r" secondAttribute="height" multiplier="1:0.5" id="Pda-jZ-HMj"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="否" backgroundImage="yes_or_no">
<color key="titleColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
......@@ -535,24 +534,58 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="oty-Ot-G0r" firstAttribute="centerX" secondItem="bdU-cd-PoN" secondAttribute="centerX" id="SW1-Au-68R"/>
<constraint firstItem="oty-Ot-G0r" firstAttribute="centerY" secondItem="bdU-cd-PoN" secondAttribute="centerY" id="lWu-RH-Wmw"/>
<constraint firstItem="oty-Ot-G0r" firstAttribute="centerY" secondItem="bdU-cd-PoN" secondAttribute="centerY" id="YxA-gH-zpD"/>
<constraint firstItem="oty-Ot-G0r" firstAttribute="centerX" secondItem="bdU-cd-PoN" secondAttribute="centerX" id="aTY-Ka-otr"/>
<constraint firstItem="oty-Ot-G0r" firstAttribute="width" secondItem="bdU-cd-PoN" secondAttribute="width" multiplier="0.5" id="cnL-J5-cpd"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A9r-5Q-knj">
<rect key="frame" x="250" y="0.0" width="125" height="56"/>
<subviews>
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qUV-z7-0xE" customClass="RadioButton">
<rect key="frame" x="31.5" y="12.5" width="62.5" height="31"/>
<constraints>
<constraint firstAttribute="width" secondItem="qUV-z7-0xE" secondAttribute="height" multiplier="1:0.5" id="Jcu-F7-gX0"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="无此项" backgroundImage="yes_or_no">
<color key="titleColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected" backgroundImage="patrol_exam_whether_select">
<color key="titleColor" red="0.22078338929999999" green="0.53145974870000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="actionTap:" destination="M4h-kp-kp9" eventType="touchUpInside" id="q9W-tq-mSf"/>
<outletCollection property="groupButtons" destination="oty-Ot-G0r" id="eQZ-jp-0mf"/>
<outletCollection property="groupButtons" destination="b6w-7H-Sr8" id="D51-jY-LNr"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="qUV-z7-0xE" firstAttribute="centerX" secondItem="A9r-5Q-knj" secondAttribute="centerX" id="34W-iy-VrT"/>
<constraint firstItem="qUV-z7-0xE" firstAttribute="width" secondItem="A9r-5Q-knj" secondAttribute="width" multiplier="0.5" id="NdO-qi-t8d"/>
<constraint firstItem="qUV-z7-0xE" firstAttribute="centerY" secondItem="A9r-5Q-knj" secondAttribute="centerY" id="d2f-0b-RAO"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="a0Z-TS-x2W" firstAttribute="top" secondItem="GB0-BO-nUj" secondAttribute="top" id="10b-5j-krR"/>
<constraint firstItem="bdU-cd-PoN" firstAttribute="leading" secondItem="a0Z-TS-x2W" secondAttribute="trailing" id="9nV-zl-RVg"/>
<constraint firstItem="bdU-cd-PoN" firstAttribute="leading" secondItem="a0Z-TS-x2W" secondAttribute="trailing" id="Iz0-Tw-s3Y"/>
<constraint firstAttribute="bottom" secondItem="a0Z-TS-x2W" secondAttribute="bottom" id="Moa-mC-MnT"/>
<constraint firstItem="a0Z-TS-x2W" firstAttribute="width" secondItem="bdU-cd-PoN" secondAttribute="width" id="Npu-YL-uei"/>
<constraint firstAttribute="bottom" secondItem="bdU-cd-PoN" secondAttribute="bottom" id="U8Z-sP-IU5"/>
<constraint firstItem="a0Z-TS-x2W" firstAttribute="leading" secondItem="GB0-BO-nUj" secondAttribute="leading" constant="16" id="kTB-Fu-np5"/>
<constraint firstItem="bdU-cd-PoN" firstAttribute="top" secondItem="GB0-BO-nUj" secondAttribute="top" id="r4k-Hq-1Hg"/>
<constraint firstAttribute="trailing" secondItem="bdU-cd-PoN" secondAttribute="trailing" constant="16" id="xEw-TR-Jim"/>
<constraint firstAttribute="bottom" secondItem="a0Z-TS-x2W" secondAttribute="bottom" id="1PC-d2-b30"/>
<constraint firstAttribute="bottom" secondItem="A9r-5Q-knj" secondAttribute="bottom" id="8ry-CE-SwI"/>
<constraint firstAttribute="trailing" secondItem="A9r-5Q-knj" secondAttribute="trailing" id="C3T-gi-aND"/>
<constraint firstItem="bdU-cd-PoN" firstAttribute="width" secondItem="a0Z-TS-x2W" secondAttribute="width" id="G5n-rk-bkq"/>
<constraint firstItem="a0Z-TS-x2W" firstAttribute="top" secondItem="GB0-BO-nUj" secondAttribute="top" id="Q1w-dA-83F"/>
<constraint firstItem="bdU-cd-PoN" firstAttribute="leading" secondItem="a0Z-TS-x2W" secondAttribute="trailing" id="R2O-p6-Kny"/>
<constraint firstItem="A9r-5Q-knj" firstAttribute="top" secondItem="GB0-BO-nUj" secondAttribute="top" id="Zf1-Yv-bpJ"/>
<constraint firstItem="bdU-cd-PoN" firstAttribute="top" secondItem="GB0-BO-nUj" secondAttribute="top" id="cNI-Ap-6gm"/>
<constraint firstItem="A9r-5Q-knj" firstAttribute="width" secondItem="a0Z-TS-x2W" secondAttribute="width" id="rmp-uu-yuo"/>
<constraint firstAttribute="bottom" secondItem="bdU-cd-PoN" secondAttribute="bottom" id="u0Q-dY-cjf"/>
<constraint firstItem="A9r-5Q-knj" firstAttribute="leading" secondItem="bdU-cd-PoN" secondAttribute="trailing" id="wJL-jh-4rQ"/>
<constraint firstItem="a0Z-TS-x2W" firstAttribute="leading" secondItem="GB0-BO-nUj" secondAttribute="leading" id="xTp-aW-qyJ"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="btnIgnore" destination="qUV-z7-0xE" id="4o9-2r-ysh"/>
<outlet property="btnNo" destination="oty-Ot-G0r" id="5ne-VD-ljq"/>
<outlet property="btnYes" destination="b6w-7H-Sr8" id="btK-bu-0u9"/>
</connections>
......@@ -643,13 +676,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8c3-Vm-FhT">
<rect key="frame" x="40" y="60" width="295" height="567"/>
<rect key="frame" x="37.5" y="108.5" width="300" height="450"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hdB-xA-4Tt">
<rect key="frame" x="0.0" y="523" width="295" height="44"/>
<rect key="frame" x="0.0" y="406" width="300" height="44"/>
<color key="backgroundColor" red="0.21755459899999999" green="0.53306800129999998" blue="0.99824184179999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="81b-fG-dmq"/>
<constraint firstAttribute="height" constant="44" id="kSG-v0-hm9"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="返回">
......@@ -661,9 +694,9 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="参考标准" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z6u-RH-6bg">
<rect key="frame" x="0.0" y="0.0" width="295" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="300" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="nlO-po-Qzs"/>
<constraint firstAttribute="height" constant="50" id="geU-YP-6No"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="21"/>
<nil key="highlightedColor"/>
......@@ -672,10 +705,10 @@
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="74x-rw-wV3">
<rect key="frame" x="235" y="0.0" width="60" height="60"/>
<rect key="frame" x="240" y="0.0" width="60" height="60"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="F2c-Jh-5ZV"/>
<constraint firstAttribute="height" constant="60" id="eg2-Xm-RbF"/>
<constraint firstAttribute="height" constant="60" id="73X-do-BpY"/>
<constraint firstAttribute="width" constant="60" id="nTG-qf-8Yn"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="34"/>
<inset key="titleEdgeInsets" minX="20" minY="0.0" maxX="0.0" maxY="20"/>
......@@ -688,18 +721,18 @@
</connections>
</button>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="95" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="jaM-Kh-HFB">
<rect key="frame" x="0.0" y="60" width="295" height="463"/>
<rect key="frame" x="0.0" y="60" width="300" height="346"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ZJStandardTitleTableViewCell" rowHeight="125" id="n1v-qx-1Pq" customClass="ZJStandardTitleTableViewCell">
<rect key="frame" x="0.0" y="28" width="295" height="125"/>
<rect key="frame" x="0.0" y="28" width="300" height="125"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="n1v-qx-1Pq" id="X9W-mT-NDT">
<rect key="frame" x="0.0" y="0.0" width="295" height="125"/>
<rect key="frame" x="0.0" y="0.0" width="300" height="125"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.员工是否正常佩戴胸牌" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z0w-ck-3m2">
<rect key="frame" x="8" y="8" width="279" height="30"/>
<rect key="frame" x="8" y="8" width="284" height="30"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="PdU-Wt-8Og"/>
</constraints>
......@@ -708,7 +741,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="参考标准:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f5b-1s-79g">
<rect key="frame" x="8" y="38" width="279" height="24"/>
<rect key="frame" x="8" y="38" width="284" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="rwE-3U-EYm"/>
</constraints>
......@@ -720,7 +753,7 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1.哈哈哈哈" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZVJ-xd-FYa">
<rect key="frame" x="30" y="62" width="257" height="21.5"/>
<rect key="frame" x="30" y="62" width="262" height="21.5"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21.5" id="0Nh-vV-b3M"/>
</constraints>
......@@ -729,7 +762,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="参考图片:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z9s-Sg-EJe">
<rect key="frame" x="8" y="99.5" width="279" height="24"/>
<rect key="frame" x="8" y="99.5" width="284" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="kE2-Xp-uWV"/>
</constraints>
......@@ -764,14 +797,14 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ZJStandardPictureTableViewCell" rowHeight="169" id="7xl-dl-ayp" customClass="ZJStandardPictureTableViewCell">
<rect key="frame" x="0.0" y="153" width="295" height="169"/>
<rect key="frame" x="0.0" y="153" width="300" height="169"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7xl-dl-ayp" id="gdK-gm-Pzo">
<rect key="frame" x="0.0" y="0.0" width="295" height="169"/>
<rect key="frame" x="0.0" y="0.0" width="300" height="169"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ellipse-0" translatesAutoresizingMaskIntoConstraints="NO" id="hMS-bj-EYp">
<rect key="frame" x="8" y="8" width="279" height="161"/>
<rect key="frame" x="8" y="8" width="104" height="60"/>
<constraints>
<constraint firstAttribute="width" secondItem="hMS-bj-EYp" secondAttribute="height" multiplier="279:161" id="XXY-Bd-xOY"/>
</constraints>
......@@ -797,18 +830,19 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="jaM-Kh-HFB" firstAttribute="top" secondItem="74x-rw-wV3" secondAttribute="bottom" id="5Mq-Gk-EH5"/>
<constraint firstItem="Z6u-RH-6bg" firstAttribute="top" secondItem="8c3-Vm-FhT" secondAttribute="top" id="8GG-Zg-Zi1"/>
<constraint firstAttribute="bottom" secondItem="hdB-xA-4Tt" secondAttribute="bottom" id="GNs-RA-ncc"/>
<constraint firstItem="hdB-xA-4Tt" firstAttribute="leading" secondItem="8c3-Vm-FhT" secondAttribute="leading" id="LQL-VT-CbH"/>
<constraint firstItem="hdB-xA-4Tt" firstAttribute="top" secondItem="jaM-Kh-HFB" secondAttribute="bottom" id="MVa-Hx-hFd"/>
<constraint firstAttribute="trailing" secondItem="hdB-xA-4Tt" secondAttribute="trailing" id="MWn-gh-Npf"/>
<constraint firstAttribute="trailing" secondItem="74x-rw-wV3" secondAttribute="trailing" id="QdE-aq-qeC"/>
<constraint firstAttribute="trailing" secondItem="Z6u-RH-6bg" secondAttribute="trailing" id="XCg-UI-xPm"/>
<constraint firstAttribute="trailing" secondItem="jaM-Kh-HFB" secondAttribute="trailing" id="XvF-BF-5VU"/>
<constraint firstItem="jaM-Kh-HFB" firstAttribute="leading" secondItem="8c3-Vm-FhT" secondAttribute="leading" id="kDZ-P0-lE0"/>
<constraint firstItem="Z6u-RH-6bg" firstAttribute="leading" secondItem="8c3-Vm-FhT" secondAttribute="leading" id="n50-Io-wzB"/>
<constraint firstItem="74x-rw-wV3" firstAttribute="top" secondItem="8c3-Vm-FhT" secondAttribute="top" id="zPv-Sg-sYp"/>
<constraint firstItem="jaM-Kh-HFB" firstAttribute="leading" secondItem="8c3-Vm-FhT" secondAttribute="leading" id="50g-oj-qPy"/>
<constraint firstAttribute="bottom" secondItem="hdB-xA-4Tt" secondAttribute="bottom" id="523-M7-vbm"/>
<constraint firstItem="hdB-xA-4Tt" firstAttribute="leading" secondItem="8c3-Vm-FhT" secondAttribute="leading" id="8XI-Us-6Yg"/>
<constraint firstItem="74x-rw-wV3" firstAttribute="top" secondItem="8c3-Vm-FhT" secondAttribute="top" id="E86-Mh-TsM"/>
<constraint firstAttribute="trailing" secondItem="74x-rw-wV3" secondAttribute="trailing" id="G7v-dg-Cz8"/>
<constraint firstItem="Z6u-RH-6bg" firstAttribute="top" secondItem="8c3-Vm-FhT" secondAttribute="top" id="Ljr-vd-QvD"/>
<constraint firstItem="jaM-Kh-HFB" firstAttribute="top" secondItem="74x-rw-wV3" secondAttribute="bottom" id="TUG-Hr-sAv"/>
<constraint firstAttribute="width" secondItem="8c3-Vm-FhT" secondAttribute="height" multiplier="100:150" id="VpH-uC-oXp"/>
<constraint firstAttribute="trailing" secondItem="Z6u-RH-6bg" secondAttribute="trailing" id="dp6-IB-0DH"/>
<constraint firstAttribute="trailing" secondItem="jaM-Kh-HFB" secondAttribute="trailing" id="plD-5m-zL5"/>
<constraint firstItem="Z6u-RH-6bg" firstAttribute="leading" secondItem="8c3-Vm-FhT" secondAttribute="leading" id="yNT-i6-hxm"/>
<constraint firstItem="hdB-xA-4Tt" firstAttribute="top" secondItem="jaM-Kh-HFB" secondAttribute="bottom" id="zRD-bc-49z"/>
<constraint firstAttribute="trailing" secondItem="hdB-xA-4Tt" secondAttribute="trailing" id="zzv-Jx-NNv"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
......@@ -819,16 +853,14 @@
</subviews>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="8c3-Vm-FhT" firstAttribute="top" secondItem="oih-Zp-OTD" secondAttribute="bottom" constant="40" id="8bn-3T-olU"/>
<constraint firstItem="hao-Zw-sRP" firstAttribute="top" secondItem="8c3-Vm-FhT" secondAttribute="bottom" constant="40" id="HGH-Gd-SoN"/>
<constraint firstItem="8c3-Vm-FhT" firstAttribute="leading" secondItem="zNJ-sg-GLE" secondAttribute="leading" constant="40" id="jYY-Jg-MFA"/>
<constraint firstAttribute="trailing" secondItem="8c3-Vm-FhT" secondAttribute="trailing" constant="40" id="vAv-cj-H3C"/>
<constraint firstItem="8c3-Vm-FhT" firstAttribute="width" secondItem="zNJ-sg-GLE" secondAttribute="width" multiplier="0.8" id="DJO-Ne-aZw"/>
<constraint firstItem="8c3-Vm-FhT" firstAttribute="centerY" secondItem="zNJ-sg-GLE" secondAttribute="centerY" id="euQ-KD-pUJ"/>
<constraint firstItem="8c3-Vm-FhT" firstAttribute="centerX" secondItem="zNJ-sg-GLE" secondAttribute="centerX" id="hLE-Dm-n7z"/>
</constraints>
</view>
<connections>
<outlet property="alertCard" destination="8c3-Vm-FhT" id="jyY-f6-s4V"/>
<outlet property="backButton" destination="hdB-xA-4Tt" id="CdK-d1-V5A"/>
<outlet property="constrainToBottom" destination="HGH-Gd-SoN" id="xge-1v-Uy5"/>
<outlet property="tableView" destination="jaM-Kh-HFB" id="cLI-sX-QUG"/>
</connections>
</viewController>
......@@ -849,7 +881,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d9O-dj-1dW">
<rect key="frame" x="37.5" y="161" width="300" height="346"/>
<rect key="frame" x="37.5" y="160.5" width="300" height="346"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认开始检查?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4GV-5n-YMU">
<rect key="frame" x="0.5" y="10" width="300" height="50"/>
......@@ -1023,6 +1055,7 @@
<constraint firstItem="d9O-dj-1dW" firstAttribute="centerY" secondItem="vfP-ZP-MQx" secondAttribute="centerY" id="2gO-pF-4JU"/>
<constraint firstItem="d9O-dj-1dW" firstAttribute="width" secondItem="vfP-ZP-MQx" secondAttribute="width" multiplier="0.8" id="QRi-Yy-mD4"/>
<constraint firstItem="d9O-dj-1dW" firstAttribute="centerX" secondItem="vfP-ZP-MQx" secondAttribute="centerX" id="aYz-cX-bSo"/>
<constraint firstItem="B4c-vx-5xB" firstAttribute="top" secondItem="d9O-dj-1dW" secondAttribute="bottom" priority="999" constant="100" id="vnb-f7-awf"/>
</constraints>
</view>
<connections>
......
......@@ -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
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" 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="13174"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--筛选-->
<scene sceneID="nKP-wa-yRg">
<objects>
<tableViewController storyboardIdentifier="FilterListViewController" title="筛选" id="yNP-cp-MFy" customClass="FilterListViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="51" sectionHeaderHeight="1" sectionFooterHeight="1" id="2KT-Xl-a2s">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<view key="tableFooterView" contentMode="scaleToFill" id="7gO-EN-ejt">
<rect key="frame" x="0.0" y="196.5" width="375" height="140"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fk4-1z-b1s">
<rect key="frame" x="30" y="66" width="315" height="44"/>
<color key="backgroundColor" red="0.2470588235" green="0.52549019610000003" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="H1G-m7-TpZ"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
<state key="normal" title="开始查询">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="sureQueryButtonAction:" destination="yNP-cp-MFy" eventType="touchUpInside" id="oua-Bu-5oc"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="fk4-1z-b1s" secondAttribute="trailing" constant="30" id="0NJ-3i-3tv"/>
<constraint firstItem="fk4-1z-b1s" firstAttribute="leading" secondItem="7gO-EN-ejt" secondAttribute="leading" constant="30" id="Q96-GK-zh7"/>
<constraint firstAttribute="bottom" secondItem="fk4-1z-b1s" secondAttribute="bottom" constant="30" id="dae-uh-F1w"/>
</constraints>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="FilterTimeChooseTableViewCell" rowHeight="90" id="Ck3-6V-Eny" customClass="FilterTimeChooseTableViewCell">
<rect key="frame" x="0.0" y="55.5" width="375" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ck3-6V-Eny" id="0c8-st-W4y">
<rect key="frame" x="0.0" y="0.0" width="375" height="89.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gWN-6k-ZZr">
<rect key="frame" x="187" y="20" width="1" height="50"/>
<color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="men-Z9-4ct"/>
<constraint firstAttribute="height" constant="50" id="sGE-2w-9nA"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="起始时间" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W8y-dh-T9z">
<rect key="frame" x="65" y="20" width="58" height="17"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right" translatesAutoresizingMaskIntoConstraints="NO" id="hGI-xR-8Oi">
<rect key="frame" x="164" y="46.5" width="8" height="13"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right" translatesAutoresizingMaskIntoConstraints="NO" id="MIp-2Q-rQC">
<rect key="frame" x="352" y="46.5" width="8" height="13"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="截止时间" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bCH-UX-016">
<rect key="frame" x="252" y="20" width="58" height="17"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2017-08-15" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vjv-k6-lVL">
<rect key="frame" x="233" y="42" width="96" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.2470588235" green="0.52549019610000003" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2017-08-15" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wQy-5C-3xN">
<rect key="frame" x="46" y="42" width="96" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.2470588235" green="0.52549019610000003" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s7X-31-AWN">
<rect key="frame" x="188" y="0.0" width="187" height="89.5"/>
<connections>
<action selector="endButtonClickAction:" destination="Ck3-6V-Eny" eventType="touchUpInside" id="PR6-hH-vhg"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iWF-MA-rTi">
<rect key="frame" x="0.0" y="0.0" width="188" height="89.5"/>
<connections>
<action selector="beginButtonClickAction:" destination="Ck3-6V-Eny" eventType="touchUpInside" id="LuT-mo-X7R"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="MIp-2Q-rQC" firstAttribute="centerY" secondItem="Vjv-k6-lVL" secondAttribute="centerY" id="4qP-VD-0tH"/>
<constraint firstItem="W8y-dh-T9z" firstAttribute="centerX" secondItem="0c8-st-W4y" secondAttribute="centerX" multiplier="0.5" id="63w-fm-gss"/>
<constraint firstItem="gWN-6k-ZZr" firstAttribute="centerY" secondItem="0c8-st-W4y" secondAttribute="centerY" id="6IS-1V-3XW"/>
<constraint firstItem="iWF-MA-rTi" firstAttribute="top" secondItem="0c8-st-W4y" secondAttribute="top" id="6bP-pH-clz"/>
<constraint firstItem="Vjv-k6-lVL" firstAttribute="top" secondItem="bCH-UX-016" secondAttribute="bottom" constant="5" id="FGN-xi-jgG"/>
<constraint firstItem="wQy-5C-3xN" firstAttribute="centerY" secondItem="Vjv-k6-lVL" secondAttribute="centerY" id="KsV-zH-ldY"/>
<constraint firstAttribute="trailing" secondItem="s7X-31-AWN" secondAttribute="trailing" id="MEA-nF-lFI"/>
<constraint firstAttribute="bottom" secondItem="iWF-MA-rTi" secondAttribute="bottom" id="Shp-zG-Teu"/>
<constraint firstItem="gWN-6k-ZZr" firstAttribute="centerX" secondItem="0c8-st-W4y" secondAttribute="centerX" id="X0Q-Xs-syF"/>
<constraint firstItem="bCH-UX-016" firstAttribute="centerY" secondItem="W8y-dh-T9z" secondAttribute="centerY" id="YMC-Ar-6zk"/>
<constraint firstItem="s7X-31-AWN" firstAttribute="leading" secondItem="iWF-MA-rTi" secondAttribute="trailing" id="blV-6n-gSZ"/>
<constraint firstItem="hGI-xR-8Oi" firstAttribute="centerY" secondItem="wQy-5C-3xN" secondAttribute="centerY" id="hGM-YQ-rWa"/>
<constraint firstItem="iWF-MA-rTi" firstAttribute="leading" secondItem="0c8-st-W4y" secondAttribute="leading" id="igE-n8-qac"/>
<constraint firstItem="gWN-6k-ZZr" firstAttribute="leading" secondItem="hGI-xR-8Oi" secondAttribute="trailing" constant="15" id="keY-rN-etR"/>
<constraint firstAttribute="bottom" secondItem="s7X-31-AWN" secondAttribute="bottom" id="kpq-ns-dMb"/>
<constraint firstItem="wQy-5C-3xN" firstAttribute="centerX" secondItem="W8y-dh-T9z" secondAttribute="centerX" id="oAH-V9-JQc"/>
<constraint firstAttribute="trailing" secondItem="MIp-2Q-rQC" secondAttribute="trailing" constant="15" id="oU5-NO-dtt"/>
<constraint firstItem="bCH-UX-016" firstAttribute="centerX" secondItem="0c8-st-W4y" secondAttribute="centerX" multiplier="1.5" id="ohg-SG-J1y"/>
<constraint firstItem="W8y-dh-T9z" firstAttribute="top" secondItem="0c8-st-W4y" secondAttribute="top" constant="20" id="u6m-mO-KaL"/>
<constraint firstItem="s7X-31-AWN" firstAttribute="top" secondItem="0c8-st-W4y" secondAttribute="top" id="uEe-VE-X01"/>
<constraint firstItem="s7X-31-AWN" firstAttribute="leading" secondItem="gWN-6k-ZZr" secondAttribute="trailing" id="yFv-Cm-axU"/>
<constraint firstItem="Vjv-k6-lVL" firstAttribute="centerX" secondItem="bCH-UX-016" secondAttribute="centerX" id="z0g-iI-ch9"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" red="0.93725490199999995" green="0.95686274510000002" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<connections>
<outlet property="begainDateLabel" destination="wQy-5C-3xN" id="g7C-iD-OBq"/>
<outlet property="begainDateTitleLabel" destination="W8y-dh-T9z" id="JB0-OH-u2O"/>
<outlet property="endDateLabel" destination="Vjv-k6-lVL" id="5zz-oi-XOn"/>
<outlet property="endDateTitleLabel" destination="bCH-UX-016" id="Qgc-Dn-BtC"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="FilterDefaultTableViewCell" rowHeight="50" id="GGi-gf-Mkz" customClass="FilterDefaultTableViewCell">
<rect key="frame" x="0.0" y="145.5" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GGi-gf-Mkz" id="Kv4-31-7uj">
<rect key="frame" x="0.0" y="0.0" width="342" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="筛选项名称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NmF-OC-R8V">
<rect key="frame" x="20" y="15.5" width="76.5" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="200" id="d44-hP-olO"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Z4-cw-18M">
<rect key="frame" x="299" y="16.5" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="1Z4-cw-18M" secondAttribute="trailing" id="IWN-PH-5Za"/>
<constraint firstItem="NmF-OC-R8V" firstAttribute="leading" secondItem="Kv4-31-7uj" secondAttribute="leading" constant="20" id="U0r-1I-vS3"/>
<constraint firstItem="1Z4-cw-18M" firstAttribute="centerY" secondItem="NmF-OC-R8V" secondAttribute="centerY" id="ZoT-WW-pZS"/>
<constraint firstItem="1Z4-cw-18M" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="NmF-OC-R8V" secondAttribute="trailing" constant="30" id="egY-69-zxT"/>
<constraint firstItem="NmF-OC-R8V" firstAttribute="centerY" secondItem="Kv4-31-7uj" secondAttribute="centerY" id="imY-bt-be6"/>
</constraints>
</tableViewCellContentView>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<connections>
<outlet property="filterTitleLabel" destination="NmF-OC-R8V" id="7Wh-oR-Ysn"/>
<outlet property="filterValueLabel" destination="1Z4-cw-18M" id="Aec-SO-v5G"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="yNP-cp-MFy" id="ZvN-Ts-rp4"/>
<outlet property="delegate" destination="yNP-cp-MFy" id="3q7-Ze-nnU"/>
</connections>
</tableView>
<connections>
<outlet property="beginQueryButton" destination="fk4-1z-b1s" id="aFh-uQ-WVM"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Wca-ra-LSl" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-228" y="-3"/>
</scene>
<!--搜索关键字-->
<scene sceneID="QDS-9H-eHp">
<objects>
<tableViewController storyboardIdentifier="FilterInputTableViewController" title="搜索关键字" id="kvK-G4-N6M" customClass="FilterInputTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="none" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="079-UI-opB">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<sections>
<tableViewSection id="4H4-u9-hrc">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="150" id="9Jj-1h-WSl">
<rect key="frame" x="0.0" y="35" width="375" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9Jj-1h-WSl" id="xST-cG-qFm">
<rect key="frame" x="0.0" y="0.0" width="375" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="cK5-VP-xjJ" customClass="ICRPlaceholderTextView">
<rect key="frame" x="20" y="10" width="335" height="130"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="delegate" destination="kvK-G4-N6M" id="uBU-xA-BMo"/>
</connections>
</textView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="cK5-VP-xjJ" secondAttribute="bottom" constant="10" id="1R7-8q-vCT"/>
<constraint firstItem="cK5-VP-xjJ" firstAttribute="leading" secondItem="xST-cG-qFm" secondAttribute="leading" constant="20" id="36n-Re-vbm"/>
<constraint firstItem="cK5-VP-xjJ" firstAttribute="top" secondItem="xST-cG-qFm" secondAttribute="top" constant="10" id="hBp-Uz-axG"/>
<constraint firstAttribute="trailing" secondItem="cK5-VP-xjJ" secondAttribute="trailing" constant="20" id="kRE-LI-kVw"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell>
</cells>
</tableViewSection>
</sections>
<connections>
<outlet property="dataSource" destination="kvK-G4-N6M" id="TcH-J7-Pn5"/>
<outlet property="delegate" destination="kvK-G4-N6M" id="OOJ-cE-OVJ"/>
</connections>
</tableView>
<connections>
<outlet property="filterInputTextView" destination="cK5-VP-xjJ" id="Yre-ca-LkV"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Tsv-SJ-t93" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="656.79999999999995" y="323.38830584707648"/>
</scene>
<!--Empty Data Set Delegate-->
<scene sceneID="RMI-Es-f3c">
<objects>
<viewController storyboardIdentifier="FilterDetailViewController" title="筛选项选择" id="vyO-7p-eDR" customClass="FilterDetailViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="vN8-gD-i8d"/>
<viewControllerLayoutGuide type="bottom" id="QqB-my-JHx"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Hu8-jS-yfk">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<searchBar contentMode="redraw" placeholder="请输入关键字" translatesAutoresizingMaskIntoConstraints="NO" id="CN7-b8-gzs">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="pzl-IK-rqk"/>
</constraints>
<color key="barTintColor" red="0.2470588235" green="0.52549019610000003" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="vyO-7p-eDR" id="whH-yI-n7d"/>
</connections>
</searchBar>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="hlq-wB-dqS">
<rect key="frame" x="0.0" y="44" width="375" height="623"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="FilterDetailSearchTableViewCell" id="KUS-zS-Zgf" customClass="FilterDetailSearchTableViewCell">
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KUS-zS-Zgf" id="eje-Xu-0iJ">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="筛选项" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KMI-Pn-FrQ">
<rect key="frame" x="20" y="12" width="335" height="19.5"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="KMI-Pn-FrQ" firstAttribute="top" secondItem="eje-Xu-0iJ" secondAttribute="top" constant="12" id="5WS-9G-sJd"/>
<constraint firstItem="KMI-Pn-FrQ" firstAttribute="leading" secondItem="eje-Xu-0iJ" secondAttribute="leading" constant="20" id="Aqy-vh-LVk"/>
<constraint firstAttribute="bottom" secondItem="KMI-Pn-FrQ" secondAttribute="bottom" constant="12" id="JMG-Hb-ObO"/>
<constraint firstItem="KMI-Pn-FrQ" firstAttribute="centerY" secondItem="eje-Xu-0iJ" secondAttribute="centerY" id="gPA-qQ-85m"/>
<constraint firstAttribute="trailing" secondItem="KMI-Pn-FrQ" secondAttribute="trailing" constant="20" id="jzg-pZ-Eyk"/>
</constraints>
</tableViewCellContentView>
<color key="tintColor" red="0.29411764709999999" green="0.56862745100000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<connections>
<outlet property="searchTitleLabel" destination="KMI-Pn-FrQ" id="XnC-Lt-aCk"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="vyO-7p-eDR" id="JvV-j3-8gG"/>
<outlet property="delegate" destination="vyO-7p-eDR" id="djr-Qp-NTs"/>
<outlet property="emptyDataSetDelegate" destination="vyO-7p-eDR" id="LCT-gb-zUo"/>
<outlet property="emptyDataSetSource" destination="vyO-7p-eDR" id="MK1-87-K0n"/>
</connections>
</tableView>
</subviews>
<constraints>
<constraint firstItem="hlq-wB-dqS" firstAttribute="leading" secondItem="Hu8-jS-yfk" secondAttribute="leading" id="4ac-lb-sJy"/>
<constraint firstItem="CN7-b8-gzs" firstAttribute="leading" secondItem="Hu8-jS-yfk" secondAttribute="leading" id="8AF-AH-f6z"/>
<constraint firstItem="QqB-my-JHx" firstAttribute="top" secondItem="hlq-wB-dqS" secondAttribute="bottom" id="AqN-d1-P2G"/>
<constraint firstAttribute="trailing" secondItem="CN7-b8-gzs" secondAttribute="trailing" id="PMv-u7-vF2"/>
<constraint firstItem="hlq-wB-dqS" firstAttribute="top" secondItem="CN7-b8-gzs" secondAttribute="bottom" id="cD4-eO-AdC"/>
<constraint firstItem="CN7-b8-gzs" firstAttribute="top" secondItem="Hu8-jS-yfk" secondAttribute="top" id="rOS-Jx-0tZ"/>
<constraint firstAttribute="trailing" secondItem="hlq-wB-dqS" secondAttribute="trailing" id="sVt-Nc-JNL"/>
</constraints>
</view>
<connections>
<outlet property="filterDetailTableView" destination="hlq-wB-dqS" id="cv0-Ei-IdD"/>
<outlet property="filterSearchBar" destination="CN7-b8-gzs" id="8Ru-cU-77x"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="nQ5-q1-vHb" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="658" y="-353"/>
</scene>
</scenes>
<resources>
<image name="right" width="8" height="13"/>
</resources>
</document>
{
"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
total/Images.xcassets/Inspect/arrow.imageset/arrow.png

1016 Bytes

total/Images.xcassets/Inspect/arrow.imageset/arrow@2x.png

1.07 KB

total/Images.xcassets/Inspect/arrow.imageset/arrow@3x.png

1.18 KB

{
"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
total/Images.xcassets/Inspect/arrowopen.imageset/arrowopen@2x.png

1.38 KB

total/Images.xcassets/Inspect/arrowopen.imageset/arrowopen@3x.png

1.62 KB

{
"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
total/Images.xcassets/Inspect/arrowturnoff.imageset/arrowturnoff@2x.png

1.41 KB

total/Images.xcassets/Inspect/arrowturnoff.imageset/arrowturnoff@3x.png

1.67 KB

{
"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
total/Images.xcassets/Inspect/chooseBg.imageset/chooseBg@2x.png

485 Bytes

total/Images.xcassets/Inspect/chooseBg.imageset/chooseBg@3x.png

676 Bytes

{
"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
total/Images.xcassets/Inspect/complete.imageset/complete.png

1.15 KB

total/Images.xcassets/Inspect/complete.imageset/complete@2x.png

1.42 KB

total/Images.xcassets/Inspect/complete.imageset/complete@3x.png

1.72 KB

{
"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
total/Images.xcassets/Inspect/location.imageset/location@2x.png

4.16 KB

total/Images.xcassets/Inspect/location.imageset/location@3x.png

6.16 KB

{
"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
total/Images.xcassets/Inspect/location_red.imageset/location_red@2x.png

1.78 KB

total/Images.xcassets/Inspect/location_red.imageset/location_red@3x.png

2.28 KB

{
"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
total/Images.xcassets/Inspect/not_ check.imageset/not_ check@2x.png

2.03 KB

total/Images.xcassets/Inspect/not_ check.imageset/not_ check@3x.png

2.87 KB

{
"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
total/Images.xcassets/Inspect/person.imageset/person@2x.png

1.31 KB

total/Images.xcassets/Inspect/person.imageset/person@3x.png

1.53 KB

{
"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
total/Images.xcassets/Inspect/result_suo.imageset/result_suo@2x.png

1.98 KB

total/Images.xcassets/Inspect/result_suo.imageset/result_suo@3x.png

6.2 KB

{
"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
total/Images.xcassets/Inspect/result_suofang.imageset/result_suofang@2x.png

1.88 KB

total/Images.xcassets/Inspect/result_suofang.imageset/result_suofang@3x.png

5.93 KB

{
"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
total/Images.xcassets/Inspect/right.imageset/right.png

1.09 KB

total/Images.xcassets/Inspect/right.imageset/right@2x.png

1.15 KB

total/Images.xcassets/Inspect/right.imageset/right@3x.png

2.25 KB

{
"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
total/Images.xcassets/Inspect/store.imageset/store.png

1.14 KB

total/Images.xcassets/Inspect/store.imageset/store@2x.png

1.38 KB

total/Images.xcassets/Inspect/store.imageset/store@3x.png

1.5 KB

{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "storeLocationIcon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "storeLocationIcon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "task@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "task@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
total/Images.xcassets/Inspect/task.imageset/task@2x.png

1.3 KB

total/Images.xcassets/Inspect/task.imageset/task@3x.png

1.49 KB

{
"images" : [
{
"idiom" : "universal",
"filename" : "unfinished.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "unfinished@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "unfinished@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
total/Images.xcassets/Inspect/unfinished.imageset/unfinished.png

1.14 KB

total/Images.xcassets/Inspect/unfinished.imageset/unfinished@2x.png

1.42 KB

total/Images.xcassets/Inspect/unfinished.imageset/unfinished@3x.png

1.72 KB

{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "addimage@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "addimage@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
total/Images.xcassets/addimage.imageset/addimage@2x.png

6.23 KB

total/Images.xcassets/addimage.imageset/addimage@3x.png

12.6 KB

total/Images.xcassets/back.imageset/back@2x.png

3.15 KB

......@@ -6,6 +6,10 @@
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIcons</key>
<dict/>
<key>CFBundleIcons~ipad</key>
<dict/>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
......@@ -27,10 +31,18 @@
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>App需要您的同意,才能访问相机</string>
<key>NSLocationAlwaysUsageDescription</key>
<true/>
<key>NSLocationUsageDescription</key>
<string>App需要您的同意,才能访问位置</string>
<key>NSLocationWhenInUseUsageDescription</key>
<false/>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>App需要您的同意,才能访问相册</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>App需要您的同意,才能访问相册</string>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
......@@ -47,7 +59,7 @@
<key>UIRequiresFullScreen</key>
<false/>
<key>UIStatusBarHidden</key>
<false/>
<true/>
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleDefault</string>
<key>UISupportedInterfaceOrientations</key>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
</dict>
</plist>
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