diff --git a/YuMi/Assets.xcassets/jm/star/Contents.json b/YuMi/Assets.xcassets/jm/star/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/Contents.json new file mode 100644 index 00000000..26cdc3db --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/pi_aries@2x.png b/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/pi_aries@2x.png new file mode 100644 index 00000000..6a3ea0dd Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/pi_aries@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/pi_aries@3x.png b/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/pi_aries@3x.png new file mode 100644 index 00000000..6f1ada6c Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_aries.imageset/pi_aries@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/Contents.json new file mode 100644 index 00000000..84964162 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/pi_cancer@2x.png b/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/pi_cancer@2x.png new file mode 100644 index 00000000..a174b0b7 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/pi_cancer@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/pi_cancer@3x.png b/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/pi_cancer@3x.png new file mode 100644 index 00000000..6f6189fb Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_cancer.imageset/pi_cancer@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/Contents.json new file mode 100644 index 00000000..a1701dc2 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/pi_capricorn@2x.png b/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/pi_capricorn@2x.png new file mode 100644 index 00000000..adcb6dbc Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/pi_capricorn@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/pi_capricorn@3x.png b/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/pi_capricorn@3x.png new file mode 100644 index 00000000..ef07ef8a Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_capricorn.imageset/pi_capricorn@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/Contents.json new file mode 100644 index 00000000..4e7e3c2a --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/pi_gemini@2x.png b/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/pi_gemini@2x.png new file mode 100644 index 00000000..d932a258 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/pi_gemini@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/pi_gemini@3x.png b/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/pi_gemini@3x.png new file mode 100644 index 00000000..b0f95b74 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_gemini.imageset/pi_gemini@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/Contents.json new file mode 100644 index 00000000..e4d2fdbb --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/pi_libra@2x.png b/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/pi_libra@2x.png new file mode 100644 index 00000000..2975d00b Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/pi_libra@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/pi_libra@3x.png b/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/pi_libra@3x.png new file mode 100644 index 00000000..ac5b8044 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_libra.imageset/pi_libra@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/Contents.json new file mode 100644 index 00000000..4dfb465a --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/pi_lion@2x.png b/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/pi_lion@2x.png new file mode 100644 index 00000000..b4a2ce6b Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/pi_lion@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/pi_lion@3x.png b/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/pi_lion@3x.png new file mode 100644 index 00000000..25759dc9 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_lion.imageset/pi_lion@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/Contents.json new file mode 100644 index 00000000..8b062343 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/pi_pisces@2x.png b/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/pi_pisces@2x.png new file mode 100644 index 00000000..2f3f12dd Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/pi_pisces@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/pi_pisces@3x.png b/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/pi_pisces@3x.png new file mode 100644 index 00000000..eb28c917 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_pisces.imageset/pi_pisces@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/Contents.json new file mode 100644 index 00000000..a2bc2933 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/pi_scorpion@2x.png b/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/pi_scorpion@2x.png new file mode 100644 index 00000000..a78feef5 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/pi_scorpion@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/pi_scorpion@3x.png b/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/pi_scorpion@3x.png new file mode 100644 index 00000000..08aeaa5a Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_scorpion.imageset/pi_scorpion@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/Contents.json new file mode 100644 index 00000000..aa9b4b61 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/pi_shooter@2x.png b/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/pi_shooter@2x.png new file mode 100644 index 00000000..81523684 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/pi_shooter@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/pi_shooter@3x.png b/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/pi_shooter@3x.png new file mode 100644 index 00000000..ea6d2e3e Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_shooter.imageset/pi_shooter@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/Contents.json new file mode 100644 index 00000000..4c1582d8 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/pi_taurus@2x.png b/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/pi_taurus@2x.png new file mode 100644 index 00000000..4141b6ae Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/pi_taurus@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/pi_taurus@3x.png b/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/pi_taurus@3x.png new file mode 100644 index 00000000..001386b9 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_taurus.imageset/pi_taurus@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/Contents.json new file mode 100644 index 00000000..231000d1 --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/pi_virgin@2x.png b/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/pi_virgin@2x.png new file mode 100644 index 00000000..0d347340 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/pi_virgin@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/pi_virgin@3x.png b/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/pi_virgin@3x.png new file mode 100644 index 00000000..2c9506f5 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_virgin.imageset/pi_virgin@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/Contents.json b/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/Contents.json new file mode 100644 index 00000000..c04d76ac --- /dev/null +++ b/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/Contents.json @@ -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 + } +} diff --git a/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/pi_water_bottle@2x.png b/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/pi_water_bottle@2x.png new file mode 100644 index 00000000..13325d30 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/pi_water_bottle@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/pi_water_bottle@3x.png b/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/pi_water_bottle@3x.png new file mode 100644 index 00000000..41e0b39b Binary files /dev/null and b/YuMi/Assets.xcassets/jm/star/pi_water_bottle.imageset/pi_water_bottle@3x.png differ diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m index 54ae06ba..a9a12951 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m @@ -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; } diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 350c6541..19f7714c 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -340,6 +340,19 @@ "XPMineHeadView7" = "审核中"; "XPMineHeadView8" = "复制成功"; +"XPMineHeadView9" = "魔羯"; +"XPMineHeadView10" = "水瓶"; +"XPMineHeadView11" = "双鱼"; +"XPMineHeadView12" = "白羊"; +"XPMineHeadView13" = "金牛"; +"XPMineHeadView14" = "双子"; +"XPMineHeadView15" = "巨蟹"; +"XPMineHeadView16" = "狮子"; +"XPMineHeadView17" = "处女"; +"XPMineHeadView18" = "天秤"; +"XPMineHeadView19" = "天蝎"; +"XPMineHeadView20" = "射手"; + "XPMineUserInfoHeaderView0" = "複制成功"; "XPMineUserInfoHeaderView1" = "我是个默认签名"; "XPMineUserInfoHeaderView2" = "%ld粉丝"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index dffa1d98..fe9e3b10 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -340,6 +340,27 @@ "XPMineHeadView7" = "審核中"; "XPMineHeadView8" = "復製成功"; + +"XPMineHeadView9" = "魔羯"; +"XPMineHeadView10" = "水瓶"; +"XPMineHeadView11" = "雙魚"; +"XPMineHeadView12" = "白羊"; +"XPMineHeadView13" = "金牛"; +"XPMineHeadView14" = "雙子"; +"XPMineHeadView15" = "巨蟹"; +"XPMineHeadView16" = "獅子"; +"XPMineHeadView17" = "處女"; +"XPMineHeadView18" = "天秤"; +"XPMineHeadView19" = "天蠍"; +"XPMineHeadView20" = "射手"; + + + + + + + + "XPMineUserInfoHeaderView0" = "複製成功"; "XPMineUserInfoHeaderView1" = "我是個默認簽名"; "XPMineUserInfoHeaderView2" = "%ld粉絲";