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
2ad224ab
Commit
2ad224ab
authored
Jul 31, 2017
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
42016026
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
ExperienceCentreViewController.m
...eriencecentre/Controller/ExperienceCentreViewController.m
+2
-2
SceneViewController.h
...s/Experiencecentre/Scene/Controller/SceneViewController.h
+2
-2
SceneViewController.m
...s/Experiencecentre/Scene/Controller/SceneViewController.m
+6
-6
No files found.
Lighting/Class/Experiencecentre/Controller/ExperienceCentreViewController.m
View file @
2ad224ab
...
...
@@ -473,7 +473,7 @@
#pragma mark -AddImagesDelegate选中图片
-
(
void
)
S
electedImageswithModel
:
(
JSONModel
*
)
model
withisScene
:
(
BOOL
)
isScene
returnResponse
:
(
void
(
^
)(
BOOL
))
isThere
-
(
void
)
s
electedImageswithModel
:
(
JSONModel
*
)
model
withisScene
:
(
BOOL
)
isScene
returnResponse
:
(
void
(
^
)(
BOOL
))
isThere
{
if
(
isScene
)
{
//场景
...
...
@@ -509,7 +509,7 @@
}
#pragma mark -刷新
-
(
void
)
R
efreshSceneAndProduct
:
(
BOOL
)
isScene
-
(
void
)
r
efreshSceneAndProduct
:
(
BOOL
)
isScene
{
if
(
isScene
)
{
...
...
Lighting/Class/Experiencecentre/Scene/Controller/SceneViewController.h
View file @
2ad224ab
...
...
@@ -16,9 +16,9 @@
@required
//增加图片
-
(
void
)
S
electedImageswithModel
:
(
JSONModel
*
)
model
withisScene
:
(
BOOL
)
isScene
returnResponse
:
(
void
(
^
)(
BOOL
boolValue
))
isThere
;
-
(
void
)
s
electedImageswithModel
:
(
JSONModel
*
)
model
withisScene
:
(
BOOL
)
isScene
returnResponse
:
(
void
(
^
)(
BOOL
boolValue
))
isThere
;
//刷新
-
(
void
)
R
efreshSceneAndProduct
:(
BOOL
)
isScene
;
-
(
void
)
r
efreshSceneAndProduct
:(
BOOL
)
isScene
;
//删除图片
@end
...
...
Lighting/Class/Experiencecentre/Scene/Controller/SceneViewController.m
View file @
2ad224ab
...
...
@@ -745,9 +745,9 @@
if
(
self
.
isScene
)
{
ScreeningCollectionViewCell
*
cell
=
(
ScreeningCollectionViewCell
*
)[
collectionView
cellForItemAtIndexPath
:
indexPath
];
CGPoint
startPoint
=
[
cell
convertPoint
:
cell
.
sceneImageView
.
center
toView
:
self
.
sceneOrProductClollectionView
.
window
];
if
([
self
.
delegate
respondsToSelector
:
@selector
(
S
electedImageswithModel
:
withisScene
:
returnResponse
:
)])
{
if
([
self
.
delegate
respondsToSelector
:
@selector
(
s
electedImageswithModel
:
withisScene
:
returnResponse
:
)])
{
SceneListModel
*
model
=
[
self
.
sceneDatasArray
objectAtIndex_opple
:
indexPath
.
item
];
[
self
.
delegate
S
electedImageswithModel
:
model
withisScene
:
self
.
isScene
returnResponse
:^
(
BOOL
boolValue
)
{
[
self
.
delegate
s
electedImageswithModel
:
model
withisScene
:
self
.
isScene
returnResponse
:^
(
BOOL
boolValue
)
{
//判断选中的图片是否存在
if
(
!
boolValue
)
{
[
weakSelf
StartAddShoppingCarAnimationWithimage
:[
cell
.
sceneImageView
image
]
withStartpoint
:
startPoint
withSize
:
cell
.
mj_size
];
...
...
@@ -764,9 +764,9 @@
{
ProductScreeningCollectionViewCell
*
cell
=
(
ProductScreeningCollectionViewCell
*
)[
collectionView
cellForItemAtIndexPath
:
indexPath
];
CGPoint
startPoint
=
[
cell
convertPoint
:
cell
.
goodsImageView
.
center
toView
:
self
.
sceneOrProductClollectionView
.
window
];
if
([
self
.
delegate
respondsToSelector
:
@selector
(
S
electedImageswithModel
:
withisScene
:
returnResponse
:
)])
{
if
([
self
.
delegate
respondsToSelector
:
@selector
(
s
electedImageswithModel
:
withisScene
:
returnResponse
:
)])
{
GoodsCategoryModel
*
model
=
[
self
.
productDatasArray
objectAtIndex_opple
:
indexPath
.
item
];
[
self
.
delegate
S
electedImageswithModel
:
model
withisScene
:
self
.
isScene
returnResponse
:^
(
BOOL
boolValue
)
{
[
self
.
delegate
s
electedImageswithModel
:
model
withisScene
:
self
.
isScene
returnResponse
:^
(
BOOL
boolValue
)
{
//判断图片是否存在
if
(
!
boolValue
)
{
[
weakSelf
StartAddShoppingCarAnimationWithimage
:[
cell
.
goodsImageView
image
]
withStartpoint
:
startPoint
withSize
:
cell
.
mj_size
];
...
...
@@ -841,9 +841,9 @@
#pragma mark -动画完成
-
(
void
)
animationDidStop
:
(
CAAnimation
*
)
anim
finished
:
(
BOOL
)
flag
{
if
([
self
.
delegate
respondsToSelector
:
@selector
(
R
efreshSceneAndProduct
:)])
{
if
([
self
.
delegate
respondsToSelector
:
@selector
(
r
efreshSceneAndProduct
:)])
{
[
self
.
delegate
R
efreshSceneAndProduct
:
self
.
isScene
];
[
self
.
delegate
r
efreshSceneAndProduct
:
self
.
isScene
];
}
}
...
...
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