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
d8f64bb6
Commit
d8f64bb6
authored
Nov 18, 2020
by
zhangshuai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部分元修改为钻
parent
a71b1bb8
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
9 deletions
+25
-9
GYCashSixAwardAlertView.m
GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.m
+4
-0
GYCashSixAwardAlertView.xib
GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.xib
+1
-1
GYRedPacketView.m
GYDemo/GYDemo/Alert/GYRedPacketView.m
+1
-1
Data.h
GYDemo/GYDemo/Data/Data.h
+3
-0
Data.m
GYDemo/GYDemo/Data/Data.m
+10
-1
GYPrefixHeader.pch
GYDemo/GYDemo/GYPrefixHeader.pch
+6
-6
No files found.
GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.m
View file @
d8f64bb6
...
@@ -33,6 +33,10 @@
...
@@ -33,6 +33,10 @@
self
.
cancelButton
.
userInteractionEnabled
=
true
;
self
.
cancelButton
.
userInteractionEnabled
=
true
;
}
}
}];
}];
self
.
gainAmountRightLabel
.
text
=
[
Data
getAcquisitionUnit
];
}
}
-
(
void
)
layoutSubviews
{
-
(
void
)
layoutSubviews
{
...
...
GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.xib
View file @
d8f64bb6
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
<color
key=
"textColor"
red=
"0.91764705879999997"
green=
"0.31764705879999999"
blue=
"0.2901960784"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"textColor"
red=
"0.91764705879999997"
green=
"0.31764705879999999"
blue=
"0.2901960784"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"
元
"
textAlignment=
"center"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"TGu-2Q-UAs"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"
钻
"
textAlignment=
"center"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"TGu-2Q-UAs"
>
<rect
key=
"frame"
x=
"219.33333333333331"
y=
"0.0"
width=
"21.666666666666657"
height=
"36"
/>
<rect
key=
"frame"
x=
"219.33333333333331"
y=
"0.0"
width=
"21.666666666666657"
height=
"36"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"21"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"21"
/>
<color
key=
"textColor"
red=
"0.56470588239999997"
green=
"0.36078431370000003"
blue=
"0.15686274510000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"textColor"
red=
"0.56470588239999997"
green=
"0.36078431370000003"
blue=
"0.15686274510000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
...
...
GYDemo/GYDemo/Alert/GYRedPacketView.m
View file @
d8f64bb6
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
-
(
void
)
setAwardNum
:
(
NSString
*
)
awardNum
{
-
(
void
)
setAwardNum
:
(
NSString
*
)
awardNum
{
_awardNum
=
awardNum
;
_awardNum
=
awardNum
;
NSString
*
amt
=
[
NSString
stringWithFormat
:
@"%.2f"
,
[
awardNum
integerValue
]
*
1
.
0
/
100
];
NSString
*
amt
=
[
NSString
stringWithFormat
:
@"%.2f"
,
[
awardNum
integerValue
]
*
1
.
0
/
100
];
NSString
*
amtStr
=
[
NSString
stringWithFormat
:
@"%@
元"
,
amt
];
NSString
*
amtStr
=
[
NSString
stringWithFormat
:
@"%@
%@"
,
amt
,[
Data
getAcquisitionUnit
]
];
NSMutableAttributedString
*
att
=
[[
NSMutableAttributedString
alloc
]
initWithString
:
amtStr
];
NSMutableAttributedString
*
att
=
[[
NSMutableAttributedString
alloc
]
initWithString
:
amtStr
];
[
att
addAttributes
:@{
NSFontAttributeName
:
[
UIFont
systemFontOfSize
:
58
]}
range
:[
amtStr
rangeOfString
:
amt
]];
[
att
addAttributes
:@{
NSFontAttributeName
:
[
UIFont
systemFontOfSize
:
58
]}
range
:[
amtStr
rangeOfString
:
amt
]];
[
att
addAttributes
:@{
NSFontAttributeName
:
[
UIFont
systemFontOfSize
:
32
]}
range
:[
amtStr
rangeOfString
:
@"元"
]];
[
att
addAttributes
:@{
NSFontAttributeName
:
[
UIFont
systemFontOfSize
:
32
]}
range
:[
amtStr
rangeOfString
:
@"元"
]];
...
...
GYDemo/GYDemo/Data/Data.h
View file @
d8f64bb6
...
@@ -17,4 +17,7 @@
...
@@ -17,4 +17,7 @@
-
(
void
)
InitPlist
;
-
(
void
)
InitPlist
;
-
(
void
)
removeDicForKey
:(
id
)
key
;
-
(
void
)
removeDicForKey
:(
id
)
key
;
//获取单位
+
(
NSString
*
)
getAcquisitionUnit
;
@end
@end
GYDemo/GYDemo/Data/Data.m
View file @
d8f64bb6
...
@@ -85,5 +85,14 @@ if(![[NSFileManager defaultManager] fileExistsAtPath:plistPath])
...
@@ -85,5 +85,14 @@ if(![[NSFileManager defaultManager] fileExistsAtPath:plistPath])
[
DataDic
writeToFile
:
plistPath
atomically
:
YES
];
[
DataDic
writeToFile
:
plistPath
atomically
:
YES
];
}
}
}
}
//获取单位
+
(
NSString
*
)
getAcquisitionUnit
;{
NSString
*
status
=
[[
CGUserManager
shared
].
appSwitch
[
@"isopenH5"
]
stringValue
];
if
([
status
isEqualToString
:
@"0"
])
{
return
@"钻"
;
}
else
{
return
@"元"
;
}
return
@"钻"
;
}
@end
@end
GYDemo/GYDemo/GYPrefixHeader.pch
View file @
d8f64bb6
...
@@ -16,15 +16,15 @@
...
@@ -16,15 +16,15 @@
//测试
//测试
#define ServerReport @"http://reporttest.zhangxinhulian.com"
//
#define ServerReport @"http://reporttest.zhangxinhulian.com"
#define ServerHost @"https://feedapitest.zhangxinhulian.com" // 服务端接口地址
//
#define ServerHost @"https://feedapitest.zhangxinhulian.com" // 服务端接口地址
#define ServerAds @"http://bstest.zhangxinhulian.com/v4/ads"
//
#define ServerAds @"http://bstest.zhangxinhulian.com/v4/ads"
//正式
//正式
//
#define ServerReport @"http://report.clouddistribute.net"
#define ServerReport @"http://report.clouddistribute.net"
//
#define ServerHost @"https://feedapi.clouddistribute.net" // 服务端接口地址
#define ServerHost @"https://feedapi.clouddistribute.net" // 服务端接口地址
//
#define ServerAds @"http://bs.clouddistribute.net/v4/ads"
#define ServerAds @"http://bs.clouddistribute.net/v4/ads"
#define WXAppId @"wxe7a03eb52cce1b51"
#define WXAppId @"wxe7a03eb52cce1b51"
#define WXAppSecret @"6fa72a89ea188c4dff5729cff328b587"
#define WXAppSecret @"6fa72a89ea188c4dff5729cff328b587"
...
...
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