Skip to content

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

caoyunxiao

parent 49827aa7
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 12 deletions
Lighting/Class/Login/LoginViewController.m
View file @ 4bf3a3c4
......@@ -13,6 +13,7 @@
@interface LoginViewController ()<RightVCselectedDelegate>
@property (nonatomic,strong) MMDrawerController *drawerController;
......@@ -61,6 +62,11 @@
SHARED_APPDELEGATE.mmdrawer = self.drawerController;
SHARED_APPDELEGATE.window.rootViewController = self.drawerController;
}
......
Lighting/Class/ProductLibraryViewController.m
View file @ 4bf3a3c4
......@@ -118,6 +118,8 @@
self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
self.screenView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
//点击手势
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(DismissScreenView)];
tap.delegate = self;
......
Lighting/Class/Tabbar/CustomTabbarController.m
View file @ 4bf3a3c4
......@@ -17,9 +17,10 @@
#import "AboutViewController.h"
#import "AllCustomerViewController.h"
#import "CustomerOrderViewController.h"
#import "UserViewController.h"
@interface CustomTabbarController ()<TabbarButtonClickdelegate>
@interface CustomTabbarController ()<TabbarButtonClickdelegate,UIPopoverPresentationControllerDelegate>
@property (nonatomic,strong) NSArray *identifierArray;
@property (nonatomic,strong) NSArray *controllerArray;
......@@ -121,7 +122,7 @@
#pragma amrk -TabbarButtonClickdelegate代理
- (void)ButtonClickAction:(NSInteger)Buttontag
- (void)ButtonClickAction:(NSInteger)Buttontag withButton:(UIButton *)button
{
switch (Buttontag) {
......@@ -136,6 +137,19 @@
//某某用户
case 101:
{
UserViewController *userVC = [[UserViewController alloc]init];
userVC.preferredContentSize = CGSizeMake(260, 170);
userVC.modalPresentationStyle = UIModalPresentationPopover;
UIPopoverPresentationController *pop = userVC.popoverPresentationController;
pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
pop.sourceView = userVC.view;
pop.delegate = self;
pop.sourceRect = button.frame;
[self presentViewController:userVC animated:YES completion:nil];
}
break;
//我的客户
......@@ -157,10 +171,16 @@
}
}
- (UIModalPresentationStyle)adaptivePresentationStyleForPresentationController:(UIPresentationController *)controller
{ // 此处为不适配(如果选择其他,会自动视频屏幕,上面设置的大小就毫无意义了)
return UIModalPresentationNone;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
Lighting/Class/Tabbar/Toolview.h
View file @ 4bf3a3c4
......@@ -15,7 +15,7 @@
/**
* 点击按钮回调
*/
- (void)ButtonClickAction:(NSInteger)Buttontag;
- (void)ButtonClickAction:(NSInteger)Buttontag withButton:(UIButton *)button;
@end
......
Lighting/Class/Tabbar/Toolview.m
View file @ 4bf3a3c4
......@@ -8,6 +8,7 @@
#import "Toolview.h"
#import "CustomButton.h"
#import "UserViewController.h"
#define ButtonWIDTH 80 //按钮宽度
#define Buttoninterval 20//按钮间隔
......@@ -24,7 +25,6 @@
}
*/
- (instancetype)initWithFrame:(CGRect)frame
{
if (self = [super initWithFrame:frame]) {
......@@ -35,13 +35,15 @@
return self;
}
#pragma mark -布局
- (void)uiConfigAction
{
//阴影
self.layer.shadowColor = [UIColor blackColor].CGColor;
self.layer.shadowRadius = 4;
self.layer.shadowOpacity = 0.8;
self.layer.shadowOpacity = 0.5;
self.layer.shadowOffset = CGSizeMake(0,0);
//图标
......@@ -62,7 +64,6 @@
//输入框
UITextField *inputField = [[UITextField alloc]initWithFrame:CGRectMake(50, 0, 170, 35)];
inputField.borderStyle = UITextBorderStyleNone;
......@@ -114,10 +115,12 @@
// self.underlineView.frame = frame;
// }];
//点击代理
if ([self.delegate respondsToSelector:@selector(ButtonClickAction:)]) {
if ([self.delegate respondsToSelector:@selector(ButtonClickAction:withButton:)]) {
[self.delegate ButtonClickAction:button.tag];
[self.delegate ButtonClickAction:button.tag withButton:button];
}
}
......
Lighting/Class/UserViewController.h 0 → 100644
View file @ 4bf3a3c4
//
// UserViewController.h
// Lighting
//
// Created by 曹云霄 on 16/5/8.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface UserViewController : BaseViewController
@end
Lighting/Class/UserViewController.m 0 → 100644
View file @ 4bf3a3c4
//
// UserViewController.m
// Lighting
//
// Created by 曹云霄 on 16/5/8.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "UserViewController.h"
@interface UserViewController ()
@end
@implementation UserViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
Lighting/Class/UserViewController.xib 0 → 100644
View file @ 4bf3a3c4
<?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" customClass="UserViewController">
<connections>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="260" height="170"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tuQ-DW-D80">
<rect key="frame" x="174" y="18" width="80" height="80"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HTl-6m-Nx6">
<rect key="frame" x="7" y="20" width="30" height="30"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="V66-r9-9Q2">
<rect key="frame" x="7" y="62" width="30" height="30"/>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="cgR-tl-g1N">
<rect key="frame" x="49" y="20" width="117" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iPT-ib-2cp">
<rect key="frame" x="49" y="62" width="117" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7l0-kF-pfD">
<rect key="frame" x="9" y="125" width="80" height="30"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="切换账户"/>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MmS-T7-ieX">
<rect key="frame" x="173" y="125" width="80" height="30"/>
<color key="backgroundColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="修改密码"/>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m0J-Ji-o4P">
<rect key="frame" x="107" y="125" width="46" height="30"/>
<color key="backgroundColor" red="1" green="0.7124683436" blue="0.054982668810000003" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="注销"/>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="244" y="296.5"/>
</view>
</objects>
</document>
Lighting/Lighting.xcodeproj/project.pbxproj
View file @ 4bf3a3c4
......@@ -43,6 +43,8 @@
29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EB81CDF1FB3001A484F /* screeningFirstView.m */; };
29834EBB1CDF1FBC001A484F /* screeningFirstView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29834EBA1CDF1FBC001A484F /* screeningFirstView.xib */; };
29834EC01CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EBF1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m */; };
29834EC51CDF76C1001A484F /* UserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29834EC31CDF76C1001A484F /* UserViewController.m */; };
29834EC61CDF76C1001A484F /* UserViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29834EC41CDF76C1001A484F /* UserViewController.xib */; };
299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */; };
2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299249391CDB3E4500786B1E /* GenerateOrdersTableViewCell.m */; };
2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2992493C1CDB3E8800786B1E /* GenerateOrdersModifyTableViewCell.m */; };
......@@ -143,6 +145,9 @@
29834EBA1CDF1FBC001A484F /* screeningFirstView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = screeningFirstView.xib; sourceTree = "<group>"; };
29834EBE1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningFirstCollectionViewCell.h; sourceTree = "<group>"; };
29834EBF1CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningFirstCollectionViewCell.m; sourceTree = "<group>"; };
29834EC21CDF76C1001A484F /* UserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserViewController.h; sourceTree = "<group>"; };
29834EC31CDF76C1001A484F /* UserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserViewController.m; sourceTree = "<group>"; };
29834EC41CDF76C1001A484F /* UserViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UserViewController.xib; sourceTree = "<group>"; };
299249351CDB3C6500786B1E /* GenerateOrdersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersViewController.h; sourceTree = "<group>"; };
299249361CDB3C6500786B1E /* GenerateOrdersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateOrdersViewController.m; sourceTree = "<group>"; };
299249381CDB3E4500786B1E /* GenerateOrdersTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateOrdersTableViewCell.h; sourceTree = "<group>"; };
......@@ -291,6 +296,7 @@
2928F7DD1CD085430036D761 /* Class */ = {
isa = PBXGroup;
children = (
29834EC11CDF768C001A484F /* XXuserController */,
2962D06E1CD1A56B0058829D /* RIghtVC */,
2962D06A1CD1A3FE0058829D /* MyClient */,
2928F83F1CD0AB830036D761 /* Shoppingcart */,
......@@ -573,6 +579,16 @@
name = screeningFirstView;
sourceTree = "<group>";
};
29834EC11CDF768C001A484F /* XXuserController */ = {
isa = PBXGroup;
children = (
29834EC21CDF76C1001A484F /* UserViewController.h */,
29834EC31CDF76C1001A484F /* UserViewController.m */,
29834EC41CDF76C1001A484F /* UserViewController.xib */,
);
name = XXuserController;
sourceTree = "<group>";
};
299249411CDB517A00786B1E /* ModifytheShippingAddressView */ = {
isa = PBXGroup;
children = (
......@@ -879,6 +895,7 @@
2949BAC41CD3086F0049385A /* weibo.png in Resources */,
29EAAE971CDC4B2900C4DBA2 /* The Swift Programming Language 中文版 - v1.2.pdf in Resources */,
2928F83D1CD0A9CD0036D761 /* qq.png in Resources */,
29834EC61CDF76C1001A484F /* UserViewController.xib in Resources */,
29706DB41CD082990003C412 /* Assets.xcassets in Resources */,
29706DAF1CD082990003C412 /* Main.storyboard in Resources */,
29360C311CDDC487002A5D89 /* ScreeningView.xib in Resources */,
......@@ -991,6 +1008,7 @@
2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */,
29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */,
29834EC01CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m in Sources */,
29834EC51CDF76C1001A484F /* UserViewController.m in Sources */,
29BB277D1CD9DFCB009A0813 /* CustomerManagementViewController.m in Sources */,
2962D06D1CD1A43A0058829D /* ClientViewController.m in Sources */,
29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */,
......
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