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
d1211c25
Commit
d1211c25
authored
Jun 06, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
e814e7ed
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
ProductLibraryViewController.m
Lighting/Class/ProductLibraryViewController.m
+2
-4
ExperienceCentreViewController.m
Lighting/Tools/ExperienceCentreViewController.m
+4
-2
ScreeningCollectionViewCell.m
Lighting/Tools/ScreeningCollectionViewCell.m
+3
-2
No files found.
Lighting/Class/ProductLibraryViewController.m
View file @
d1211c25
...
@@ -519,15 +519,13 @@
...
@@ -519,15 +519,13 @@
#pragma mark -筛选
#pragma mark -筛选
-
(
void
)
ScreeningButtonClick
-
(
void
)
ScreeningButtonClick
{
{
//
// ExperienceCentreViewController *ExperienceCenter = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
// ExperienceCentreViewController *ExperienceCenter = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
//// [self presentViewController:ExperienceCenter animated:YES completion:nil];
//
// ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
// ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
// UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
// UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
// popover.sourceView = ExperienceCenter.view;
// popover.sourceView = ExperienceCenter.view;
// [self presentViewController:ExperienceCenter animated:YES completion:nil];
// [self presentViewController:ExperienceCenter animated:YES completion:nil];
self
.
screenView
=
[[[
NSBundle
mainBundle
]
loadNibNamed
:
@"ScreeningView"
owner
:
self
options
:
nil
]
firstObject
];
self
.
screenView
=
[[[
NSBundle
mainBundle
]
loadNibNamed
:
@"ScreeningView"
owner
:
self
options
:
nil
]
firstObject
];
self
.
screenView
.
frame
=
CGRectMake
(
0
,
0
,
ScreenWidth
,
ScreenHeight
);
self
.
screenView
.
frame
=
CGRectMake
(
0
,
0
,
ScreenWidth
,
ScreenHeight
);
self
.
screenView
.
backgroundColor
=
[[
UIColor
blackColor
]
colorWithAlphaComponent
:
0
.
5
];
self
.
screenView
.
backgroundColor
=
[[
UIColor
blackColor
]
colorWithAlphaComponent
:
0
.
5
];
...
...
Lighting/Tools/ExperienceCentreViewController.m
View file @
d1211c25
...
@@ -191,6 +191,8 @@
...
@@ -191,6 +191,8 @@
#pragma mark -返回
#pragma mark -返回
-
(
IBAction
)
ReturnButtonClickAction
:
(
UIButton
*
)
sender
{
-
(
IBAction
)
ReturnButtonClickAction
:
(
UIButton
*
)
sender
{
SHARED_APPDELEGATE
.
sceneArray
=
nil
;
SHARED_APPDELEGATE
.
productArray
=
nil
;
[
self
dismissViewControllerAnimated
:
YES
completion
:
nil
];
[
self
dismissViewControllerAnimated
:
YES
completion
:
nil
];
}
}
...
@@ -338,7 +340,7 @@
...
@@ -338,7 +340,7 @@
{
{
if
(
isScene
)
{
if
(
isScene
)
{
//场景
//场景
SceneListModel
*
sceneModel
=
(
SceneListModel
*
)
model
;
SceneListModel
*
sceneModel
=
[(
SceneListModel
*
)
model
copy
]
;
for
(
SceneListModel
*
objc
in
self
.
sceneDatasArray
)
{
for
(
SceneListModel
*
objc
in
self
.
sceneDatasArray
)
{
if
([
objc
.
fid
isEqualToString
:
sceneModel
.
fid
])
{
if
([
objc
.
fid
isEqualToString
:
sceneModel
.
fid
])
{
isThere
(
YES
);
isThere
(
YES
);
...
@@ -355,7 +357,7 @@
...
@@ -355,7 +357,7 @@
}
else
}
else
{
{
//产品
//产品
TOGoodsEntityModel
*
goodsModel
=
(
TOGoodsEntityModel
*
)
model
;
TOGoodsEntityModel
*
goodsModel
=
[(
TOGoodsEntityModel
*
)
model
copy
]
;
for
(
TOGoodsEntityModel
*
objc
in
self
.
productDatasArray
)
{
for
(
TOGoodsEntityModel
*
objc
in
self
.
productDatasArray
)
{
if
([
objc
.
fid
isEqualToString
:
goodsModel
.
fid
])
{
if
([
objc
.
fid
isEqualToString
:
goodsModel
.
fid
])
{
isThere
(
YES
);
isThere
(
YES
);
...
...
Lighting/Tools/ScreeningCollectionViewCell.m
View file @
d1211c25
...
@@ -13,8 +13,9 @@
...
@@ -13,8 +13,9 @@
-
(
void
)
setModel
:(
SceneListModel
*
)
model
-
(
void
)
setModel
:(
SceneListModel
*
)
model
{
{
[
self
.
sceneImageView
sd_setImageWithURL
:[
NSURL
URLWithString
:
model
.
pricure
]
placeholderImage
:
REPLACEIMAGE
];
_model
=
model
;
if
(
model
.
isSelectedSate
)
{
[
self
.
sceneImageView
sd_setImageWithURL
:[
NSURL
URLWithString
:
_model
.
pricure
]
placeholderImage
:
REPLACEIMAGE
];
if
(
_model
.
isSelectedSate
)
{
self
.
layer
.
borderWidth
=
2
.
0
f
;
self
.
layer
.
borderWidth
=
2
.
0
f
;
self
.
layer
.
borderColor
=
kMainBlueColor
.
CGColor
;
self
.
layer
.
borderColor
=
kMainBlueColor
.
CGColor
;
}
else
}
else
...
...
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