Commit 1542ad37 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 96d801bf
...@@ -74,13 +74,13 @@ ...@@ -74,13 +74,13 @@
self.shoppingCar.model = self.model; self.shoppingCar.model = self.model;
[self addChildViewController:self.shoppingCar]; [self addChildViewController:self.shoppingCar];
self.currentVC = self.shoppingCar; self.currentVC = self.shoppingCar;
self.shoppingCar.view.frame = CGRectMake(0, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
[self.controllerBackgroundView addSubview:self.shoppingCar.view]; [self.controllerBackgroundView addSubview:self.shoppingCar.view];
self.currentVC.view.frame = CGRectMake(0, 176, ScreenWidth-40, self.controllerBackgroundView.height-176);
self.orderRecord = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"OrderRecordViewController"]; self.orderRecord = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"OrderRecordViewController"];
[self addChildViewController:self.orderRecord]; [self addChildViewController:self.orderRecord];
self.orderRecord.model = self.model; self.orderRecord.model = self.model;
self.orderRecord.view.frame = CGRectMake(0, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h); self.orderRecord.view.frame = CGRectMake(0, 176, ScreenWidth-40, self.controllerBackgroundView.height-176);
} }
#pragma mark - 切换子视图 #pragma mark - 切换子视图
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#import <AssetsLibrary/AssetsLibrary.h> #import <AssetsLibrary/AssetsLibrary.h>
#import <Photos/Photos.h> #import <Photos/Photos.h>
#import "MWPhotoBrowser.h" #import "MWPhotoBrowser.h"
#import <AssetsLibrary/AssetsLibrary.h>
#import "OSSHelper.h" #import "OSSHelper.h"
#import "UIImage+Fit.h" #import "UIImage+Fit.h"
......
...@@ -192,11 +192,6 @@ ...@@ -192,11 +192,6 @@
return YES; return YES;
} }
- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
{
return 100;
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
......
...@@ -10,13 +10,6 @@ ...@@ -10,13 +10,6 @@
@implementation ProductDetailsHeaderView @implementation ProductDetailsHeaderView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
#pragma mark -UI #pragma mark -UI
- (void)uiConfigAction - (void)uiConfigAction
...@@ -24,15 +17,6 @@ ...@@ -24,15 +17,6 @@
{ {
self.addGoodsShoppingbagsButton.layer.masksToBounds = YES; self.addGoodsShoppingbagsButton.layer.masksToBounds = YES;
self.addGoodsShoppingbagsButton.layer.cornerRadius = kCornerRadius; self.addGoodsShoppingbagsButton.layer.cornerRadius = kCornerRadius;
[self.addGoodsShoppingbagsButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.inventoryLabe);
make.top.equalTo(self.inventoryLabe).offset(40);
make.width.mas_equalTo(200);
make.height.mas_equalTo(40);
}];
} }
...@@ -45,23 +29,6 @@ ...@@ -45,23 +29,6 @@
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10117" systemVersion="16A323" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ProductDetailsHeaderView"> <view contentMode="scaleToFill" layoutMarginsFollowReadableWidth="YES" id="iN0-l3-epB" customClass="ProductDetailsHeaderView">
<rect key="frame" x="0.0" y="0.0" width="768" height="400"/> <rect key="frame" x="0.0" y="0.0" width="768" height="400"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<view contentMode="scaleToFill" id="NBT-2d-V2o"> <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NBT-2d-V2o">
<rect key="frame" x="20" y="21" width="385" height="358"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="tLl-kB-n3W"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tLl-kB-n3W"/>
<rect key="frame" x="0.0" y="0.0" width="385" height="358"/> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JMO-LV-nJ6">
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <constraints>
</imageView> <constraint firstAttribute="height" constant="80" id="I5l-QP-uvR"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="JMO-LV-nJ6"> <constraint firstAttribute="width" constant="80" id="xOc-np-wrk"/>
<rect key="frame" x="305" y="0.0" width="80" height="80"/> </constraints>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="2"/> <state key="normal" image="2"/>
</button> </button>
</subviews> </subviews>
<color key="backgroundColor" red="0.9882352941176471" green="0.97254901960784312" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.9882352941176471" green="0.97254901960784312" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="tLl-kB-n3W" secondAttribute="trailing" id="O8K-iF-VAm"/>
<constraint firstItem="tLl-kB-n3W" firstAttribute="top" secondItem="NBT-2d-V2o" secondAttribute="top" id="bsk-l5-ikY"/>
<constraint firstItem="tLl-kB-n3W" firstAttribute="leading" secondItem="NBT-2d-V2o" secondAttribute="leading" id="cDh-FV-xyi"/>
<constraint firstItem="JMO-LV-nJ6" firstAttribute="top" secondItem="NBT-2d-V2o" secondAttribute="top" id="eJX-LM-pB7"/>
<constraint firstAttribute="bottom" secondItem="tLl-kB-n3W" secondAttribute="bottom" id="jy4-5D-mBR"/>
<constraint firstAttribute="trailing" secondItem="JMO-LV-nJ6" secondAttribute="trailing" id="qlj-eH-Io1"/>
</constraints>
</view> </view>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="tsa-PY-0mz"> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tsa-PY-0mz">
<rect key="frame" x="413" y="59" width="80" height="269"/> <constraints>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <constraint firstAttribute="width" constant="80" id="Kaj-Uv-3aL"/>
<constraint firstAttribute="height" constant="270" id="dWg-tA-BZZ"/>
</constraints>
</scrollView> </scrollView>
<view contentMode="scaleToFill" id="hq9-lr-unI"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hq9-lr-unI">
<rect key="frame" x="515" y="15" width="1" height="350"/> <color key="backgroundColor" red="0.81960784313725488" green="0.81960784313725488" blue="0.81960784313725488" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <constraints>
<color key="backgroundColor" red="0.81960784313725488" green="0.81960784313725488" blue="0.81960784313725488" alpha="1" colorSpace="calibratedRGB"/> <constraint firstAttribute="height" constant="350" id="W26-Ll-Dtu"/>
<constraint firstAttribute="width" constant="1" id="zc3-GV-oIj"/>
</constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="编号:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="usf-4V-c8q"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="编号:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="usf-4V-c8q">
<rect key="frame" x="530" y="41" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b7B-yI-JEC"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="dqdqweq" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b7B-yI-JEC">
<rect key="frame" x="588" y="39" width="163" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/> <fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5aK-6t-o1q"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="名称:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5aK-6t-o1q">
<rect key="frame" x="530" y="78" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="NlJ-8b-gcl"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12102" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NlJ-8b-gcl">
<rect key="frame" x="588" y="66" width="163" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="品牌:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hX3-Vg-O1n"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="品牌:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hX3-Vg-O1n">
<rect key="frame" x="530" y="115" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hf9-WK-7u5"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="qweqwe" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hf9-WK-7u5">
<rect key="frame" x="588" y="115" width="130" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="吊牌价:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ol6-U8-o5v"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="吊牌价:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ol6-U8-o5v">
<rect key="frame" x="530" y="152" width="60" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Vfu-v1-b5l"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vfu-v1-b5l">
<rect key="frame" x="530" y="227" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="库存:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9XR-2D-r0I"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="库存:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9XR-2D-r0I">
<rect key="frame" x="530" y="272" width="56" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zXN-Uh-XtZ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3333" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zXN-Uh-XtZ">
<rect key="frame" x="588" y="272" width="70" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="frs-v4-sgw"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="frs-v4-sgw">
<rect key="frame" x="530" y="307" width="229" height="40"/> <color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <constraints>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> <constraint firstAttribute="height" constant="35" id="fOg-wz-2NC"/>
</constraints>
<state key="normal" title="添加至购物车"> <state key="normal" title="添加至购物车">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state> </state>
</button> </button>
<button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="tM7-hf-9rp"> <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tM7-hf-9rp">
<rect key="frame" x="428" y="328" width="50" height="50"/> <constraints>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> <constraint firstAttribute="height" constant="50" id="VyS-ld-bFo"/>
<constraint firstAttribute="width" constant="50" id="cVl-bf-ol8"/>
</constraints>
<state key="normal" image="icondown"/> <state key="normal" image="icondown"/>
</button> </button>
<button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="0ee-HS-ilS"> <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0ee-HS-ilS">
<rect key="frame" x="428" y="9" width="50" height="50"/> <constraints>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <constraint firstAttribute="width" constant="50" id="3Rg-JY-Lxz"/>
<constraint firstAttribute="height" constant="50" id="XOD-0N-vgK"/>
</constraints>
<state key="normal" image="icon-2"/> <state key="normal" image="icon-2"/>
</button> </button>
<view contentMode="scaleToFill" id="1dh-b6-rRU"> <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SQd-9e-TXr">
<rect key="frame" x="588" y="220" width="116" height="30"/> <constraints>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <constraint firstAttribute="width" constant="30" id="7Ej-K3-67Q"/>
<subviews> <constraint firstAttribute="height" constant="30" id="PUf-Iv-ZU3"/>
<button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="SQd-9e-TXr"> </constraints>
<rect key="frame" x="86" y="0.0" width="30" height="30"/> <state key="normal" backgroundImage="add"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> </button>
<state key="normal" backgroundImage="add"/> <button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rRp-ny-V8g">
</button> <constraints>
<button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="rRp-ny-V8g"> <constraint firstAttribute="height" constant="30" id="RlA-IJ-Q4J"/>
<rect key="frame" x="0.0" y="0.0" width="30" height="30"/> <constraint firstAttribute="width" constant="30" id="y2s-vJ-hL6"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> </constraints>
<state key="normal" backgroundImage="reduce"/> <state key="normal" backgroundImage="reduce"/>
</button> </button>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" id="gOn-EI-HN5"> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gOn-EI-HN5">
<rect key="frame" x="33" y="0.0" width="50" height="30"/> <constraints>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <constraint firstAttribute="width" constant="50" id="AEP-EN-TOV"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <constraint firstAttribute="height" constant="30" id="mLV-zB-Ooq"/>
<textInputTraits key="textInputTraits"/> </constraints>
</textField> <fontDescription key="fontDescription" type="system" pointSize="14"/>
</subviews> <textInputTraits key="textInputTraits"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </textField>
</view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9999" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rka-oV-nyM">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rka-oV-nyM">
<rect key="frame" x="588" y="151" width="163" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/> <fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="0.9882352941176471" green="0.33725490196078434" blue="0.12156862745098039" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.9882352941176471" green="0.33725490196078434" blue="0.12156862745098039" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
</subviews> </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 firstItem="9XR-2D-r0I" firstAttribute="top" secondItem="Vfu-v1-b5l" secondAttribute="bottom" constant="25" id="05h-LR-iyn"/>
<constraint firstItem="frs-v4-sgw" firstAttribute="top" secondItem="zXN-Uh-XtZ" secondAttribute="bottom" constant="25" id="06Y-7Q-0Ub"/>
<constraint firstItem="ol6-U8-o5v" firstAttribute="trailing" secondItem="hX3-Vg-O1n" secondAttribute="trailing" id="0OC-he-2TM"/>
<constraint firstItem="zXN-Uh-XtZ" firstAttribute="centerY" secondItem="9XR-2D-r0I" secondAttribute="centerY" id="0cM-7q-ERO"/>
<constraint firstItem="SQd-9e-TXr" firstAttribute="centerY" secondItem="gOn-EI-HN5" secondAttribute="centerY" id="44b-Fg-uh2"/>
<constraint firstItem="NBT-2d-V2o" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="5XH-Sq-yGA"/>
<constraint firstItem="tM7-hf-9rp" firstAttribute="top" secondItem="tsa-PY-0mz" secondAttribute="bottom" constant="5" id="5mL-Ps-nG4"/>
<constraint firstItem="NBT-2d-V2o" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="7U3-6b-XLA"/>
<constraint firstItem="hq9-lr-unI" firstAttribute="leading" secondItem="tsa-PY-0mz" secondAttribute="trailing" constant="20" id="Ed0-mH-bfP"/>
<constraint firstItem="0ee-HS-ilS" firstAttribute="centerX" secondItem="tsa-PY-0mz" secondAttribute="centerX" id="EnR-bK-i8a"/>
<constraint firstItem="usf-4V-c8q" firstAttribute="leading" secondItem="hq9-lr-unI" secondAttribute="trailing" constant="30" id="Gij-3R-krt"/>
<constraint firstItem="NlJ-8b-gcl" firstAttribute="centerY" secondItem="5aK-6t-o1q" secondAttribute="centerY" id="KhH-dZ-dfe"/>
<constraint firstItem="5aK-6t-o1q" firstAttribute="top" secondItem="usf-4V-c8q" secondAttribute="bottom" constant="15" id="KoP-If-HZN"/>
<constraint firstAttribute="trailing" secondItem="frs-v4-sgw" secondAttribute="trailing" constant="30" id="Nf2-UJ-eaq"/>
<constraint firstItem="5aK-6t-o1q" firstAttribute="leading" secondItem="usf-4V-c8q" secondAttribute="leading" id="OVq-qa-ifF"/>
<constraint firstAttribute="bottom" secondItem="NBT-2d-V2o" secondAttribute="bottom" constant="20" id="RAS-qC-JRU"/>
<constraint firstItem="NlJ-8b-gcl" firstAttribute="leading" secondItem="b7B-yI-JEC" secondAttribute="leading" id="U8e-bx-PBB"/>
<constraint firstItem="hX3-Vg-O1n" firstAttribute="leading" secondItem="5aK-6t-o1q" secondAttribute="leading" id="VhR-Cr-SxU"/>
<constraint firstItem="Rka-oV-nyM" firstAttribute="leading" secondItem="Hf9-WK-7u5" secondAttribute="leading" id="Wwg-FV-nmK"/>
<constraint firstItem="hX3-Vg-O1n" firstAttribute="top" secondItem="5aK-6t-o1q" secondAttribute="bottom" constant="15" id="X4B-vx-XcX"/>
<constraint firstItem="Vfu-v1-b5l" firstAttribute="leading" secondItem="hX3-Vg-O1n" secondAttribute="leading" id="Xbu-hj-ukP"/>
<constraint firstItem="Hf9-WK-7u5" firstAttribute="leading" secondItem="NlJ-8b-gcl" secondAttribute="leading" id="aKW-G2-tJy"/>
<constraint firstItem="9XR-2D-r0I" firstAttribute="leading" secondItem="Vfu-v1-b5l" secondAttribute="leading" id="bFu-Xw-ePl"/>
<constraint firstItem="tM7-hf-9rp" firstAttribute="centerX" secondItem="tsa-PY-0mz" secondAttribute="centerX" id="c1C-dK-vJF"/>
<constraint firstItem="frs-v4-sgw" firstAttribute="leading" secondItem="9XR-2D-r0I" secondAttribute="leading" id="dEc-jV-nqD"/>
<constraint firstItem="Vfu-v1-b5l" firstAttribute="top" secondItem="ol6-U8-o5v" secondAttribute="bottom" constant="70" id="eXV-de-4sZ"/>
<constraint firstItem="ol6-U8-o5v" firstAttribute="top" secondItem="hX3-Vg-O1n" secondAttribute="bottom" constant="25" id="feg-EY-Mee"/>
<constraint firstItem="SQd-9e-TXr" firstAttribute="leading" secondItem="gOn-EI-HN5" secondAttribute="trailing" constant="5" id="fzn-ml-CUO"/>
<constraint firstItem="Hf9-WK-7u5" firstAttribute="centerY" secondItem="hX3-Vg-O1n" secondAttribute="centerY" id="gj3-fM-9Li"/>
<constraint firstItem="b7B-yI-JEC" firstAttribute="centerY" secondItem="usf-4V-c8q" secondAttribute="centerY" id="k9d-Tq-ql5"/>
<constraint firstItem="tsa-PY-0mz" firstAttribute="leading" secondItem="NBT-2d-V2o" secondAttribute="trailing" constant="20" id="nuL-EH-kfw"/>
<constraint firstItem="gOn-EI-HN5" firstAttribute="leading" secondItem="rRp-ny-V8g" secondAttribute="trailing" constant="5" id="pW9-nL-Zq6"/>
<constraint firstItem="rRp-ny-V8g" firstAttribute="centerY" secondItem="Vfu-v1-b5l" secondAttribute="centerY" id="sSg-si-BHM"/>
<constraint firstItem="rRp-ny-V8g" firstAttribute="leading" secondItem="Rka-oV-nyM" secondAttribute="leading" id="skC-wR-FU4"/>
<constraint firstItem="hq9-lr-unI" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="tbd-LJ-wwY"/>
<constraint firstItem="b7B-yI-JEC" firstAttribute="leading" secondItem="usf-4V-c8q" secondAttribute="trailing" constant="20" id="toq-mo-eo4"/>
<constraint firstItem="Rka-oV-nyM" firstAttribute="centerY" secondItem="ol6-U8-o5v" secondAttribute="centerY" id="uZm-9u-aBe"/>
<constraint firstItem="tsa-PY-0mz" firstAttribute="top" secondItem="0ee-HS-ilS" secondAttribute="bottom" constant="5" id="wMr-oo-Rxb"/>
<constraint firstItem="usf-4V-c8q" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="44" id="x6d-QI-PfE"/>
<constraint firstItem="hq9-lr-unI" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" multiplier="1.3" id="xnk-Sz-ihg"/>
<constraint firstItem="tsa-PY-0mz" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="zQU-3l-Phm"/>
<constraint firstItem="gOn-EI-HN5" firstAttribute="centerY" secondItem="rRp-ny-V8g" secondAttribute="centerY" id="zfC-Z9-ZNv"/>
<constraint firstItem="zXN-Uh-XtZ" firstAttribute="leading" secondItem="rRp-ny-V8g" secondAttribute="leading" id="zng-U6-R8J"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections> <connections>
<outlet property="addButton" destination="SQd-9e-TXr" id="Cb8-XL-EXr"/> <outlet property="addButton" destination="SQd-9e-TXr" id="Cb8-XL-EXr"/>
...@@ -173,7 +211,7 @@ ...@@ -173,7 +211,7 @@
<outlet property="serialNumber" destination="b7B-yI-JEC" id="mtZ-OL-KFQ"/> <outlet property="serialNumber" destination="b7B-yI-JEC" id="mtZ-OL-KFQ"/>
<outlet property="topSlidingScrollView" destination="0ee-HS-ilS" id="48B-8i-N7n"/> <outlet property="topSlidingScrollView" destination="0ee-HS-ilS" id="48B-8i-N7n"/>
</connections> </connections>
<point key="canvasLocation" x="634" y="568"/> <point key="canvasLocation" x="625" y="620"/>
</view> </view>
</objects> </objects>
<resources> <resources>
...@@ -183,4 +221,9 @@ ...@@ -183,4 +221,9 @@
<image name="icondown" width="25" height="15"/> <image name="icondown" width="25" height="15"/>
<image name="reduce" width="49" height="45"/> <image name="reduce" width="49" height="45"/>
</resources> </resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
</document> </document>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
self.productDetilsTableview.dataSource = self; self.productDetilsTableview.dataSource = self;
self.productDetilsTableview.delegate = self; self.productDetilsTableview.delegate = self;
[self.productDetilsTableview registerNib:[UINib nibWithNibName:@"goodsDetailsTableViewCell" bundle:nil] forCellReuseIdentifier:@"goodsdetailscell"]; [self.productDetilsTableview registerNib:[UINib nibWithNibName:@"goodsDetailsTableViewCell" bundle:nil] forCellReuseIdentifier:@"goodsdetailscell"];
[self CreateHeaderView]; [self createHeaderView];
} }
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
#pragma mark -头部视图 #pragma mark -头部视图
- (void)CreateHeaderView - (void)createHeaderView
{ {
self.headerView = [[[NSBundle mainBundle] loadNibNamed:@"ProductDetailsHeaderView" owner:self options:nil] lastObject]; self.headerView = [[[NSBundle mainBundle] loadNibNamed:@"ProductDetailsHeaderView" owner:self options:nil] lastObject];
self.headerView.goodsNumber.delegate = self; self.headerView.goodsNumber.delegate = self;
...@@ -213,13 +213,17 @@ ...@@ -213,13 +213,17 @@
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
if (indexPath.section == 0) { if (indexPath.section == 0) {
return 182;
return 170;
} }
NSDictionary *dict = [self.goodsDetailsArray objectAtIndex_opple:indexPath.row]; NSDictionary *dict = [self.goodsDetailsArray objectAtIndex_opple:indexPath.row];
return [dict[@"height"] floatValue]; return [dict[@"height"] floatValue];
} }
- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
{
return 0.01;
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{ {
return 2; return 2;
......
...@@ -110,32 +110,16 @@ ...@@ -110,32 +110,16 @@
[self setupChildViewController]; [self setupChildViewController];
[self uiConfigAction]; [self uiConfigAction];
[self addConstraint];
} }
#pragma mark - UI #pragma mark - UI
- (void)uiConfigAction - (void)uiConfigAction
{ {
[[NSNotificationCenter defaultCenter] postNotificationName:PROMPTDRAWINFORMATION object:@(0)]; [[NSNotificationCenter defaultCenter] postNotificationName:PROMPTDRAWINFORMATION object:@(0)];
[self setupInstructionsViewOrigin:self.paymentsButton];
[self.headerImageView sd_setImageWithURL:[NSURL URLWithString:[Shoppersmanager manager].Shoppers.employee.picture] placeholderImage:ReplaceImage]; [self.headerImageView sd_setImageWithURL:[NSURL URLWithString:[Shoppersmanager manager].Shoppers.employee.picture] placeholderImage:ReplaceImage];
self.instructionsLinesView.frame = CGRectMake(8, 37, 88, 2);
} }
#pragma mark - 添加约束
- (void)addConstraint
{
[self.cardBackgroundView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(23);
make.top.equalTo(self.accountAmountView.mas_bottom).offset(13);
make.size.mas_equalTo(CGSizeMake((ScreenWidth-23*2-20)/2, 200));
}];
[self.drawBackgroundView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.cardBackgroundView.mas_right).offset(20);
make.top.equalTo(self.accountAmountView.mas_bottom).offset(13);
make.size.mas_equalTo(CGSizeMake((ScreenWidth-23*2-20)/2, 200));
}];
}
#pragma mark - 设置收支明细、提现进度、卡劵包 #pragma mark - 设置收支明细、提现进度、卡劵包
- (void)setupChildViewController - (void)setupChildViewController
...@@ -156,12 +140,12 @@ ...@@ -156,12 +140,12 @@
cardVc.view.frame = CGRectMake(0, 40, self.cardBackgroundView.mj_w, self.cardBackgroundView.mj_h-50); cardVc.view.frame = CGRectMake(0, 40, self.cardBackgroundView.mj_w, self.cardBackgroundView.mj_h-50);
[self.cardBackgroundView addSubview:cardVc.view]; [self.cardBackgroundView addSubview:cardVc.view];
/// 我的抽奖 // /// 我的抽奖
LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"]; // LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
[self addChildViewController:draw]; // [self addChildViewController:draw];
draw.drawValue = 0; // draw.drawValue = 0;
draw.view.frame = CGRectMake(0, 40, self.drawBackgroundView.mj_w, self.drawBackgroundView.mj_h-50); // draw.view.frame = CGRectMake(0, 40, self.drawBackgroundView.mj_w, self.drawBackgroundView.mj_h-50);
[self.drawBackgroundView addSubview:draw.view]; // [self.drawBackgroundView addSubview:draw.view];
} }
...@@ -195,7 +179,7 @@ ...@@ -195,7 +179,7 @@
- (void)setupInstructionsViewOrigin:(UIButton *)sender - (void)setupInstructionsViewOrigin:(UIButton *)sender
{ {
[UIView animateWithDuration:0.5 delay:0.1f usingSpringWithDamping:0.5f initialSpringVelocity:0.5f options:UIViewAnimationOptionCurveEaseInOut animations:^{ [UIView animateWithDuration:0.5 delay:0.1f usingSpringWithDamping:0.5f initialSpringVelocity:0.5f options:UIViewAnimationOptionCurveEaseInOut animations:^{
self.instructionsLinesView.frame = CGRectMake(sender.mj_origin.x+(sender.mj_w-self.instructionsLinesView.mj_w)/2, self.instructionsLinesView.mj_origin.y, self.instructionsLinesView.mj_w, 2); self.instructionsLinesView.frame = CGRectMake(sender.left, sender.bottom+2, sender.width, 2);
} completion:nil]; } completion:nil];
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<viewControllerLayoutGuide type="bottom" id="gMz-Po-9Yg"/> <viewControllerLayoutGuide type="bottom" id="gMz-Po-9Yg"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="cdH-ZG-5G3"> <view key="view" contentMode="scaleToFill" id="cdH-ZG-5G3">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Studybackground" translatesAutoresizingMaskIntoConstraints="NO" id="AOj-Fj-d3g"/> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Studybackground" translatesAutoresizingMaskIntoConstraints="NO" id="AOj-Fj-d3g"/>
...@@ -222,17 +222,17 @@ ...@@ -222,17 +222,17 @@
<viewControllerLayoutGuide type="bottom" id="lL2-ja-VxT"/> <viewControllerLayoutGuide type="bottom" id="lL2-ja-VxT"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="FsK-t2-M2J"> <view key="view" contentMode="scaleToFill" id="FsK-t2-M2J">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="90" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Ogf-Th-qTY"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="90" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Ogf-Th-qTY">
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ForumTableViewCell" rowHeight="90" id="gz9-gD-P6A" customClass="ForumTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ForumTableViewCell" rowHeight="90" id="gz9-gD-P6A" customClass="ForumTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="90"/> <rect key="frame" x="0.0" y="28" width="768" height="90"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gz9-gD-P6A" id="4lI-td-FE0"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gz9-gD-P6A" id="4lI-td-FE0">
<frame key="frameInset" width="830" height="89"/> <frame key="frameInset" width="702" height="89"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo">
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
<viewControllerLayoutGuide type="bottom" id="M8C-8Z-W12"/> <viewControllerLayoutGuide type="bottom" id="M8C-8Z-W12"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="9tL-ZM-Vv5"> <view key="view" contentMode="scaleToFill" id="9tL-ZM-Vv5">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Recruitbackground" translatesAutoresizingMaskIntoConstraints="NO" id="0NY-ad-nEt"/> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Recruitbackground" translatesAutoresizingMaskIntoConstraints="NO" id="0NY-ad-nEt"/>
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
<viewControllerLayoutGuide type="bottom" id="pEO-5p-FL8"/> <viewControllerLayoutGuide type="bottom" id="pEO-5p-FL8"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="YAu-aF-uAr"> <view key="view" contentMode="scaleToFill" id="YAu-aF-uAr">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wup-l7-BBP"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wup-l7-BBP">
...@@ -429,10 +429,10 @@ ...@@ -429,10 +429,10 @@
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ForumItemTableViewCell" rowHeight="253" id="KPa-ue-ynj" customClass="ForumItemTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ForumItemTableViewCell" rowHeight="253" id="KPa-ue-ynj" customClass="ForumItemTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="253"/> <rect key="frame" x="0.0" y="28" width="768" height="253"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KPa-ue-ynj" id="fqg-6x-xYw"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KPa-ue-ynj" id="fqg-6x-xYw">
<frame key="frameInset" width="1024" height="253"/> <frame key="frameInset" width="768" height="253"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5V0-oc-2jO"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5V0-oc-2jO">
...@@ -720,7 +720,7 @@ ...@@ -720,7 +720,7 @@
<viewControllerLayoutGuide type="bottom" id="dsh-Qt-soH"/> <viewControllerLayoutGuide type="bottom" id="dsh-Qt-soH"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="1Rf-fP-JqP"> <view key="view" contentMode="scaleToFill" id="1Rf-fP-JqP">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LsZ-78-vCP"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LsZ-78-vCP">
...@@ -767,10 +767,10 @@ ...@@ -767,10 +767,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HeadlineTableViewCell" id="RwU-Te-fXY" customClass="HeadlineTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HeadlineTableViewCell" id="RwU-Te-fXY" customClass="HeadlineTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="44"/> <rect key="frame" x="0.0" y="28" width="768" height="44"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RwU-Te-fXY" id="GcB-7X-Q0o"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RwU-Te-fXY" id="GcB-7X-Q0o">
<frame key="frameInset" width="1024" height="44"/> <frame key="frameInset" width="768" height="44"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="标题" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="QwA-Ps-okZ"> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="标题" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="QwA-Ps-okZ">
...@@ -798,10 +798,10 @@ ...@@ -798,10 +798,10 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ContentTableViewCell" rowHeight="170" id="bcJ-bt-ka6" customClass="ContentTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ContentTableViewCell" rowHeight="170" id="bcJ-bt-ka6" customClass="ContentTableViewCell">
<rect key="frame" x="0.0" y="72" width="1024" height="170"/> <rect key="frame" x="0.0" y="72" width="768" height="170"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bcJ-bt-ka6" id="uXN-gY-mO0"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bcJ-bt-ka6" id="uXN-gY-mO0">
<frame key="frameInset" width="1024" height="170"/> <frame key="frameInset" width="768" height="170"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="内容" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="3Uo-E9-3r0"> <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="内容" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="3Uo-E9-3r0">
...@@ -996,7 +996,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -996,7 +996,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<viewControllerLayoutGuide type="bottom" id="56O-Us-h9l"/> <viewControllerLayoutGuide type="bottom" id="56O-Us-h9l"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="iZG-0h-Izx"> <view key="view" contentMode="scaleToFill" id="iZG-0h-Izx">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Hbj-9Y-heh"> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Hbj-9Y-heh">
...@@ -1076,7 +1076,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1076,7 +1076,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<viewControllerLayoutGuide type="bottom" id="AVm-wa-VfG"/> <viewControllerLayoutGuide type="bottom" id="AVm-wa-VfG"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="1f3-C5-Ums"> <view key="view" contentMode="scaleToFill" id="1f3-C5-Ums">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XJQ-gn-ueE"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XJQ-gn-ueE">
...@@ -1206,7 +1206,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1206,7 +1206,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<viewControllerLayoutGuide type="bottom" id="D0s-xf-mF6"/> <viewControllerLayoutGuide type="bottom" id="D0s-xf-mF6"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="zkB-TM-8aD"> <view key="view" contentMode="scaleToFill" id="zkB-TM-8aD">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
</view> </view>
...@@ -1224,17 +1224,17 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1224,17 +1224,17 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<viewControllerLayoutGuide type="bottom" id="STN-51-MZ2"/> <viewControllerLayoutGuide type="bottom" id="STN-51-MZ2"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="euD-lu-EZ9"> <view key="view" contentMode="scaleToFill" id="euD-lu-EZ9">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="lXY-sE-fW1"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="lXY-sE-fW1">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoDetailIntroTableViewCell" rowHeight="100" id="Qnm-0r-wEL" customClass="VideoDetailIntroTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoDetailIntroTableViewCell" rowHeight="100" id="Qnm-0r-wEL" customClass="VideoDetailIntroTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="100"/> <rect key="frame" x="0.0" y="28" width="768" height="100"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qnm-0r-wEL" id="VAA-bT-OlF"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qnm-0r-wEL" id="VAA-bT-OlF">
<frame key="frameInset" width="1024" height="99"/> <frame key="frameInset" width="768" height="99"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课时简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agZ-rF-DnB"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课时简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agZ-rF-DnB">
...@@ -1262,10 +1262,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1262,10 +1262,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoLecturerTableViewCell" rowHeight="130" id="WzB-nZ-wsW" customClass="VideoLecturerTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoLecturerTableViewCell" rowHeight="130" id="WzB-nZ-wsW" customClass="VideoLecturerTableViewCell">
<rect key="frame" x="0.0" y="128" width="1024" height="130"/> <rect key="frame" x="0.0" y="128" width="768" height="130"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WzB-nZ-wsW" id="Zzv-Yi-ZxT"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WzB-nZ-wsW" id="Zzv-Yi-ZxT">
<frame key="frameInset" width="1024" height="129"/> <frame key="frameInset" width="768" height="129"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="授课讲师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kxK-dX-OAf"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="授课讲师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kxK-dX-OAf">
...@@ -1289,7 +1289,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1289,7 +1289,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用ipad或者iphone下载,再用app专业阅读器放映出来。首先,基本不卡了;其次,送50M免费邮箱存放ppt等文件;第三,增加了激光笔," textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="85S-CZ-3Vl"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="用ipad或者iphone下载,再用app专业阅读器放映出来。首先,基本不卡了;其次,送50M免费邮箱存放ppt等文件;第三,增加了激光笔," textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="85S-CZ-3Vl">
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -1316,10 +1316,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1316,10 +1316,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SpecifiedTableViewCell" rowHeight="100" id="oia-jO-L9n" customClass="SpecifiedTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SpecifiedTableViewCell" rowHeight="100" id="oia-jO-L9n" customClass="SpecifiedTableViewCell">
<rect key="frame" x="0.0" y="258" width="1024" height="100"/> <rect key="frame" x="0.0" y="258" width="768" height="100"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oia-jO-L9n" id="AMF-ag-ZWN"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oia-jO-L9n" id="AMF-ag-ZWN">
<frame key="frameInset" width="1024" height="99"/> <frame key="frameInset" width="768" height="99"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="针对人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfI-IM-h1i"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="针对人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfI-IM-h1i">
...@@ -1490,7 +1490,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1490,7 +1490,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="n7q-60-s3U"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="n7q-60-s3U">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="p9i-EO-Sx0"> <view key="tableHeaderView" contentMode="scaleToFill" id="p9i-EO-Sx0">
<rect key="frame" x="0.0" y="0.0" width="500" height="60"/> <rect key="frame" x="0.0" y="0.0" width="0.0" height="60"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="王牌销售" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DNW-by-H8X"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="王牌销售" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DNW-by-H8X">
...@@ -1658,7 +1658,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1658,7 +1658,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<viewControllerLayoutGuide type="bottom" id="yxQ-UK-Q3D"/> <viewControllerLayoutGuide type="bottom" id="yxQ-UK-Q3D"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="uDa-Mh-ebN"> <view key="view" contentMode="scaleToFill" id="uDa-Mh-ebN">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZY0-DP-xQk"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZY0-DP-xQk">
...@@ -1694,10 +1694,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1694,10 +1694,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" rowHeight="60" id="2M5-To-MLj" customClass="AssessmentHeaderView"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" rowHeight="60" id="2M5-To-MLj" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="56" width="1024" height="60"/> <rect key="frame" x="0.0" y="56" width="768" height="60"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2M5-To-MLj" id="ypf-GL-4CP"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2M5-To-MLj" id="ypf-GL-4CP">
<frame key="frameInset" width="1024" height="60"/> <frame key="frameInset" width="768" height="60"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1、(20分)opple新品发布____ [多选]" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RBj-Qh-HCD"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1、(20分)opple新品发布____ [多选]" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RBj-Qh-HCD">
...@@ -1719,10 +1719,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1719,10 +1719,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="50" id="BjI-a1-CRm" customClass="AssessmentTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="50" id="BjI-a1-CRm" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="116" width="1024" height="50"/> <rect key="frame" x="0.0" y="116" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BjI-a1-CRm" id="bq8-ly-DcD"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BjI-a1-CRm" id="bq8-ly-DcD">
<frame key="frameInset" width="1024" height="50"/> <frame key="frameInset" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MzG-Lg-eSA"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MzG-Lg-eSA">
...@@ -1818,7 +1818,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1818,7 +1818,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<viewControllerLayoutGuide type="bottom" id="AC6-es-fcm"/> <viewControllerLayoutGuide type="bottom" id="AC6-es-fcm"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="Irb-dN-uKr"> <view key="view" contentMode="scaleToFill" id="Irb-dN-uKr">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="3Pc-tn-xb9"> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="3Pc-tn-xb9">
...@@ -1949,13 +1949,13 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -1949,13 +1949,13 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<viewControllerLayoutGuide type="bottom" id="f5L-3o-b9m"/> <viewControllerLayoutGuide type="bottom" id="f5L-3o-b9m"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="ZYe-68-bYv"> <view key="view" contentMode="scaleToFill" id="ZYe-68-bYv">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="118" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="TVZ-eo-sh6"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="118" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="TVZ-eo-sh6">
<color key="backgroundColor" red="0.96078431372549022" green="0.97647058823529409" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.96078431372549022" green="0.97647058823529409" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="sYW-Jc-Fde"> <view key="tableHeaderView" contentMode="scaleToFill" id="sYW-Jc-Fde">
<rect key="frame" x="0.0" y="0.0" width="1024" height="0.0"/> <rect key="frame" x="0.0" y="0.0" width="536" height="0.0"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="v3R-bc-vx5"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="v3R-bc-vx5">
...@@ -2008,10 +2008,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -2008,10 +2008,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</view> </view>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="CommentListTableViewCell" rowHeight="84" id="sX2-jy-tQ2" customClass="CommentListTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="CommentListTableViewCell" rowHeight="84" id="sX2-jy-tQ2" customClass="CommentListTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="84"/> <rect key="frame" x="0.0" y="28" width="768" height="84"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sX2-jy-tQ2" id="iVT-bi-RKr"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sX2-jy-tQ2" id="iVT-bi-RKr">
<frame key="frameInset" width="1024" height="83"/> <frame key="frameInset" width="768" height="83"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="crown" translatesAutoresizingMaskIntoConstraints="NO" id="pyu-Y7-w8M"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="crown" translatesAutoresizingMaskIntoConstraints="NO" id="pyu-Y7-w8M">
...@@ -2184,7 +2184,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -2184,7 +2184,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<viewControllerLayoutGuide type="bottom" id="qWt-o1-N8Q"/> <viewControllerLayoutGuide type="bottom" id="qWt-o1-N8Q"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="aJe-X6-Cbk"> <view key="view" contentMode="scaleToFill" id="aJe-X6-Cbk">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/> <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="exy-74-AKq"> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="exy-74-AKq">
...@@ -2281,7 +2281,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它 ...@@ -2281,7 +2281,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</resources> </resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/> <simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation" orientation="landscapeRight"/> <simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination"/> <simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer> </simulatedMetricsContainer>
</document> </document>
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -57,8 +57,9 @@ ...@@ -57,8 +57,9 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view.
self.automaticallyAdjustsScrollViewInsets = NO; self.automaticallyAdjustsScrollViewInsets = NO;
self.navigationController.navigationBarHidden = YES;
//检测登陆超时通知 //检测登陆超时通知
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(logintimeoutNotification:) name:LOGINTIMEOUT object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(logintimeoutNotification:) name:LOGINTIMEOUT object:nil];
} }
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
/** /**
* 服务器开发地址 * 服务器开发地址
*/ */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL] //#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
/** /**
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
//** //**
// * 服务器正式地址 // * 服务器正式地址
// */ // */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL] #define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
/** /**
* 搜索框输入通知 * 搜索框输入通知
......
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