Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
Opple-iOS
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
Opple-iOS
Commits
1542ad37
Commit
1542ad37
authored
Dec 16, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:
parent
96d801bf
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
2527 additions
and
1736 deletions
+2527
-1736
ClientdetailsViewController.m
Class/ClientdetailsViewController.m
+2
-2
ReleasePostViewController.m
...enter/ComprehensiveDiscussion/ReleasePostViewController.m
+0
-1
OrderRecordViewController.m
Class/OrderRecordViewController.m
+0
-5
ProductDetailsHeaderView.m
Class/ProductDetailsHeaderView.m
+0
-33
ProductDetailsHeaderView.xib
Class/ProductDetailsHeaderView.xib
+145
-102
ProductDetailsViewController.m
Class/ProductDetailsViewController.m
+8
-4
RebateViewController.m
Class/RebateViewController.m
+8
-24
LearningCenter.storyboard
Lighting/LearningCenter.storyboard
+37
-37
OppleMain.storyboard
Lighting/OppleMain.storyboard
+2323
-1525
BaseViewController.m
Tools/BaseViewController.m
+2
-1
PrefixHeader.pch
Tools/PrefixHeader.pch
+2
-2
No files found.
Class/ClientdetailsViewController.m
View file @
1542ad37
...
@@ -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 - 切换子视图
...
...
Class/LearningCenter/ComprehensiveDiscussion/ReleasePostViewController.m
View file @
1542ad37
...
@@ -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"
...
...
Class/OrderRecordViewController.m
View file @
1542ad37
...
@@ -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
];
...
...
Class/ProductDetailsHeaderView.m
View file @
1542ad37
...
@@ -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 @@
...
...
Class/ProductDetailsHeaderView.xib
View file @
1542ad37
This diff is collapsed.
Click to expand it.
Class/ProductDetailsViewController.m
View file @
1542ad37
...
@@ -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
C
reateHeaderView
];
[
self
c
reateHeaderView
];
}
}
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
#pragma mark -头部视图
#pragma mark -头部视图
-
(
void
)
C
reateHeaderView
-
(
void
)
c
reateHeaderView
{
{
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
;
...
...
Class/RebateViewController.m
View file @
1542ad37
...
@@ -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
.
1
f
usingSpringWithDamping
:
0
.
5
f
initialSpringVelocity
:
0
.
5
f
options
:
UIViewAnimationOptionCurveEaseInOut
animations
:^
{
[
UIView
animateWithDuration
:
0
.
5
delay
:
0
.
1
f
usingSpringWithDamping
:
0
.
5
f
initialSpringVelocity
:
0
.
5
f
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
];
}
}
...
...
Lighting/LearningCenter.storyboard
View file @
1542ad37
This diff is collapsed.
Click to expand it.
Lighting/OppleMain.storyboard
View file @
1542ad37
This diff is collapsed.
Click to expand it.
Tools/BaseViewController.m
View file @
1542ad37
...
@@ -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
];
}
}
...
...
Tools/PrefixHeader.pch
View file @
1542ad37
...
@@ -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]
/**
/**
* 搜索框输入通知
* 搜索框输入通知
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment