Skip to content

O
Opple-iOS
Commit 9168b49e authored by 曹云霄's avatar 曹云霄
Browse files
Options

caoyunxiao

parent ec76ba6c
Show whitespace changes
Inline Side-by-side
Showing with 157 additions and 27 deletions
Lighting/Class/ScreeningView.h 0 → 100644
View file @ 9168b49e
//
// ScreeningView.h
// Lighting
//
// Created by 曹云霄 on 16/5/7.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ScreeningView : UIView
@end
Lighting/Class/ScreeningView.m 0 → 100644
View file @ 9168b49e
//
// ScreeningView.m
// Lighting
//
// Created by 曹云霄 on 16/5/7.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "ScreeningView.h"
@implementation ScreeningView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
Lighting/Class/ScreeningView.xib 0 → 100644
View file @ 9168b49e
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ScreeningView">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<segmentedControl opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="oPO-a9-aYV">
<rect key="frame" x="240" y="51" width="174" height="29"/>
<segments>
<segment title="First"/>
<segment title="Second"/>
</segments>
</segmentedControl>
</subviews>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</view>
</objects>
</document>
Lighting/Class/Shoppingcart/GenerateOrdersViewController.m
View file @ 9168b49e
......@@ -24,11 +24,34 @@
*/
@property (nonatomic,strong) ModifyShippingAddressView *addressView;
/**
* 城市选择器
*/
@property (nonatomic,strong)ModifyShippingAddressView *citySelecteview;
@property (nonatomic,strong) UIView *Tabbarview;
@end
@implementation GenerateOrdersViewController
/**
* 城市选择View
*
* @return ModifyShippingAddressView
*/
- (ModifyShippingAddressView *)citySelecteview
{
if (_citySelecteview == nil) {
_citySelecteview = [[[NSBundle mainBundle] loadNibNamed:@"ModifyShippingAddressView"
owner:self options:nil]lastObject];
}
return _citySelecteview;
}
- (void)viewDidLoad {
[super viewDidLoad];
......@@ -238,15 +261,15 @@
#pragma mark -城市选择器
- (void)SelectedCityButtonClick
{
ModifyShippingAddressView *view = [[[NSBundle mainBundle] loadNibNamed:@"ModifyShippingAddressView"
owner:self options:nil]lastObject];
view.frame = CGRectMake(0, self.addressView.popupView.frame.size.height, self.addressView.popupView.frame.size.width, 160);
[self.addressView.popupView addSubview:view];
view.tag = 100;
[view.selectedCityButton addTarget:self action:@selector(CompleteButton) forControlEvents:UIControlEventTouchUpInside];
self.citySelecteview.frame = CGRectMake(0, self.addressView.popupView.frame.size.height, self.addressView.popupView.frame.size.width, 160);
[self.addressView.popupView addSubview:self.citySelecteview];
[self.citySelecteview.selectedCityButton addTarget:self action:@selector(CompleteButton) forControlEvents:UIControlEventTouchUpInside];
[UIView animateWithDuration:0.2 animations:^{
view.frame = CGRectMake(0, self.addressView.popupView.frame.size.height-160, self.addressView.popupView.frame.size.width, 160);
self.citySelecteview.frame = CGRectMake(0, self.addressView.popupView.frame.size.height-160, self.addressView.popupView.frame.size.width, 160);
}completion:^(BOOL finished) {
self.addressView.citySelected.enabled = NO;
}];
}
......@@ -254,13 +277,14 @@
#pragma mark -完成按钮点击
- (void)CompleteButton
{
ModifyShippingAddressView *view = [self.view viewWithTag:100];
[UIView animateWithDuration:0.2 animations:^{
view.frame = CGRectMake(0, ScreenHeight, self.addressView.popupView.frame.size.width, 160);
self.citySelecteview.frame = CGRectMake(0, ScreenHeight, self.addressView.popupView.frame.size.width, 160);
}completion:^(BOOL finished) {
[view removeFromSuperview];
[self.citySelecteview removeFromSuperview];
self.citySelecteview = nil;
self.addressView.citySelected.enabled = YES;
}];
}
......
Lighting/Class/Tabbar/Toolview.m
View file @ 9168b49e
......@@ -9,7 +9,7 @@
#import "Toolview.h"
#import "CustomButton.h"
#define ButtonWIDTH 100 //按钮宽度
#define ButtonWIDTH 80 //按钮宽度
#define Buttoninterval 20//按钮间隔
#define ButtonRIGHT 54//按钮高度
......@@ -48,12 +48,28 @@
iconImage.image = TCImage(@"weibo");
[self addSubview:iconImage];
//输入框背景
UIView *backView = [[UIView alloc]initWithFrame:CGRectMake(200, (NavigationHeight-35)/2, 220, 35)];
backView.backgroundColor = kTCColor(242, 242, 242);
backView.layer.masksToBounds = YES;;
backView.layer.cornerRadius = kCornerRadius;
backView.layer.borderWidth = 1;
backView.layer.borderColor = kTCColor(209, 209, 209).CGColor;
[self addSubview:backView];
//搜索图标
//输入框
UITextField *inputField = [[UITextField alloc]initWithFrame:CGRectMake(200, (NavigationHeight-35)/2, 300, 35)];
UITextField *inputField = [[UITextField alloc]initWithFrame:CGRectMake(50, 0, 170, 35)];
inputField.borderStyle = UITextBorderStyleNone;
inputField.backgroundColor = [UIColor grayColor];
inputField.placeholder = @"请输入关键字";
[self addSubview:inputField];
inputField.font = [UIFont systemFontOfSize:12];
[backView addSubview:inputField];
//按钮
NSArray *titleArray = [NSArray arrayWithObjects:@"右视图",@"某某用户",@"我的客户",@"购物车", nil];
......@@ -72,7 +88,7 @@
[button setImage:TCImage(@"business") forState:UIControlStateNormal];
}else
{
[button setImage:TCImage(@"qq") forState:UIControlStateNormal];
[button setImage:TCImage(@"data") forState:UIControlStateNormal];
}
[self addSubview:button];
}
......
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 9168b49e
......@@ -18,6 +18,8 @@
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8411CD0ABAC0036D761 /* ShoppingViewController.m */; };
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */ = {isa = PBXBuildFile; fileRef = 2933934E1CD3158B000D997B /* instructionsLabe.m */; };
293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 293393541CD3379E000D997B /* ShoppingTableViewCell.m */; };
29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29360C2E1CDDC47E002A5D89 /* ScreeningView.m */; };
29360C311CDDC487002A5D89 /* ScreeningView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29360C301CDDC487002A5D89 /* ScreeningView.xib */; };
2942F8A61CDD80C2005B377E /* authenticateView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2942F8A51CDD80C2005B377E /* authenticateView.m */; };
2942F8A81CDD80CE005B377E /* authenticateView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2942F8A71CDD80CE005B377E /* authenticateView.xib */; };
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */; };
......@@ -96,6 +98,9 @@
2933934E1CD3158B000D997B /* instructionsLabe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = instructionsLabe.m; sourceTree = "<group>"; };
293393531CD3379E000D997B /* ShoppingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingTableViewCell.h; sourceTree = "<group>"; };
293393541CD3379E000D997B /* ShoppingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingTableViewCell.m; sourceTree = "<group>"; };
29360C2D1CDDC47E002A5D89 /* ScreeningView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningView.h; sourceTree = "<group>"; };
29360C2E1CDDC47E002A5D89 /* ScreeningView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningView.m; sourceTree = "<group>"; };
29360C301CDDC487002A5D89 /* ScreeningView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ScreeningView.xib; sourceTree = "<group>"; };
2942F8A41CDD80C2005B377E /* authenticateView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = authenticateView.h; sourceTree = "<group>"; };
2942F8A51CDD80C2005B377E /* authenticateView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = authenticateView.m; sourceTree = "<group>"; };
2942F8A71CDD80CE005B377E /* authenticateView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = authenticateView.xib; sourceTree = "<group>"; };
......@@ -658,6 +663,9 @@
29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */,
2992493E1CDB4D1D00786B1E /* AddaddressViewController.h */,
2992493F1CDB4D1D00786B1E /* AddaddressViewController.m */,
29360C2D1CDDC47E002A5D89 /* ScreeningView.h */,
29360C2E1CDDC47E002A5D89 /* ScreeningView.m */,
29360C301CDDC487002A5D89 /* ScreeningView.xib */,
);
name = view;
sourceTree = "<group>";
......@@ -834,6 +842,7 @@
2928F83D1CD0A9CD0036D761 /* qq.png in Resources */,
29706DB41CD082990003C412 /* Assets.xcassets in Resources */,
29706DAF1CD082990003C412 /* Main.storyboard in Resources */,
29360C311CDDC487002A5D89 /* ScreeningView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -913,6 +922,7 @@
29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */,
29BB27771CD9DFBA009A0813 /* ProductLibraryViewController.m in Sources */,
29EAAEAA1CDC7FE800C4DBA2 /* AllCutomerTableViewCell.m in Sources */,
29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */,
29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */,
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */,
......
Lighting/Lighting/Images.xcassets/data.imageset/Contents.json 0 → 100644
View file @ 9168b49e
{
"images" : [
{
"idiom" : "universal",
"filename" : "data.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "data@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ 9168b49e
......@@ -211,8 +211,8 @@
</prototypes>
</tableView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入客户的名称或者手机号" textAlignment="natural" minimumFontSize="17" id="UGf-5N-5E1">
<rect key="frame" x="9" y="12" width="257" height="30"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<rect key="frame" x="28" y="12" width="257" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.93725490199999995" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
......@@ -680,7 +680,7 @@
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
<rect key="frame" x="0.0" y="113.5" width="768" height="84"/>
<rect key="frame" x="0.0" y="49.5" width="768" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
<rect key="frame" x="0.0" y="0.0" width="768" height="83.5"/>
......@@ -757,7 +757,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="160" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
<rect key="frame" x="0.0" y="197.5" width="768" height="160"/>
<rect key="frame" x="0.0" y="133.5" width="768" height="160"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
<rect key="frame" x="0.0" y="0.0" width="768" height="159.5"/>
......@@ -886,7 +886,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="110" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
<rect key="frame" x="0.0" y="357.5" width="768" height="110"/>
<rect key="frame" x="0.0" y="293.5" width="768" height="110"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
<rect key="frame" x="0.0" y="0.0" width="768" height="109.5"/>
......@@ -978,7 +978,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
<rect key="frame" x="0.0" y="467.5" width="768" height="80"/>
<rect key="frame" x="0.0" y="403.5" width="768" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
<rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
......@@ -1039,7 +1039,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fifthcell" rowHeight="75" id="9Yp-o4-Cqr" customClass="AttachmentInformationTableViewCell">
<rect key="frame" x="0.0" y="547.5" width="768" height="75"/>
<rect key="frame" x="0.0" y="483.5" width="768" height="75"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9Yp-o4-Cqr" id="ySo-v9-ySh">
<rect key="frame" x="0.0" y="0.0" width="768" height="74.5"/>
......@@ -1099,7 +1099,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
<rect key="frame" x="0.0" y="622.5" width="768" height="50"/>
<rect key="frame" x="0.0" y="558.5" width="768" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
<rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/>
......@@ -1270,7 +1270,7 @@
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell">
<rect key="frame" x="0.0" y="64" width="300" height="300"/>
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
......@@ -1343,7 +1343,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
<rect key="frame" x="0.0" y="92" width="768" height="170"/>
<rect key="frame" x="0.0" y="28" width="768" height="170"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
<rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/>
......
Lighting/Tools/CustomButton.m
View file @ 9168b49e
......@@ -58,12 +58,12 @@
- (CGRect)imageRectForContentRect:(CGRect)contentRect
{
return CGRectMake((WIDTH-30)/2, 0, 30, 30);
return CGRectMake((WIDTH-25)/2, 0, 25, 25);
}
- (CGRect)titleRectForContentRect:(CGRect)contentRect
{
return CGRectMake(0, 33, WIDTH, 20);
return CGRectMake(0, 30, WIDTH, 20);
}
......
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