Commit d7071671 authored by 曹云霄's avatar 曹云霄

Merge branch 'master' of https://git.oschina.net/gomore/Opple-iOS

parents 97097e66 1b528d38
...@@ -19,4 +19,5 @@ ...@@ -19,4 +19,5 @@
@property (nonatomic,strong) FootSubView *footSubView; @property (nonatomic,strong) FootSubView *footSubView;
@property (nonatomic,strong) SeceneLibraryView *seceneLibraryView; @property (nonatomic,strong) SeceneLibraryView *seceneLibraryView;
@property (nonatomic,strong) ProductLibraryView *productLibraryView; @property (nonatomic,strong) ProductLibraryView *productLibraryView;
@property (nonatomic,strong)UIImageView* backGroundImageView;
@end @end
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
// //
#import "FollowHeartViewController.h" #import "FollowHeartViewController.h"
#import <QuartzCore/QuartzCore.h>
#import "ImageCropperView.h"
@interface FollowHeartViewController () @interface FollowHeartViewController ()
...@@ -22,9 +24,9 @@ ...@@ -22,9 +24,9 @@
} }
-(void)configSubView -(void)configSubView
{ {
UIImageView* imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"backView.png"]]; self.backGroundImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"backView.png"]];
imageView.frame=CGRectMake(0, 0, ScreenWidth, ScreenHeight); self.backGroundImageView.frame=CGRectMake(0, 0, ScreenWidth, ScreenHeight);
[self.view addSubview:imageView]; [self.view addSubview:self.backGroundImageView];
self.leftSubView=[[LeftSubView alloc]initWithFrame:CGRectMake(0, 0, 200, ScreenHeight-200)]; self.leftSubView=[[LeftSubView alloc]initWithFrame:CGRectMake(0, 0, 200, ScreenHeight-200)];
self.leftSubView.delegate=self; self.leftSubView.delegate=self;
[self.view addSubview:self.leftSubView]; [self.view addSubview:self.leftSubView];
...@@ -44,7 +46,7 @@ ...@@ -44,7 +46,7 @@
} }
#pragma leftsubView delegate #pragma subView delegate
- (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button - (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button
{ {
switch (btnTag) { switch (btnTag) {
...@@ -96,6 +98,23 @@ ...@@ -96,6 +98,23 @@
} }
} }
//场景赋图回调
- (void)resetSuperBackGroundImage:(UIImage*)image
{
self.backGroundImageView.image=image;
}
//产品附图回调
- (void)addProductImage:(UIImage*)image
{
ImageCropperView *cropper=[[ImageCropperView alloc]initWithFrame:CGRectMake(400, 300, 300, 300)];
// cropper.center=self.view.center;
// cropper.bounds=CGRectMake(0, 0, 200, 200);
cropper.layer.borderWidth = 1.0;
cropper.layer.borderColor = [UIColor blueColor].CGColor;
// [cropper setup];
cropper.image = image;
[self.view addSubview:cropper];
}
-(void)setViewAnimations:(UIButton *)sender -(void)setViewAnimations:(UIButton *)sender
{ {
UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *btn=[UIButton buttonWithType:UIButtonTypeCustom];
......
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
//回调 //回调
- (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button; - (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button;
- (void)resetSuperBackGroundImage:(UIImage*)image;
@end @end
@interface FootSubView : UIView @interface FootSubView : UIView<UIGestureRecognizerDelegate>
@property (nonatomic,assign) id<FootViewBtnClickdelegate> delegate; @property (nonatomic,assign) id<FootViewBtnClickdelegate> delegate;
@property (nonatomic,strong)UIScrollView *scrollView; @property (nonatomic,strong)UIScrollView *scrollView;
@property (nonatomic,strong)NSMutableArray *dataArray; @property (nonatomic,strong)NSMutableArray *dataArray;
......
...@@ -33,21 +33,42 @@ ...@@ -33,21 +33,42 @@
[button addTarget:self action:@selector(footBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside]; [button addTarget:self action:@selector(footBtnDidSelected:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:button]; [self addSubview:button];
self.scrollView=[[UIScrollView alloc]initWithFrame:CGRectMake(100, 0, self.frame.size.width-100, self.frame.size.height)]; self.scrollView=[[UIScrollView alloc]initWithFrame:CGRectMake(100, 0, self.frame.size.width-100, self.frame.size.height)];
// 禁用滚动条,只设置水平方向的滚动条即可,竖直方向的滚动范围是0,所以没必要设置
self.scrollView.showsHorizontalScrollIndicator = NO;
[self addSubview:self.scrollView];
// contentSize的y值为0表示在垂直方向上不做滚动 // contentSize的y值为0表示在垂直方向上不做滚动
self.scrollView.contentSize = CGSizeMake((self.dataArray.count+1) * (100+10), 0); self.scrollView.contentSize = CGSizeMake((self.dataArray.count+1) * (100+10), 0);
for (int i=0; i<self.dataArray.count; i++) { for (int i=0; i<self.dataArray.count; i++) {
UIImageView *imageView = [[UIImageView alloc] init]; UIButton *button=[[UIButton alloc]initWithFrame:CGRectMake(i*(100+10), 30, 100, 100)];
// 定义图片名,通过循环把所有的图片添加到scrollView中
NSString *imageName = [NSString stringWithFormat:@"backView" ]; NSString *imageName = [NSString stringWithFormat:@"backView" ];
imageView.frame = CGRectMake(i*(100+10), 30, 100, 100); [button setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal];
imageView.image = [UIImage imageNamed:imageName]; button.tag=100+i;
[self.scrollView addSubview:imageView]; [button addTarget:self action:@selector(clicked:) forControlEvents:UIControlEventTouchUpInside];
UILongPressGestureRecognizer *longPressGR =
[[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPress)];
longPressGR.minimumPressDuration = 0.5;
[button addGestureRecognizer:longPressGR];
[self.scrollView addSubview:button];
} }
// 禁用滚动条,只设置水平方向的滚动条即可,竖直方向的滚动范围是0,所以没必要设置
self.scrollView.showsHorizontalScrollIndicator = NO;
[self addSubview:self.scrollView];
} }
//单次点击
-(void)clicked:(UIButton*)sender
{
NSLog(@"%d",(sender.tag));
if ([self.delegate respondsToSelector:@selector(resetSuperBackGroundImage:)]) {
[self.delegate resetSuperBackGroundImage:sender.imageView.image];
}
// resetSuperBackGroundImage
}
//长按
-(void)longPress
{
NSLog(@"长按");
}
-(void)footBtnDidSelected:(UIButton *)sender -(void)footBtnDidSelected:(UIButton *)sender
{ {
if ([self.delegate respondsToSelector:@selector(buttonClick:withButton:)]) { if ([self.delegate respondsToSelector:@selector(buttonClick:withButton:)]) {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
//回调 //回调
- (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button; - (void)buttonClick:(NSInteger)btnTag withButton:(UIButton *)button;
- (void)addProductImage:(UIImage*)image;
@end @end
@interface RightSubView : UIView @interface RightSubView : UIView
......
...@@ -36,18 +36,47 @@ ...@@ -36,18 +36,47 @@
// contentSize的y值为0表示在垂直方向上不做滚动 // contentSize的y值为0表示在垂直方向上不做滚动
self.scrollView.contentSize = CGSizeMake(0, (self.dataArray.count+1) * (100+10)); self.scrollView.contentSize = CGSizeMake(0, (self.dataArray.count+1) * (100+10));
for (int i=0; i<self.dataArray.count; i++) { for (int i=0; i<self.dataArray.count; i++) {
UIImageView *imageView = [[UIImageView alloc] init];
// 定义图片名,通过循环把所有的图片添加到scrollView中 UIButton *button=[[UIButton alloc]initWithFrame:CGRectMake(80, 20+i*(100+10), 100, 100)];
NSString *imageName = [NSString stringWithFormat:@"05产品库-详情_03" ]; NSString *imageName = [NSString stringWithFormat:@"05产品库-详情_03" ];
imageView.frame = CGRectMake(80, 20+i*(100+10), 100, 100); [button setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal];
imageView.image = [UIImage imageNamed:imageName]; button.tag=100+i;
[self.scrollView addSubview:imageView]; [button addTarget:self action:@selector(clicked:) forControlEvents:UIControlEventTouchUpInside];
UILongPressGestureRecognizer *longPressGR =
[[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPress)];
longPressGR.minimumPressDuration = 0.5;
[button addGestureRecognizer:longPressGR];
[self.scrollView addSubview:button];
// UIImageView *imageView = [[UIImageView alloc] init];
// // 定义图片名,通过循环把所有的图片添加到scrollView中
// NSString *imageName = [NSString stringWithFormat:@"05产品库-详情_03" ];
// imageView.frame = CGRectMake(80, 20+i*(100+10), 100, 100);
// imageView.image = [UIImage imageNamed:imageName];
// [self.scrollView addSubview:imageView];
} }
// 禁用滚动条,只设置水平方向的滚动条即可,竖直方向的滚动范围是0,所以没必要设置 // 禁用滚动条,只设置水平方向的滚动条即可,竖直方向的滚动范围是0,所以没必要设置
self.scrollView.showsVerticalScrollIndicator = NO; self.scrollView.showsVerticalScrollIndicator = NO;
[self addSubview:self.scrollView]; [self addSubview:self.scrollView];
} }
//单次点击
-(void)clicked:(UIButton*)sender
{
NSLog(@"%d",(sender.tag));
if ([self.delegate respondsToSelector:@selector(addProductImage:)]) {
[self.delegate addProductImage:sender.imageView.image];
}
// resetSuperBackGroundImage
}
//长按
-(void)longPress
{
NSLog(@"长按");
}
-(void)rightBtnDidSelected:(UIButton *)sender -(void)rightBtnDidSelected:(UIButton *)sender
{ {
if ([self.delegate respondsToSelector:@selector(buttonClick:withButton:)]) { if ([self.delegate respondsToSelector:@selector(buttonClick:withButton:)]) {
......
//
// ImageCopperView.h
// PerfectImageCropper
//
// Created by Jin Huang on 11/22/12.
//
//
#import <UIKit/UIKit.h>
@protocol ImageCropperDelegate;
@interface ImageCropperView : UIImageView {
UIImageView *imageView;
}
@property (nonatomic, retain) UIImage *image;
@property (nonatomic, retain) UIImage *croppedImage;
@property (nonatomic, assign) id <ImageCropperDelegate> delegate;
- (void)setup;
- (void)finishCropping;
- (void)reset;
@end
@protocol ImageCropperDelegate <NSObject>
- (void)imageCropper:(ImageCropperView *)cropper didFinishCroppingWithImage:(UIImage *)image;
@end
\ No newline at end of file
//
// ImageCopperView.m
// PerfectImageCropper
//
// Created by Jin Huang on 11/22/12.
//
//
#import "ImageCropperView.h"
#import <QuartzCore/QuartzCore.h>
#include <math.h>
#import "UIImage+Rotation.h"
@interface ImageCropperView()
{
@private
CGSize _originalImageViewSize;
}
@property (nonatomic, retain) UIImageView *imageView;
@end
@implementation ImageCropperView
@synthesize imageView, image = _image, delegate, croppedImage;
- (void)setup
{
self.clipsToBounds = YES;
self.backgroundColor = [UIColor clearColor];
self.userInteractionEnabled = YES;
UIRotationGestureRecognizer *rotateGes = [[UIRotationGestureRecognizer alloc] initWithTarget:self action:@selector(rotateImage:)];
[self addGestureRecognizer:rotateGes];
UIPinchGestureRecognizer *scaleGes = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(scaleImage:)];
[self addGestureRecognizer:scaleGes];
UIPanGestureRecognizer *moveGes = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(moveImage:)];
[moveGes setMinimumNumberOfTouches:1];
[moveGes setMaximumNumberOfTouches:1];
[self addGestureRecognizer:moveGes];
}
- (id)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self setup];
}
return self;
}
float _lastTransX = 0.0, _lastTransY = 0.0;
- (void)moveImage:(UIPanGestureRecognizer *)sender
{
CGPoint translatedPoint = [sender translationInView:self];
if([sender state] == UIGestureRecognizerStateBegan) {
_lastTransX = 0.0;
_lastTransY = 0.0;
}
CGAffineTransform trans = CGAffineTransformMakeTranslation(translatedPoint.x - _lastTransX, translatedPoint.y - _lastTransY);
CGAffineTransform newTransform = CGAffineTransformConcat(self.transform, trans);
_lastTransX = translatedPoint.x;
_lastTransY = translatedPoint.y;
self.transform = newTransform;
}
float _lastScale = 1.0;
- (void)scaleImage:(UIPinchGestureRecognizer *)sender
{
if([sender state] == UIGestureRecognizerStateBegan) {
_lastScale = 1.0;
return;
}
CGFloat scale = [sender scale]/_lastScale;
CGAffineTransform currentTransform = self.transform;
CGAffineTransform newTransform = CGAffineTransformScale(currentTransform, scale, scale);
[self setTransform:newTransform];
_lastScale = [sender scale];
}
float _lastRotation = 0.0;
- (void)rotateImage:(UIRotationGestureRecognizer *)sender
{
if([sender state] == UIGestureRecognizerStateEnded) {
_lastRotation = 0.0;
return;
}
CGFloat rotation = -_lastRotation + [sender rotation];
CGAffineTransform currentTransform = self.transform;
CGAffineTransform newTransform = CGAffineTransformRotate(currentTransform,rotation);
[self setTransform:newTransform];
_lastRotation = [sender rotation];
}
@end
//
// UIImage+Rotation.h
// PerfectImageCropper
//
// Created by Jin Huang on 5/29/13.
// Copyright (c) 2013 Jin Huang. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface UIImage (Rotation)
- (UIImage *)imageRotatedByRadians:(CGFloat)radians;
- (UIImage *)imageRotatedByDegrees:(CGFloat)degrees;
@end
//
// UIImage+Rotation.m
// PerfectImageCropper
//
// Created by Jin Huang on 5/29/13.
// Copyright (c) 2013 Jin Huang. All rights reserved.
//
#import "UIImage+Rotation.h"
CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;};
CGFloat RadiansToDegrees(CGFloat radians) {return radians * 180/M_PI;};
@implementation UIImage (Rotation)
- (UIImage *)imageRotatedByRadians:(CGFloat)radians
{
return [self imageRotatedByDegrees:RadiansToDegrees(radians)];
}
- (UIImage *)imageRotatedByDegrees:(CGFloat)degrees
{
UIView *rotatedViewBox = [[UIView alloc] initWithFrame:CGRectMake(0,0,self.size.width, self.size.height)];
CGAffineTransform t = CGAffineTransformMakeRotation(DegreesToRadians(degrees));
rotatedViewBox.transform = t;
CGSize rotatedSize = rotatedViewBox.frame.size;
UIGraphicsBeginImageContext(rotatedSize);
CGContextRef bitmap = UIGraphicsGetCurrentContext();
CGContextTranslateCTM(bitmap, rotatedSize.width/2, rotatedSize.height/2);
CGContextRotateCTM(bitmap, DegreesToRadians(degrees));
CGContextScaleCTM(bitmap, 1.0, -1.0);
CGContextDrawImage(bitmap, CGRectMake(-self.size.width / 2, -self.size.height / 2, self.size.width, self.size.height), [self CGImage]);
UIImage *resImage = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();
return resImage;
}
@end;
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
04A14A251CE0FC3A00DAD5F3 /* LeftSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A241CE0FC3A00DAD5F3 /* LeftSubView.m */; }; 04A14A251CE0FC3A00DAD5F3 /* LeftSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A241CE0FC3A00DAD5F3 /* LeftSubView.m */; };
04A14A281CE0FC5600DAD5F3 /* RightSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A271CE0FC5600DAD5F3 /* RightSubView.m */; }; 04A14A281CE0FC5600DAD5F3 /* RightSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A271CE0FC5600DAD5F3 /* RightSubView.m */; };
04A14A2B1CE0FC7F00DAD5F3 /* FootSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */; }; 04A14A2B1CE0FC7F00DAD5F3 /* FootSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */; };
060D397C1CE45CFE0082AECD /* ImageCropperView.m in Sources */ = {isa = PBXBuildFile; fileRef = 060D39791CE45CFE0082AECD /* ImageCropperView.m */; };
060D397D1CE45CFE0082AECD /* UIImage+Rotation.m in Sources */ = {isa = PBXBuildFile; fileRef = 060D397B1CE45CFE0082AECD /* UIImage+Rotation.m */; };
2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */; }; 2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */; };
2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; }; 2928F7E71CD087FE0036D761 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F7E61CD087FE0036D761 /* BaseViewController.m */; };
2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; }; 2928F8321CD09E320036D761 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2928F8311CD09E320036D761 /* Toolview.m */; };
...@@ -117,6 +119,10 @@ ...@@ -117,6 +119,10 @@
04A14A271CE0FC5600DAD5F3 /* RightSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RightSubView.m; sourceTree = "<group>"; }; 04A14A271CE0FC5600DAD5F3 /* RightSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RightSubView.m; sourceTree = "<group>"; };
04A14A291CE0FC7F00DAD5F3 /* FootSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FootSubView.h; sourceTree = "<group>"; }; 04A14A291CE0FC7F00DAD5F3 /* FootSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FootSubView.h; sourceTree = "<group>"; };
04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FootSubView.m; sourceTree = "<group>"; }; 04A14A2A1CE0FC7F00DAD5F3 /* FootSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FootSubView.m; sourceTree = "<group>"; };
060D39781CE45CFE0082AECD /* ImageCropperView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageCropperView.h; sourceTree = "<group>"; };
060D39791CE45CFE0082AECD /* ImageCropperView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageCropperView.m; sourceTree = "<group>"; };
060D397A1CE45CFE0082AECD /* UIImage+Rotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Rotation.h"; sourceTree = "<group>"; };
060D397B1CE45CFE0082AECD /* UIImage+Rotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Rotation.m"; sourceTree = "<group>"; };
18E6D8479D48A4650167EAF2 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 18E6D8479D48A4650167EAF2 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
2906B5D51CD89246000849B4 /* ClientDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientDetailsTableViewCell.h; sourceTree = "<group>"; }; 2906B5D51CD89246000849B4 /* ClientDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientDetailsTableViewCell.h; sourceTree = "<group>"; };
2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientDetailsTableViewCell.m; sourceTree = "<group>"; }; 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientDetailsTableViewCell.m; sourceTree = "<group>"; };
...@@ -350,6 +356,17 @@ ...@@ -350,6 +356,17 @@
name = views; name = views;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
060D39771CE45CFE0082AECD /* tools */ = {
isa = PBXGroup;
children = (
060D39781CE45CFE0082AECD /* ImageCropperView.h */,
060D39791CE45CFE0082AECD /* ImageCropperView.m */,
060D397A1CE45CFE0082AECD /* UIImage+Rotation.h */,
060D397B1CE45CFE0082AECD /* UIImage+Rotation.m */,
);
path = tools;
sourceTree = "<group>";
};
2906B5D31CD8920F000849B4 /* Controller */ = { 2906B5D31CD8920F000849B4 /* Controller */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -746,6 +763,7 @@ ...@@ -746,6 +763,7 @@
29BB27691CD9DDF3009A0813 /* FollowHeartVC */ = { 29BB27691CD9DDF3009A0813 /* FollowHeartVC */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
060D39771CE45CFE0082AECD /* tools */,
0470D60E1CE292EF00647F0F /* subView */, 0470D60E1CE292EF00647F0F /* subView */,
04A14A221CE0FB8400DAD5F3 /* views */, 04A14A221CE0FB8400DAD5F3 /* views */,
29BB276A1CD9DE74009A0813 /* FollowHeartViewController.h */, 29BB276A1CD9DE74009A0813 /* FollowHeartViewController.h */,
...@@ -1120,6 +1138,7 @@ ...@@ -1120,6 +1138,7 @@
2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */, 2998763F1CD9985B00C90D0A /* AttachmentInformationTableViewCell.m in Sources */,
293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */, 293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */,
29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */, 29EAAE951CDC414C00C4DBA2 /* SeceneLibraryCollectionViewCell.m in Sources */,
060D397C1CE45CFE0082AECD /* ImageCropperView.m in Sources */,
2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */, 2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */,
29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */, 29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */,
2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */, 2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */,
...@@ -1161,6 +1180,7 @@ ...@@ -1161,6 +1180,7 @@
29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */, 29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */, 29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */,
299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */, 299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */,
060D397D1CE45CFE0082AECD /* UIImage+Rotation.m in Sources */,
299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */, 299249371CDB3C6500786B1E /* GenerateOrdersViewController.m in Sources */,
2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */, 2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */,
2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */, 2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */,
...@@ -1223,8 +1243,7 @@ ...@@ -1223,8 +1243,7 @@
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)"; CODE_SIGN_IDENTITY = "iPhone Developer: 超级 朱 (SXSQ6S5D55)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
...@@ -1246,7 +1265,7 @@ ...@@ -1246,7 +1265,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.3; IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f"; PROVISIONING_PROFILE = "d25ba75f-c4da-4bef-b966-3a998dcbffbe";
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 2; TARGETED_DEVICE_FAMILY = 2;
}; };
...@@ -1270,8 +1289,7 @@ ...@@ -1270,8 +1289,7 @@
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)"; CODE_SIGN_IDENTITY = "iPhone Developer: 超级 朱 (SXSQ6S5D55)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
...@@ -1286,7 +1304,7 @@ ...@@ -1286,7 +1304,7 @@
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3; IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f"; PROVISIONING_PROFILE = "d25ba75f-c4da-4bef-b966-3a998dcbffbe";
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 2; TARGETED_DEVICE_FAMILY = 2;
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
...@@ -1300,8 +1318,8 @@ ...@@ -1300,8 +1318,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer: 超级 朱 (SXSQ6S5D55)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 超级 朱 (SXSQ6S5D55)";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Tools/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/Tools/PrefixHeader.pch";
...@@ -1339,7 +1357,7 @@ ...@@ -1339,7 +1357,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6"; PROVISIONING_PROFILE = "d25ba75f-c4da-4bef-b966-3a998dcbffbe";
STRIP_PNG_TEXT = NO; STRIP_PNG_TEXT = NO;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
}; };
...@@ -1352,8 +1370,8 @@ ...@@ -1352,8 +1370,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "iPhone Developer: 超级 朱 (SXSQ6S5D55)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 超级 朱 (SXSQ6S5D55)";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Tools/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/Tools/PrefixHeader.pch";
...@@ -1391,7 +1409,7 @@ ...@@ -1391,7 +1409,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple; PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6"; PROVISIONING_PROFILE = "d25ba75f-c4da-4bef-b966-3a998dcbffbe";
STRIP_PNG_TEXT = NO; STRIP_PNG_TEXT = NO;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
}; };
......
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