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
0ee6510f
Commit
0ee6510f
authored
May 30, 2016
by
mei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
帮助功能 及购物车删除更改
parent
1d2c21ab
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
166 additions
and
5 deletions
+166
-5
FollowHeartViewController.h
Lighting/Class/FollowHeartViewController.h
+1
-1
FollowHeartViewController.m
Lighting/Class/FollowHeartViewController.m
+7
-3
HelpViewController.h
Lighting/Class/HelpViewController.h
+6
-1
HelpViewController.m
Lighting/Class/HelpViewController.m
+50
-0
Contents.json
...510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/Contents.json
+7
-0
Contents.json
.../06关于/01随心配_iPhone_assets/downtool.imageset/Contents.json
+19
-0
bg-副本-6.png
...图标/06关于/01随心配_iPhone_assets/downtool.imageset/bg-副本-6.png
+0
-0
bg-副本-6@2x.png
...06关于/01随心配_iPhone_assets/downtool.imageset/bg-副本-6@2x.png
+0
-0
2.png
...511欧普图标/06关于/01随心配_iPhone_assets/lefttool1.imageset/2.png
+0
-0
2@2x.png
...欧普图标/06关于/01随心配_iPhone_assets/lefttool1.imageset/2@2x.png
+0
-0
Contents.json
...06关于/01随心配_iPhone_assets/lefttool1.imageset/Contents.json
+19
-0
4.png
...511欧普图标/06关于/01随心配_iPhone_assets/lefttool2.imageset/4.png
+0
-0
4@2x.png
...欧普图标/06关于/01随心配_iPhone_assets/lefttool2.imageset/4@2x.png
+0
-0
Contents.json
...06关于/01随心配_iPhone_assets/lefttool2.imageset/Contents.json
+19
-0
5;6.png
...1欧普图标/06关于/01随心配_iPhone_assets/lefttool3.imageset/5;6.png
+0
-0
5;6@2x.png
...图标/06关于/01随心配_iPhone_assets/lefttool3.imageset/5;6@2x.png
+0
-0
Contents.json
...06关于/01随心配_iPhone_assets/lefttool3.imageset/Contents.json
+19
-0
Contents.json
...06关于/01随心配_iPhone_assets/righttool.imageset/Contents.json
+19
-0
bg-副本-7.png
...标/06关于/01随心配_iPhone_assets/righttool.imageset/bg-副本-7.png
+0
-0
bg-副本-7@2x.png
...6关于/01随心配_iPhone_assets/righttool.imageset/bg-副本-7@2x.png
+0
-0
Contents.json
...标/效果二体验中心_iPhone_assets/selectHelp.imageset/Contents.json
+0
-0
d.png
...510体验中心图标/效果二体验中心_iPhone_assets/selectHelp.imageset/d.png
+0
-0
d@2x.png
...体验中心图标/效果二体验中心_iPhone_assets/selectHelp.imageset/d@2x.png
+0
-0
No files found.
Lighting/Class/FollowHeartViewController.h
View file @
0ee6510f
...
...
@@ -26,7 +26,7 @@
@end
@interface
FollowHeartViewController
:
BaseViewController
<
LeftViewBtnClickdelegate
,
RightViewBtnClickdelegate
,
FootViewBtnClickdelegate
,
UIGestureRecognizerDelegate
,
AddSecenePicturedelegate
,
AddProductPicturedelegate
,
SharePicturedelegate
,
AddCustomPicturedelegate
,
Shoppingdelegate
,
ImageCropperDelegate
>
@interface
FollowHeartViewController
:
BaseViewController
<
LeftViewBtnClickdelegate
,
RightViewBtnClickdelegate
,
FootViewBtnClickdelegate
,
UIGestureRecognizerDelegate
,
AddSecenePicturedelegate
,
AddProductPicturedelegate
,
SharePicturedelegate
,
AddCustomPicturedelegate
,
Shoppingdelegate
,
ImageCropperDelegate
,
HelpButtondelegate
>
@property
(
nonatomic
,
assign
)
id
<
FollowHeartViewAddpicturedelegate
>
delegate
;
@property
(
nonatomic
,
strong
)
LeftSubView
*
leftSubView
;
@property
(
nonatomic
,
strong
)
RightSubView
*
rightSubView
;
...
...
Lighting/Class/FollowHeartViewController.m
View file @
0ee6510f
...
...
@@ -190,10 +190,10 @@
}
-
(
void
)
addHelpView
:
(
UIButton
*
)
btn
{
[
self
.
leftSubView
.
helpBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"selectHelp"
]
forState
:
UIControlStateNormal
];
self
.
helpView
=
[[
HelpViewController
alloc
]
init
];
self
.
helpView
.
view
.
backgroundColor
=
[
UIColor
clearColor
];
//
self.helpView.delegate=self;
self
.
helpView
.
delegate
=
self
;
[
self
.
view
addSubview
:
self
.
helpView
.
view
];
}
...
...
@@ -343,7 +343,11 @@
{
[
self
.
leftSubView
.
camerBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"customchangjing"
]
forState
:
UIControlStateNormal
];
}
//重置帮助图片
-
(
void
)
restHelpBtnImage
{
[
self
.
leftSubView
.
helpBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"bangzhu"
]
forState
:
UIControlStateNormal
];
}
#pragma mark ---SharePicturedelegate
...
...
Lighting/Class/HelpViewController.h
View file @
0ee6510f
...
...
@@ -7,7 +7,12 @@
//
#import "BaseViewController.h"
@protocol
HelpButtondelegate
<
NSObject
>
@required
-
(
void
)
restHelpBtnImage
;
@end
@interface
HelpViewController
:
BaseViewController
<
UIGestureRecognizerDelegate
>
@property
(
nonatomic
,
assign
)
id
<
HelpButtondelegate
>
delegate
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
helpArray
;
@end
Lighting/Class/HelpViewController.m
View file @
0ee6510f
...
...
@@ -13,12 +13,57 @@
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
// Do any additional setup after loading the view.
self
.
helpArray
=
[[
NSMutableArray
alloc
]
initWithObjects
:
@"返回"
,
@"添加至购物袋"
,
@"分享方案"
,
@"自定义场景"
,
@"全屏"
,
@"帮助"
,
nil
];
[
self
initView
];
}
-
(
void
)
initView
{
for
(
int
i
=
0
;
i
<
self
.
helpArray
.
count
;
i
++
)
{
UIButton
*
button
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
button
.
tag
=
100
+
i
;
[
button
setBackgroundImage
:[
UIImage
imageNamed
:
@"lefttool1"
]
forState
:
UIControlStateNormal
];
switch
(
i
)
{
case
0
:
button
.
frame
=
CGRectMake
(
90
,
30
+
(
60
+
15
)
*
i
,
100
,
60
);
break
;
case
1
:
button
.
frame
=
CGRectMake
(
75
,
30
+
(
60
+
15
)
*
i
,
200
,
60
);
break
;
case
2
:
button
.
frame
=
CGRectMake
(
80
,
30
+
(
60
+
15
)
*
i
,
150
,
60
);
break
;
case
3
:
button
.
frame
=
CGRectMake
(
75
,
30
+
(
60
+
15
)
*
i
,
200
,
60
);
break
;
case
4
:
button
.
frame
=
CGRectMake
(
90
,
30
+
(
60
+
15
)
*
i
,
100
,
60
);
break
;
case
5
:
button
.
frame
=
CGRectMake
(
90
,
30
+
(
60
+
15
)
*
i
,
100
,
60
);
break
;
default
:
break
;
}
[
button
setTitle
:[
self
.
helpArray
objectAtIndex
:
i
]
forState
:
UIControlStateNormal
];
[
button
setTitleColor
:[
UIColor
blackColor
]
forState
:
UIControlStateNormal
];
[
self
.
view
addSubview
:
button
];
}
UIButton
*
sencenBtn
=
[[
UIButton
alloc
]
initWithFrame
:
CGRectMake
(
25
,
self
.
view
.
frame
.
size
.
height
-
155
,
150
,
60
)];
[
sencenBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"downtool"
]
forState
:
UIControlStateNormal
];
[
sencenBtn
setTitle
:
@"选择场景"
forState
:
UIControlStateNormal
];
sencenBtn
.
contentEdgeInsets
=
UIEdgeInsetsMake
(
0
,
0
,
8
,
0
);
[
sencenBtn
setTitleColor
:[
UIColor
blackColor
]
forState
:
UIControlStateNormal
];
[
self
.
view
addSubview
:
sencenBtn
];
UIButton
*
productBtn
=
[[
UIButton
alloc
]
initWithFrame
:
CGRectMake
(
self
.
view
.
frame
.
size
.
width
-
245
,
self
.
view
.
frame
.
size
.
height
-
210
,
150
,
60
)];
[
productBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"righttool"
]
forState
:
UIControlStateNormal
];
[
productBtn
setTitle
:
@"选择产品"
forState
:
UIControlStateNormal
];
[
productBtn
setTitleColor
:[
UIColor
blackColor
]
forState
:
UIControlStateNormal
];
[
self
.
view
addSubview
:
productBtn
];
//点击手势
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
DismissScreenView
:
)];
...
...
@@ -29,7 +74,12 @@
//取消当前页面点击手势
-
(
void
)
DismissScreenView
:
(
UITapGestureRecognizer
*
)
sender
{
// CGPoint point = [sender locationInView:self.view];
if
(
self
)
{
if
([
self
.
delegate
respondsToSelector
:
@selector
(
restHelpBtnImage
)])
{
[
self
.
delegate
restHelpBtnImage
];
}
[
self
.
view
removeFromSuperview
];
}
...
...
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/Contents.json
0 → 100644
View file @
0ee6510f
{
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/downtool.imageset/Contents.json
0 → 100644
View file @
0ee6510f
{
"images"
:
[
{
"idiom"
:
"universal"
,
"filename"
:
"bg-副本-6.png"
,
"scale"
:
"1x"
},
{
"idiom"
:
"universal"
,
"filename"
:
"bg-副本-6@2x.png"
,
"scale"
:
"2x"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/downtool.imageset/bg-副本-6.png
0 → 100644
View file @
0ee6510f
2.12 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/downtool.imageset/bg-副本-6@2x.png
0 → 100644
View file @
0ee6510f
3.6 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool1.imageset/2.png
0 → 100644
View file @
0ee6510f
2.07 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool1.imageset/2@2x.png
0 → 100644
View file @
0ee6510f
3.52 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool1.imageset/Contents.json
0 → 100644
View file @
0ee6510f
{
"images"
:
[
{
"idiom"
:
"universal"
,
"filename"
:
"2.png"
,
"scale"
:
"1x"
},
{
"idiom"
:
"universal"
,
"filename"
:
"2@2x.png"
,
"scale"
:
"2x"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool2.imageset/4.png
0 → 100644
View file @
0ee6510f
2.09 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool2.imageset/4@2x.png
0 → 100644
View file @
0ee6510f
3.72 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool2.imageset/Contents.json
0 → 100644
View file @
0ee6510f
{
"images"
:
[
{
"idiom"
:
"universal"
,
"filename"
:
"4.png"
,
"scale"
:
"1x"
},
{
"idiom"
:
"universal"
,
"filename"
:
"4@2x.png"
,
"scale"
:
"2x"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool3.imageset/5;6.png
0 → 100644
View file @
0ee6510f
2.11 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool3.imageset/5;6@2x.png
0 → 100644
View file @
0ee6510f
3.79 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/lefttool3.imageset/Contents.json
0 → 100644
View file @
0ee6510f
{
"images"
:
[
{
"idiom"
:
"universal"
,
"filename"
:
"5;6.png"
,
"scale"
:
"1x"
},
{
"idiom"
:
"universal"
,
"filename"
:
"5;6@2x.png"
,
"scale"
:
"2x"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/righttool.imageset/Contents.json
0 → 100644
View file @
0ee6510f
{
"images"
:
[
{
"idiom"
:
"universal"
,
"filename"
:
"bg-副本-7.png"
,
"scale"
:
"1x"
},
{
"idiom"
:
"universal"
,
"filename"
:
"bg-副本-7@2x.png"
,
"scale"
:
"2x"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/righttool.imageset/bg-副本-7.png
0 → 100644
View file @
0ee6510f
2.07 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/0511欧普图标/06关于/01随心配_iPhone_assets/righttool.imageset/bg-副本-7@2x.png
0 → 100644
View file @
0ee6510f
3.7 KB
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/
d
.imageset/Contents.json
→
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/
selectHelp
.imageset/Contents.json
View file @
0ee6510f
File moved
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/
d
.imageset/d.png
→
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/
selectHelp
.imageset/d.png
View file @
0ee6510f
File moved
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/
d
.imageset/d@2x.png
→
Lighting/Lighting/Images.xcassets/0510体验中心图标/效果二体验中心_iPhone_assets/
selectHelp
.imageset/d@2x.png
View file @
0ee6510f
File moved
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