星座修改
6
YuMi/Assets.xcassets/jm/star/Contents.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
22
YuMi/Assets.xcassets/jm/star/pi_aries.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_aries@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_aries@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_aries.imageset/pi_aries@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_aries.imageset/pi_aries@3x.png
vendored
Normal file
After Width: | Height: | Size: 3.6 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_cancer@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_cancer@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/pi_cancer@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/pi_cancer@3x.png
vendored
Normal file
After Width: | Height: | Size: 3.9 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_capricorn@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_capricorn@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/pi_capricorn@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/pi_capricorn@3x.png
vendored
Normal file
After Width: | Height: | Size: 4.2 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_gemini@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_gemini@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/pi_gemini@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/pi_gemini@3x.png
vendored
Normal file
After Width: | Height: | Size: 3.9 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_libra.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_libra@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_libra@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_libra.imageset/pi_libra@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_libra.imageset/pi_libra@3x.png
vendored
Normal file
After Width: | Height: | Size: 3.7 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_lion.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_lion@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_lion@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_lion.imageset/pi_lion@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_lion.imageset/pi_lion@3x.png
vendored
Normal file
After Width: | Height: | Size: 3.9 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_pisces@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_pisces@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/pi_pisces@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/pi_pisces@3x.png
vendored
Normal file
After Width: | Height: | Size: 4.1 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_scorpion@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_scorpion@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/pi_scorpion@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/pi_scorpion@3x.png
vendored
Normal file
After Width: | Height: | Size: 4.0 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_shooter@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_shooter@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/pi_shooter@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/pi_shooter@3x.png
vendored
Normal file
After Width: | Height: | Size: 3.7 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_taurus@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_taurus@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/pi_taurus@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/pi_taurus@3x.png
vendored
Normal file
After Width: | Height: | Size: 3.7 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_virgin@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_virgin@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/pi_virgin@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/pi_virgin@3x.png
vendored
Normal file
After Width: | Height: | Size: 4.0 KiB |
22
YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_water_bottle@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "pi_water_bottle@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
BIN
YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/pi_water_bottle@2x.png
vendored
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/pi_water_bottle@3x.png
vendored
Normal file
After Width: | Height: | Size: 4.0 KiB |
@@ -38,7 +38,7 @@
|
||||
///性别
|
||||
@property (nonatomic,strong) UIImageView *sexImageView;
|
||||
///星座
|
||||
@property(nonatomic,strong) UILabel *starVeiw;
|
||||
@property(nonatomic,strong) UIImageView *starVeiw;
|
||||
|
||||
///显示等级
|
||||
@property (nonatomic,strong) YYLabel *levelLabel;
|
||||
@@ -236,8 +236,11 @@
|
||||
}
|
||||
|
||||
result=[NSString stringWithFormat:@"%@",[astroString substringWithRange:NSMakeRange(month*2-(day < [[astroFormat substringWithRange:NSMakeRange((month-1), 1)] intValue] - (-19))*2,2)]];
|
||||
|
||||
return [NSString stringWithFormat:YMLocalizedString(@"XPMineHeadView6"),result];
|
||||
NSDictionary *starDic = @{YMLocalizedString(@"XPMineHeadView9"):@"pi_capricorn",YMLocalizedString(@"XPMineHeadView10"):@"pi_water_bottle",YMLocalizedString(@"XPMineHeadView11"):@"pi_pisces",YMLocalizedString(@"XPMineHeadView12"):@"pi_aries",YMLocalizedString(@"XPMineHeadView13"):@"pi_taurus",YMLocalizedString(@"XPMineHeadView14"):@"pi_gemini",YMLocalizedString(@"XPMineHeadView15"):@"pi_cancer",YMLocalizedString(@"XPMineHeadView16"):@"pi_lion",YMLocalizedString(@"XPMineHeadView17"):@"pi_virgin",YMLocalizedString(@"XPMineHeadView18"):@"pi_libra",YMLocalizedString(@"XPMineHeadView19"):@"pi_scorpion",YMLocalizedString(@"XPMineHeadView20"):@"pi_shooter"};
|
||||
|
||||
|
||||
|
||||
return starDic[result];
|
||||
}
|
||||
|
||||
/// 生成一个图片的富文本
|
||||
@@ -587,14 +590,9 @@
|
||||
}
|
||||
return _reviewView;
|
||||
}
|
||||
- (UILabel *)starVeiw{
|
||||
- (UIImageView *)starVeiw{
|
||||
if(!_starVeiw){
|
||||
_starVeiw = [UILabel labelInitWithText:@"" font:[UIFont boldSystemFontOfSize:10] textColor:[UIColor whiteColor]];
|
||||
_starVeiw.textAlignment = NSTextAlignmentCenter;
|
||||
UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(50, 17)];
|
||||
_starVeiw.backgroundColor = [UIColor colorWithPatternImage:image];
|
||||
_starVeiw.layer.cornerRadius = 17/2;
|
||||
_starVeiw.layer.masksToBounds = YES;
|
||||
_starVeiw = [UIImageView new];
|
||||
}
|
||||
return _starVeiw;
|
||||
}
|
||||
|
@@ -340,6 +340,19 @@
|
||||
"XPMineHeadView7" = "审核中";
|
||||
"XPMineHeadView8" = "复制成功";
|
||||
|
||||
"XPMineHeadView9" = "魔羯";
|
||||
"XPMineHeadView10" = "水瓶";
|
||||
"XPMineHeadView11" = "双鱼";
|
||||
"XPMineHeadView12" = "白羊";
|
||||
"XPMineHeadView13" = "金牛";
|
||||
"XPMineHeadView14" = "双子";
|
||||
"XPMineHeadView15" = "巨蟹";
|
||||
"XPMineHeadView16" = "狮子";
|
||||
"XPMineHeadView17" = "处女";
|
||||
"XPMineHeadView18" = "天秤";
|
||||
"XPMineHeadView19" = "天蝎";
|
||||
"XPMineHeadView20" = "射手";
|
||||
|
||||
"XPMineUserInfoHeaderView0" = "複制成功";
|
||||
"XPMineUserInfoHeaderView1" = "我是个默认签名";
|
||||
"XPMineUserInfoHeaderView2" = "%ld粉丝";
|
||||
|
@@ -340,6 +340,27 @@
|
||||
"XPMineHeadView7" = "審核中";
|
||||
"XPMineHeadView8" = "復製成功";
|
||||
|
||||
|
||||
"XPMineHeadView9" = "魔羯";
|
||||
"XPMineHeadView10" = "水瓶";
|
||||
"XPMineHeadView11" = "雙魚";
|
||||
"XPMineHeadView12" = "白羊";
|
||||
"XPMineHeadView13" = "金牛";
|
||||
"XPMineHeadView14" = "雙子";
|
||||
"XPMineHeadView15" = "巨蟹";
|
||||
"XPMineHeadView16" = "獅子";
|
||||
"XPMineHeadView17" = "處女";
|
||||
"XPMineHeadView18" = "天秤";
|
||||
"XPMineHeadView19" = "天蠍";
|
||||
"XPMineHeadView20" = "射手";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
"XPMineUserInfoHeaderView0" = "複製成功";
|
||||
"XPMineUserInfoHeaderView1" = "我是個默認簽名";
|
||||
"XPMineUserInfoHeaderView2" = "%ld粉絲";
|
||||
|