Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
LuckFarm
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lmj
LuckFarm
Commits
2a795c4b
Commit
2a795c4b
authored
Oct 23, 2020
by
lmj_521aiau@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
59b64f1b
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
8 additions
and
27 deletions
+8
-27
GYGiftAlertView.m
GYDemo/GYDemo/Alert/GYGiftAlertView.m
+1
-0
GYOrderAlertView.m
GYDemo/GYDemo/Alert/GYOrderAlertView.m
+2
-1
Contents.json
.../Assets.xcassets/wheel/wheel_point.imageset/Contents.json
+0
-22
组 2 拷贝@2x.png
.../Assets.xcassets/wheel/wheel_point.imageset/组 2 拷贝@2x.png
+0
-0
组 2 拷贝@3x.png
.../Assets.xcassets/wheel/wheel_point.imageset/组 2 拷贝@3x.png
+0
-0
组 2@2x.png
...ets.xcassets/wheel/wheel_point_select.imageset/组 2@2x.png
+0
-0
组 2@3x.png
...ets.xcassets/wheel/wheel_point_select.imageset/组 2@3x.png
+0
-0
GYNative.storyboard
GYDemo/GYDemo/ViewController/GYNative.storyboard
+4
-3
GYWheelSurfViewController.m
GYDemo/GYDemo/ViewController/GYWheelSurfViewController.m
+1
-1
No files found.
GYDemo/GYDemo/Alert/GYGiftAlertView.m
View file @
2a795c4b
...
@@ -65,6 +65,7 @@
...
@@ -65,6 +65,7 @@
-
(
void
)
layoutSubviews
{
-
(
void
)
layoutSubviews
{
[
super
layoutSubviews
];
[
super
layoutSubviews
];
_gradientLayer
.
frame
=
_giftBgView
.
bounds
;
}
}
-
(
void
)
setBoxModel
:
(
GYOpenBoxModel
*
)
boxModel
{
-
(
void
)
setBoxModel
:
(
GYOpenBoxModel
*
)
boxModel
{
...
...
GYDemo/GYDemo/Alert/GYOrderAlertView.m
View file @
2a795c4b
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
_model
=
model
;
_model
=
model
;
_dataSource
=
_model
.
orderDetailModels
;
_dataSource
=
_model
.
orderDetailModels
;
NSString
*
amt
=
[
NSString
stringWithFormat
:
@"%.2f"
,
[
_model
.
awardCash
integerValue
]
*
1
.
0
/
100
];
NSString
*
amt
=
[
NSString
stringWithFormat
:
@"%.2f"
,
[
_model
.
awardCash
integerValue
]
*
1
.
0
];
NSString
*
amtStr
=
[
NSString
stringWithFormat
:
@"完成当前订单将获得%@元"
,
amt
];
NSString
*
amtStr
=
[
NSString
stringWithFormat
:
@"完成当前订单将获得%@元"
,
amt
];
NSMutableAttributedString
*
att
=
[[
NSMutableAttributedString
alloc
]
initWithString
:
amtStr
];
NSMutableAttributedString
*
att
=
[[
NSMutableAttributedString
alloc
]
initWithString
:
amtStr
];
[
att
addAttributes
:@{
NSFontAttributeName
:
[
UIFont
systemFontOfSize
:
30
],
NSForegroundColorAttributeName
:
kColorWithRGB
(
255
,
145
,
40
)}
range
:[
amtStr
rangeOfString
:
amt
]];
[
att
addAttributes
:@{
NSFontAttributeName
:
[
UIFont
systemFontOfSize
:
30
],
NSForegroundColorAttributeName
:
kColorWithRGB
(
255
,
145
,
40
)}
range
:[
amtStr
rangeOfString
:
amt
]];
...
@@ -88,6 +88,7 @@
...
@@ -88,6 +88,7 @@
-
(
void
)
layoutSubviews
{
-
(
void
)
layoutSubviews
{
[
super
layoutSubviews
];
[
super
layoutSubviews
];
_gradientLayer
.
frame
=
_giftBgView
.
bounds
;
}
}
-
(
void
)
refreshDataSource
{
-
(
void
)
refreshDataSource
{
...
...
GYDemo/GYDemo/Assets.xcassets/wheel/wheel_point.imageset/Contents.json
deleted
100644 → 0
View file @
59b64f1b
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"组 2 拷贝@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"组 2 拷贝@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
GYDemo/GYDemo/Assets.xcassets/wheel/wheel_point.imageset/组 2 拷贝@2x.png
deleted
100644 → 0
View file @
59b64f1b
26.4 KB
GYDemo/GYDemo/Assets.xcassets/wheel/wheel_point.imageset/组 2 拷贝@3x.png
deleted
100644 → 0
View file @
59b64f1b
55.2 KB
GYDemo/GYDemo/Assets.xcassets/wheel/wheel_point_select.imageset/组 2@2x.png
View replaced file @
59b64f1b
View file @
2a795c4b
49.3 KB
|
W:
|
H:
17.9 KB
|
W:
|
H:
2-up
Swipe
Onion skin
GYDemo/GYDemo/Assets.xcassets/wheel/wheel_point_select.imageset/组 2@3x.png
View replaced file @
59b64f1b
View file @
2a795c4b
126 KB
|
W:
|
H:
41.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
GYDemo/GYDemo/ViewController/GYNative.storyboard
View file @
2a795c4b
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"17156"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"17156"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<dependencies>
<dependencies>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"17125"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"17125"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"System colors in document resources"
minToolsVersion=
"11.0"
/>
<capability
name=
"System colors in document resources"
minToolsVersion=
"11.0"
/>
...
@@ -33,7 +34,7 @@
...
@@ -33,7 +34,7 @@
</constraints>
</constraints>
</imageView>
</imageView>
<imageView
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleAspectFit"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"wheel_point_select"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Pr8-br-4g4"
>
<imageView
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleAspectFit"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"wheel_point_select"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Pr8-br-4g4"
>
<rect
key=
"frame"
x=
"0.0"
y=
"
209"
width=
"414"
height=
"192
.5"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"
305.5"
width=
"414"
height=
"99
.5"
/>
</imageView>
</imageView>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"422-i1-mAf"
>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"422-i1-mAf"
>
<rect
key=
"frame"
x=
"354"
y=
"168"
width=
"50"
height=
"50"
/>
<rect
key=
"frame"
x=
"354"
y=
"168"
width=
"50"
height=
"50"
/>
...
@@ -70,7 +71,7 @@
...
@@ -70,7 +71,7 @@
<viewLayoutGuide
key=
"safeArea"
id=
"9T1-9q-KQY"
/>
<viewLayoutGuide
key=
"safeArea"
id=
"9T1-9q-KQY"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<constraints>
<constraints>
<constraint
firstItem=
"Pr8-br-4g4"
firstAttribute=
"centerY"
secondItem=
"Tzj-np-8e2"
secondAttribute=
"centerY"
constant=
"-
6
0"
id=
"9Wx-Zf-6Iu"
/>
<constraint
firstItem=
"Pr8-br-4g4"
firstAttribute=
"centerY"
secondItem=
"Tzj-np-8e2"
secondAttribute=
"centerY"
constant=
"-
1
0"
id=
"9Wx-Zf-6Iu"
/>
<constraint
firstItem=
"Pr8-br-4g4"
firstAttribute=
"leading"
secondItem=
"Tzj-np-8e2"
secondAttribute=
"leading"
id=
"Fhs-lu-zfL"
/>
<constraint
firstItem=
"Pr8-br-4g4"
firstAttribute=
"leading"
secondItem=
"Tzj-np-8e2"
secondAttribute=
"leading"
id=
"Fhs-lu-zfL"
/>
<constraint
firstItem=
"B36-KL-4fe"
firstAttribute=
"centerX"
secondItem=
"t4G-Kb-nWs"
secondAttribute=
"centerX"
id=
"Fjt-Mb-dqt"
/>
<constraint
firstItem=
"B36-KL-4fe"
firstAttribute=
"centerX"
secondItem=
"t4G-Kb-nWs"
secondAttribute=
"centerX"
id=
"Fjt-Mb-dqt"
/>
<constraint
firstItem=
"B36-KL-4fe"
firstAttribute=
"top"
secondItem=
"t4G-Kb-nWs"
secondAttribute=
"bottom"
constant=
"28"
id=
"HVA-rI-Wm6"
/>
<constraint
firstItem=
"B36-KL-4fe"
firstAttribute=
"top"
secondItem=
"t4G-Kb-nWs"
secondAttribute=
"bottom"
constant=
"28"
id=
"HVA-rI-Wm6"
/>
...
@@ -337,7 +338,7 @@
...
@@ -337,7 +338,7 @@
<image
name=
"wheel_cancel"
width=
"38.5"
height=
"38"
/>
<image
name=
"wheel_cancel"
width=
"38.5"
height=
"38"
/>
<image
name=
"wheel_corona"
width=
"348"
height=
"348"
/>
<image
name=
"wheel_corona"
width=
"348"
height=
"348"
/>
<image
name=
"wheel_header"
width=
"203.5"
height=
"89"
/>
<image
name=
"wheel_header"
width=
"203.5"
height=
"89"
/>
<image
name=
"wheel_point_select"
width=
"
129.5"
height=
"192
.5"
/>
<image
name=
"wheel_point_select"
width=
"
72"
height=
"99
.5"
/>
<systemColor
name=
"systemBackgroundColor"
>
<systemColor
name=
"systemBackgroundColor"
>
<color
white=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"genericGamma22GrayColorSpace"
/>
<color
white=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"genericGamma22GrayColorSpace"
/>
</systemColor>
</systemColor>
...
...
GYDemo/GYDemo/ViewController/GYWheelSurfViewController.m
View file @
2a795c4b
...
@@ -161,7 +161,7 @@
...
@@ -161,7 +161,7 @@
CABasicAnimation
*
layer
=
[
CABasicAnimation
animationWithKeyPath
:
@"transform.rotation"
];
CABasicAnimation
*
layer
=
[
CABasicAnimation
animationWithKeyPath
:
@"transform.rotation"
];
//先转4圈 再选区 顺时针(所有这里需要用360-对应的角度) 逆时针不需要
//先转4圈 再选区 顺时针(所有这里需要用360-对应的角度) 逆时针不需要
layer
.
toValue
=
@
((
M_PI
*
2
-
(
perSection
*
index
))
+
M_PI
*
2
*
8
);
layer
.
toValue
=
@
((
M_PI
*
2
-
(
perSection
*
index
))
+
M_PI
*
2
*
4
);
layer
.
duration
=
4
;
layer
.
duration
=
4
;
layer
.
removedOnCompletion
=
NO
;
layer
.
removedOnCompletion
=
NO
;
layer
.
fillMode
=
kCAFillModeForwards
;
layer
.
fillMode
=
kCAFillModeForwards
;
...
...
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