diff --git a/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png b/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png new file mode 100644 index 00000000..a60f88f8 Binary files /dev/null and b/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png differ diff --git a/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png b/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png deleted file mode 100644 index 469230b7..00000000 Binary files a/YuMi/Assets.xcassets/AppIcon.appiconset/1024＊1024.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json b/YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json index 630a5991..7bb65a96 100644 --- a/YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "1024＊1024.png", + "filename" : "1024＊1024.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/Contents.json b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/Contents.json index 70dac1de..dda6e816 100644 --- a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/Contents.json +++ b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "gift_bag_icon@2x.png", + "filename" : "组 2@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "gift_bag_icon@3x.png", + "filename" : "组 2@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/gift_bag_icon@2x.png b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/gift_bag_icon@2x.png deleted file mode 100644 index b2c8b459..00000000 Binary files a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/gift_bag_icon@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/gift_bag_icon@3x.png b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/gift_bag_icon@3x.png deleted file mode 100644 index 231cb5d9..00000000 Binary files a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/gift_bag_icon@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@2x.png b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@2x.png new file mode 100644 index 00000000..e72e2ac9 Binary files /dev/null and b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@2x.png differ diff --git a/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@3x.png b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@3x.png new file mode 100644 index 00000000..f7abc1ce Binary files /dev/null and b/YuMi/Assets.xcassets/main/gift_bag_icon.imageset/组 2@3x.png differ diff --git a/YuMi/Info.plist b/YuMi/Info.plist index 845d1abf..fd3bd89a 100644 --- a/YuMi/Info.plist +++ b/YuMi/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - MoliStar Debug + MoliStar CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m index f5ef791d..28da4c6f 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m @@ -108,7 +108,7 @@ for (int i = 0; i < 3; i++) { - [_pickerView selectRow: [_dataArray[i] indexOfObject:_selDateArray[i]] inComponent:i animated:YES]; + [_pickerView selectRow: [_dataArray[i] xpSafeObjectAtIndex:_selDateArray[i]] inComponent:i animated:YES]; } } } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m index 7eef5460..767bb553 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m @@ -287,9 +287,8 @@ if (timeArr.count == 3) {//需要显示传入的时间 self.selDateArray = [timeArr mutableCopy]; for (int i = 0; i < 3; i++) { - [self.pickerView selectRow: [self.dataSourceArray[i] indexOfObject:self.selDateArray[i]] inComponent:i animated:YES]; + [self.pickerView selectRow: [self.dataSourceArray[i] xpSafeObjectAtIndex:self.selDateArray[i]] inComponent:i animated:YES]; } - } self.ageView.text = [NSString stringWithFormat:@"%ld%@",[PLTimeUtil ageWithDateFromBirth:time*1000],YMLocalizedString(@"XPMineUserInfoDateView3")]; // self.starView.text = [NSString stringWithFormat:@"%@%@",[NSString getCalculateConstellationTextWithMonth:time*1000],YMLocalizedString(@"XPMineUserInfoDateView4")] ; diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m index e3f154d8..4e7719f3 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m @@ -113,8 +113,12 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { XPNewHomeItemCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPNewHomeItemCell class]) forIndexPath:indexPath]; if(indexPath.row < self.itemList.count){ - cell.itemModel = self.itemList[indexPath.row]; - cell.rankAvatarsModelArray = self.rankAvatars; + if (indexPath.row == 0) { + cell.rankAvatarsModelArray = self.rankAvatars; + cell.itemModel = [self.itemList xpSafeObjectAtIndex:indexPath.row]; + } else { + cell.itemModel = [self.itemList xpSafeObjectAtIndex:indexPath.row]; + } } @kWeakify(self); cell.didTapRankArea = ^{ diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m index ca2623aa..823de926 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m @@ -165,7 +165,7 @@ } -(void)setItemModel:(PIHomeItemModel *)itmeModel{ _itemModel = itmeModel; - if ([itmeModel.ID isEqualToString:@"3"]) { + if (self.rankAvatarsModelArray.count > 0) { _bgImageView.image = [UIImage imageNamed:@"home_rank_Heads_bg"]; } else { _bgImageView.layer.cornerRadius = kGetScaleWidth(12); @@ -178,9 +178,9 @@ } - (void)setRankAvatarsModelArray:(NSArray *)rankAvatarsModelArray { - if (![self.itemModel.ID isEqualToString:@"3"]) { - return; - } +// if (![self.itemModel.ID isEqualToString:@"3"]) { +// return; +// } if (rankAvatarsModelArray.count>0) { _rankAvatarsModelArray = rankAvatarsModelArray; if (!self.pi_BannerView.superview) { diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m index 8d6a686a..7a3567c9 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m @@ -186,7 +186,7 @@ static CGFloat MiniHeight = 130.5; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(pkTimeContent); make.leading.mas_equalTo(pkMarkIcon.mas_trailing).offset(4); - make.trailing.mas_equalTo(pkTimeContent); + make.trailing.mas_equalTo(pkTimeContent).offset(-4); }]; [self addSubview:self.helpButton]; @@ -669,12 +669,12 @@ static CGFloat MiniHeight = 130.5; CGFloat progress = 1 - _pkPanelInfo.aPercent; CGFloat width = CGRectGetWidth(self.progressView.bounds); CGFloat centerX = progress * width; - [UIView animateWithDuration:0.1 animations:^{ - [self.fireImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.progressView).offset(centerX - width / 2); - }]; - [self layoutIfNeeded]; + + [self.fireImageView mas_updateConstraints:^(MASConstraintMaker *make) { + make.centerX.equalTo(self.progressView).offset(centerX - width / 2); }]; + [self layoutIfNeeded]; + } else { self.redTitleLabel.text = @""; self.redAvatarImageView.image = nil; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m index 86791748..a03503ef 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m @@ -1273,7 +1273,7 @@ [transparentRoundedCornersBackgroundView addSubview:self.countDownLabel]; [self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(transparentRoundedCornersBackgroundView).offset(-0.5); - make.right.mas_equalTo(transparentRoundedCornersBackgroundView.mas_right).offset(-6); + make.right.mas_equalTo(transparentRoundedCornersBackgroundView.mas_right).offset(-12); make.width.mas_greaterThanOrEqualTo(40); }]; @@ -1317,7 +1317,8 @@ UIImageView *redPinImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"room_pk_panel_red_mark"]]; [self.progressArea addSubview:redPinImageView]; [redPinImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.mas_equalTo(self.progressArea); + make.top.mas_equalTo(self.progressArea); + make.left.mas_equalTo(self.progressArea); make.size.mas_equalTo(CGSizeMake(47.5, 56.5)); }]; @@ -1332,8 +1333,8 @@ [self.redCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.progressArea); make.centerY.mas_equalTo(self.progressArea).mas_offset(4); - make.left.mas_equalTo(self.progressArea).offset(47.5); - make.right.mas_equalTo(self.progressArea).offset(-47.5); + make.left.mas_equalTo(self.progressArea).offset(46); + make.right.mas_equalTo(self.progressArea).offset(-46); make.height.mas_equalTo(14); }]; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m index a8f32ca7..2ba8aee5 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m @@ -129,14 +129,23 @@ }]; [self.guardPersonLabel mas_makeConstraints:^(MASConstraintMaker *make) { + if (isMSRTL()) { + make.right.mas_equalTo(self.contentImageView).offset(-8); + } else { + make.left.mas_equalTo(self.contentImageView).offset(8); + } make.top.mas_equalTo(self.fightScoreLabel.mas_bottom).offset(8); - make.left.mas_equalTo(self.contentImageView).offset(8); make.height.mas_equalTo(15); }]; [self.guardScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { + if (isMSRTL()) { + make.right.mas_equalTo(self.contentImageView).offset(-8); + } else { + make.left.mas_equalTo(self.contentImageView).offset(8); + } make.top.mas_equalTo(self.guardPersonLabel.mas_bottom).offset(8); - make.left.mas_equalTo(self.contentImageView).offset(8); + make.height.mas_equalTo(15); }]; diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index dc21ee19..489cba43 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -1134,7 +1134,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self changeStageViewOnRoomUpdate]; [self.roomHeaderView onRoomEntered]; [self.activityContainerView onRoomEntered]; - + [self.menuContainerView onRoomEntered]; [self.backContainerView onRoomEntered]; [self.littleGameView onRoomEntered]; @@ -1145,10 +1145,16 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.messageContainerView onRoomEntered]; } else { //虽然没退出房间 但是队列还是要拿的 + [self.stageView onRoomMiniEntered]; [self.messageContainerView onRoomMiniEntered]; [self.functionView onRoomMiniEntered]; [self.functionView onRoomEntered]; + // PK 状态下，从最小化进房需要模仿出事化房间，丢 2 次 roominfo 进去 + if (roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode || + roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { + [self.functionView onRoomEntered]; + } } [[XPRoomMiniManager shareManager] configRoomInfo:nil]; [[XPRoomMiniManager shareManager] configUserInfo:nil]; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index ffe725e3..ff709e3f 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -1131,7 +1131,7 @@ "XPNewHomeViewController2" = "Recommendations"; "XPNewHomeViewController3" = "Recommendations"; -"XPHomeMineViewController1" = "recent"; +"XPHomeMineViewController1" = "Recent"; "XPHomeMineViewController2" = "%@'s room"; "XPHomeMineViewController3" = "Welcome to my room";