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
805bdb02
Commit
805bdb02
authored
8 years ago
by
勾芒
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
3d29cf1b
master
dev
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
30 deletions
+30
-30
ProductLibraryViewController.m
Lighting/Class/ProductLibraryViewController.m
+29
-29
ShareGoodsViewController.m
Lighting/Tools/ShareGoodsViewController.m
+1
-1
No files found.
Lighting/Class/ProductLibraryViewController.m
View file @
805bdb02
...
...
@@ -519,38 +519,38 @@
#pragma mark -筛选
-
(
void
)
ScreeningButtonClick
{
//
// ExperienceCentreViewController *ExperienceCenter = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
//// [self presentViewController:ExperienceCenter animated:YES completion:nil];
//
// ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
// UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
// popover.sourceView = ExperienceCenter.view;
// [self presentViewController:ExperienceCenter animated:YES completion:nil];
self
.
screenView
=
[[[
NSBundle
mainBundle
]
loadNibNamed
:
@"ScreeningView"
owner
:
self
options
:
nil
]
firstObject
];
self
.
screenView
.
frame
=
CGRectMake
(
0
,
0
,
ScreenWidth
,
ScreenHeight
);
self
.
screenView
.
backgroundColor
=
[[
UIColor
blackColor
]
colorWithAlphaComponent
:
0
.
5
];
self
.
screenView
.
delegate
=
self
;
//点击手势
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
DismissScreenView
)];
tap
.
delegate
=
self
;
tap
.
cancelsTouchesInView
=
NO
;
[
self
.
screenView
addGestureRecognizer
:
tap
];
self
.
screenView
.
frame
=
CGRectMake
(
0
,
0
,
ScreenWidth
,
ScreenHeight
);
[
self
.
view
.
window
addSubview
:
self
.
screenView
];
self
.
screenView
.
alpha
=
0
;
//监听Segmented菜单
[
self
.
screenView
.
sortingSegmented
addTarget
:
self
action
:
@selector
(
sortingSegmentedClick
:
)
forControlEvents
:
UIControlEventValueChanged
];
ExperienceCentreViewController
*
ExperienceCenter
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"ExperienceCentre"
];
// [self presentViewController:ExperienceCenter animated:YES completion:nil];
self
.
selectedIndex
=
0
;
[
self
CreateClassificationView
];
ExperienceCenter
.
modalPresentationStyle
=
UIModalPresentationOverFullScreen
;
UIPopoverPresentationController
*
popover
=
ExperienceCenter
.
popoverPresentationController
;
popover
.
sourceView
=
ExperienceCenter
.
view
;
[
self
presentViewController
:
ExperienceCenter
animated
:
YES
completion
:
nil
];
[
UIView
animateWithDuration
:
0
.
2
animations
:
^
{
self
.
screenView
.
alpha
=
1
;
}];
// self.screenView = [[[NSBundle mainBundle] loadNibNamed:@"ScreeningView" owner:self options:nil]firstObject];
// self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
// self.screenView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
// self.screenView.delegate = self;
// //点击手势
// UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(DismissScreenView)];
// tap.delegate = self;
// tap.cancelsTouchesInView = NO;
// [self.screenView addGestureRecognizer:tap];
// self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
// [self.view.window addSubview:self.screenView];
// self.screenView.alpha = 0;
//
// //监听Segmented菜单
// [self.screenView.sortingSegmented addTarget:self action:@selector(sortingSegmentedClick:) forControlEvents:UIControlEventValueChanged];
//
// self.selectedIndex = 0;
// [self CreateClassificationView];
//
// [UIView animateWithDuration:0.2 animations:^{
//
// self.screenView.alpha = 1;
// }];
}
...
...
This diff is collapsed.
Click to expand it.
Lighting/Tools/ShareGoodsViewController.m
View file @
805bdb02
...
...
@@ -28,7 +28,7 @@
[
self
dismissViewControllerAnimated
:
YES
completion
:
nil
];
NSData
*
imageData
=
UIImageJPEGRepresentation
(
self
.
shareImage
,
1
.
0
);
NSData
*
imageData
=
UIImageJPEGRepresentation
(
TCImage
(
@"登录"
)
,
1
.
0
);
// 0b44439e5504e371015504f73d4f0025,0b44439e5504e371015504feae270028
NSDictionary
*
parameterDict
=
[
NSDictionary
dictionaryWithObjectsAndKeys
:
@"0b44439e5504e371015504f73d4f0025,0b44439e5504e371015504feae270028"
,
@"goodsIds"
,
@""
,
@"title"
,
@""
,
@"remark"
,
nil
];
...
...
This diff is collapsed.
Click to expand it.
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