Skip to content

O
Opple-iOS
Commit ff5c95b0 authored by 勾芒's avatar 勾芒
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 643e52cf 560d2699
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 27 deletions
Lighting/Class/RightViewController.m
View file @ ff5c95b0
...@@ -79,11 +79,17 @@ ...@@ -79,11 +79,17 @@
#pragma mark -头部视图 #pragma mark -头部视图
- (void)createHeaderview - (void)createHeaderview
{ {
UIView *headerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, RightWidth, 200)]; UIView *headerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, RightWidth, NavigationHeight)];
UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, 80, 80)]; //UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(10, 13, 115, 35)];
imageView.center = CGPointMake(RightWidth/2, 100); //imageView.center = CGPointMake(RightWidth/2, 100);
imageView.image = TCImage(@"weibo"); //imageView.image = TCImage(@"欧");
[headerView addSubview:imageView]; //[headerView addSubview:imageView];
headerView.backgroundColor = [UIColor colorWithRed:61.0f/255.0f green:171.0f/255.0f blue:225.0f/255.0f alpha:1];
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(RightWidth/4, 13, 115, 35)];
label.text = @"功能菜单";
label.font = [UIFont fontWithName:@"Helvetica" size:20.0];
[label setTextColor:[UIColor whiteColor]];
[headerView addSubview:label];
self.rightTableview.tableHeaderView = headerView; self.rightTableview.tableHeaderView = headerView;
} }
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ ff5c95b0
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies> </dependencies>
...@@ -182,14 +182,14 @@ ...@@ -182,14 +182,14 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="服务导购:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iXr-Co-Hbz"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="服务导购:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iXr-Co-Hbz">
<rect key="frame" x="331" y="14" width="65" height="21"/> <rect key="frame" x="308" y="14" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="FGg-N9-TVk"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="FGg-N9-TVk">
<rect key="frame" x="331" y="41" width="65" height="21"/> <rect key="frame" x="308" y="41" width="65" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="calibratedRGB"/>
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gMQ-8Z-IHh"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gMQ-8Z-IHh">
<rect key="frame" x="394" y="14" width="176" height="21"/> <rect key="frame" x="371" y="14" width="176" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UX9-mF-TLc"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UX9-mF-TLc">
<rect key="frame" x="394" y="41" width="176" height="21"/> <rect key="frame" x="371" y="41" width="176" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
...@@ -236,18 +236,19 @@ ...@@ -236,18 +236,19 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="93Q-SP-eWa"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="93Q-SP-eWa">
<rect key="frame" x="568" y="69" width="20" height="20"/> <rect key="frame" x="552" y="49" width="169" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
<state key="normal" backgroundImage="box-副本"/> <inset key="imageEdgeInsets" minX="-120" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" image="box-副本"/>
<state key="selected" image="bg"/> <state key="selected" image="bg"/>
<connections> <connections>
<action selector="SelectedButtonClick:" destination="NV8-I4-ig4" eventType="touchUpInside" id="XVi-Wb-GbA"/> <action selector="SelectedButtonClick:" destination="NV8-I4-ig4" eventType="touchUpInside" id="XVi-Wb-GbA"/>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设为当前用户" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Bs-Yx-wfk"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设为当前客户" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Bs-Yx-wfk">
<rect key="frame" x="599" y="69" width="100" height="20"/> <rect key="frame" x="599" y="59" width="100" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
...@@ -1854,7 +1855,7 @@ ...@@ -1854,7 +1855,7 @@
<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="secondcell" rowHeight="140" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="140" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="92" width="768" height="140"/> <rect key="frame" x="0.0" y="28" width="768" height="140"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i">
<rect key="frame" x="0.0" y="0.0" width="768" height="139.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="139.5"/>
...@@ -1951,7 +1952,7 @@ ...@@ -1951,7 +1952,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="consigneecell" rowHeight="56" id="gfQ-UE-mXV" customClass="GenerateOrdersTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="consigneecell" rowHeight="56" id="gfQ-UE-mXV" customClass="GenerateOrdersTableViewCell">
<rect key="frame" x="0.0" y="232" width="768" height="56"/> <rect key="frame" x="0.0" y="168" width="768" height="56"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw">
<rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
...@@ -2022,7 +2023,7 @@ ...@@ -2022,7 +2023,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="56" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="56" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell">
<rect key="frame" x="0.0" y="288" width="768" height="56"/> <rect key="frame" x="0.0" y="224" width="768" height="56"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
<rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/>
...@@ -2053,7 +2054,7 @@ ...@@ -2053,7 +2054,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell">
<rect key="frame" x="0.0" y="344" width="768" height="80"/> <rect key="frame" x="0.0" y="280" width="768" height="80"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
<rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
...@@ -2114,7 +2115,7 @@ ...@@ -2114,7 +2115,7 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell">
<rect key="frame" x="0.0" y="424" width="768" height="50"/> <rect key="frame" x="0.0" y="360" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
<rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/> <rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
......
Lighting/Podfile.lock
View file @ ff5c95b0
...@@ -14,7 +14,7 @@ PODS: ...@@ -14,7 +14,7 @@ PODS:
- AFNetworking/Serialization (3.1.0) - AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0): - AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession - AFNetworking/NSURLSession
- IQKeyboardManager (4.0.2) - IQKeyboardManager (4.0.3)
- JSONModel (1.2.0) - JSONModel (1.2.0)
- Masonry (0.6.4) - Masonry (0.6.4)
- MBProgressHUD (0.9.2) - MBProgressHUD (0.9.2)
...@@ -32,9 +32,9 @@ PODS: ...@@ -32,9 +32,9 @@ PODS:
- MMDrawerController/Core - MMDrawerController/Core
- MMDrawerController/Subclass (0.6.0): - MMDrawerController/Subclass (0.6.0):
- MMDrawerController/Core - MMDrawerController/Core
- SDWebImage (3.7.5): - SDWebImage (3.7.6):
- SDWebImage/Core (= 3.7.5) - SDWebImage/Core (= 3.7.6)
- SDWebImage/Core (3.7.5) - SDWebImage/Core (3.7.6)
- SVProgressHUD (2.0.3) - SVProgressHUD (2.0.3)
DEPENDENCIES: DEPENDENCIES:
...@@ -51,14 +51,14 @@ DEPENDENCIES: ...@@ -51,14 +51,14 @@ DEPENDENCIES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
IQKeyboardManager: 2341089c4ae25fa2fa82ce356a259fcd267dc6b6 IQKeyboardManager: be9695ffc5a52077deb4847608f338771022d6d1
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: 281802d04d787ea2973179ee8bcb50500579ede2 Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548 MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4 MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0 MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461 SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4 SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4
COCOAPODS: 0.39.0 COCOAPODS: 0.39.0
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