diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 789502c..7bc38af 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -793,7 +793,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = 1.1.18; + MARKETING_VERSION = 1.1.19; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -859,7 +859,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = 1.1.18; + MARKETING_VERSION = 1.1.19; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/QXLive/Base/QXAppStartViewController.m b/QXLive/Base/QXAppStartViewController.m index d841509..030e245 100644 --- a/QXLive/Base/QXAppStartViewController.m +++ b/QXLive/Base/QXAppStartViewController.m @@ -99,8 +99,9 @@ model.icon_gsrz = @"icon_gsrz"; model.icon_wdgd = @"icon_wdgd"; model.icon_sz = @"icon_sz"; - + model.bg_tabbar = @"bg_tabbar"; model.tabbarSelectedColor = @"#FF3700"; + QXConfig.shared.backgroundImage = @"bg_light"; QXConfig.shared.model =model; } // QXThemeModel *model = [QXThemeModel yy_modelWithJSON:responseObject[@"data"]]; diff --git a/QXLive/Config/QXConfig.h b/QXLive/Config/QXConfig.h index c046c41..cdee6a8 100644 --- a/QXLive/Config/QXConfig.h +++ b/QXLive/Config/QXConfig.h @@ -119,6 +119,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)NSString *icon_gsrz; @property (nonatomic,strong)NSString *icon_wdgd; @property (nonatomic,strong)NSString *icon_sz; +@property (nonatomic,strong)NSString *bg_tabbar; @end /// 节日主题 diff --git a/QXLive/Mine(音域)/View/QXMainHeaderView.m b/QXLive/Mine(音域)/View/QXMainHeaderView.m index bd8d650..f78b8bf 100644 --- a/QXLive/Mine(音域)/View/QXMainHeaderView.m +++ b/QXLive/Mine(音域)/View/QXMainHeaderView.m @@ -237,7 +237,11 @@ self.walletBgView = [[UIView alloc] initWithFrame:CGRectMake(self.topBgView.left, self.cycleScrollView.bottom+12, self.topBgView.width, 108)]; - self.walletBgView.backgroundColor = RGB16(0x231F2C); + if (QXConfig.shared.model) { + self.walletBgView.backgroundColor = RGB16(0x600D00); + }else{ + self.walletBgView.backgroundColor = RGB16(0x231F2C); + } [self.walletBgView addRoundedCornersWithRadius:8]; [self addSubview:self.walletBgView]; diff --git a/QXLive/Mine(音域)/View/QXMineServiceCell.m b/QXLive/Mine(音域)/View/QXMineServiceCell.m index 44c527a..bad61aa 100644 --- a/QXLive/Mine(音域)/View/QXMineServiceCell.m +++ b/QXLive/Mine(音域)/View/QXMineServiceCell.m @@ -39,7 +39,11 @@ } -(void)createViews{ self.bgView = [[UIView alloc] init]; - self.bgView.backgroundColor = RGB16(0x231F2C); + if (QXConfig.shared.model) { + self.bgView.backgroundColor = RGB16(0x600D00); + }else{ + self.bgView.backgroundColor = RGB16(0x231F2C); + } [self.bgView addRoundedCornersWithRadius:10]; [self.contentView addSubview:self.bgView]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/Contents.json index 2b9f547..4477d47 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1123@2x.png", + "filename" : "stake_alert_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/stake_alert_bg@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/stake_alert_bg@2x.png new file mode 100644 index 0000000..4a65ebb Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/stake_alert_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/组 1123@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/组 1123@2x.png deleted file mode 100644 index 2c48fa3..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/组 1123@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/Contents.json index 9fab8ca..bebe856 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1125@2x.png", + "filename" : "stake_bg_win@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/stake_bg_win@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/stake_bg_win@2x.png new file mode 100644 index 0000000..e0a4477 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/stake_bg_win@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/组 1125@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/组 1125@2x.png deleted file mode 100644 index 8daf72c..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/组 1125@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/Contents.json index 079e4ef..ae5d71e 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1126@2x.png", + "filename" : "stake_failure_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/stake_failure_bg@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/stake_failure_bg@2x.png new file mode 100644 index 0000000..83d3c7b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/stake_failure_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/组 1126@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/组 1126@2x.png deleted file mode 100644 index d46050d..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/组 1126@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/wl_word_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/wl_word_bg.imageset/Contents.json new file mode 100644 index 0000000..1d151c1 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/wl_word_bg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "wl_word_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/wl_word_bg.imageset/wl_word_bg@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/wl_word_bg.imageset/wl_word_bg@2x.png new file mode 100644 index 0000000..200550a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/wl_word_bg.imageset/wl_word_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_tabbar.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/bg_tabbar.imageset/Contents.json new file mode 100644 index 0000000..7bda1c0 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/bg_tabbar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "bg_tabbar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_tabbar.imageset/bg_tabbar@2x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_tabbar.imageset/bg_tabbar@2x.png new file mode 100644 index 0000000..743a43e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_tabbar.imageset/bg_tabbar@2x.png differ diff --git a/QXLive/Room(房间)/View/设置/QXRoomSettingView.m b/QXLive/Room(房间)/View/设置/QXRoomSettingView.m index 22b8c34..9c1b3ea 100644 --- a/QXLive/Room(房间)/View/设置/QXRoomSettingView.m +++ b/QXLive/Room(房间)/View/设置/QXRoomSettingView.m @@ -309,6 +309,10 @@ [self.acArray addObject:self.ageAc]; } self.hasAc = YES; + }else{ + if ([self.acArray containsObject:self.ageAc]) { + [self.acArray removeObject:self.ageAc]; + } } }else if ([md.gift_bag_id isEqualToString:@"12"]) { if (md.status.intValue == 1) { @@ -316,6 +320,10 @@ [self.acArray addObject:self.timeAc]; } self.hasAc = YES; + }else{ + if ([self.acArray containsObject:self.timeAc]) { + [self.acArray removeObject:self.timeAc]; + } } }else if ([md.gift_bag_id isEqualToString:@"60"]) { if (md.status.intValue == 1) { @@ -323,6 +331,10 @@ [self.acArray addObject:self.fairyAc]; } self.hasAc = YES; + }else{ + if ([self.acArray containsObject:self.fairyAc]) { + [self.acArray removeObject:self.fairyAc]; + } } }else if ([md.gift_bag_id isEqualToString:@"61"]) { if (md.status.intValue == 1) { @@ -330,6 +342,10 @@ [self.acArray addObject:self.planAc]; } self.hasAc = YES; + }else{ + if ([self.acArray containsObject:self.planAc]) { + [self.acArray removeObject:self.planAc]; + } } } diff --git a/QXLive/Tabbar/TabbarCustomView/QXTabBar.m b/QXLive/Tabbar/TabbarCustomView/QXTabBar.m index 92f655f..ae0a847 100644 --- a/QXLive/Tabbar/TabbarCustomView/QXTabBar.m +++ b/QXLive/Tabbar/TabbarCustomView/QXTabBar.m @@ -52,7 +52,9 @@ - (UIImageView *)bgImageView { if (!_bgImageView) { - _bgImageView = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"tabbar背景"]]; + _bgImageView = [[UIImageView alloc]init]; + _bgImageView.image = [UIImage imageNamed:QXConfig.shared.model?QXConfig.shared.model.bg_tabbar:@""]; + _bgImageView.contentMode = UIViewContentModeScaleAspectFill; _bgImageView.userInteractionEnabled = YES; } return _bgImageView; diff --git a/QXLive/活动/炼仙传说/WLStakeModel.h b/QXLive/活动/炼仙传说/WLStakeModel.h index 555ecb3..894a0f3 100644 --- a/QXLive/活动/炼仙传说/WLStakeModel.h +++ b/QXLive/活动/炼仙传说/WLStakeModel.h @@ -25,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign) NSInteger num; @property (nonatomic, copy) NSString *type_name; +@property (nonatomic, copy) NSString *win_type_name; @property (nonatomic, copy) NSString *win_type; @@ -37,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) NSString *gift_price; @property (nonatomic, assign) NSInteger is_win;//是否中奖 1是2否 @property (nonatomic, strong) NSArray *win_gift_list;//中奖礼物 +@property (nonatomic, copy) NSString *total_gift_price; @end diff --git a/QXLive/活动/炼仙传说/WLStakeRecordCell.m b/QXLive/活动/炼仙传说/WLStakeRecordCell.m index fcc4af9..4947e05 100644 --- a/QXLive/活动/炼仙传说/WLStakeRecordCell.m +++ b/QXLive/活动/炼仙传说/WLStakeRecordCell.m @@ -36,7 +36,7 @@ _iconImageView.image = ImageNamed(@"stake_6_sel"); } // - _titleLabel.text = [NSString stringWithFormat:@"第%@期 中奖炼仙传说:%@", model.id, model.type_name]; + _titleLabel.text = [NSString stringWithFormat:@"第%@期 中奖%@", model.id, model.type_name]; NSString *dateString = [self dateYMDStrignWith:model.add_time]; _timeLabel.text = dateString; diff --git a/QXLive/活动/炼仙传说/WLStakeResultFailureView.m b/QXLive/活动/炼仙传说/WLStakeResultFailureView.m index 2d7daf6..462aef6 100644 --- a/QXLive/活动/炼仙传说/WLStakeResultFailureView.m +++ b/QXLive/活动/炼仙传说/WLStakeResultFailureView.m @@ -63,7 +63,7 @@ _constellationImageView.image = ImageNamed(@"stake_3_sel"); } - _constellationLabel.text = [NSString stringWithFormat:@"炼仙传说:%@", model.type_name]; + _constellationLabel.text = [NSString stringWithFormat:@"%@", model.type_name]; } - (TFPopupParam *)param { diff --git a/QXLive/活动/炼仙传说/WLStakeResultSuccessView.m b/QXLive/活动/炼仙传说/WLStakeResultSuccessView.m index db79f75..1120133 100644 --- a/QXLive/活动/炼仙传说/WLStakeResultSuccessView.m +++ b/QXLive/活动/炼仙传说/WLStakeResultSuccessView.m @@ -48,21 +48,21 @@ [self.iconImageView sd_setImageWithURL:URL(C_string(model.base_image))]; self.valueLabel.text = [NSString stringWithFormat:@"%@*%ld", model.gift_name, (long)model.num]; - self.priceLabel.text = [NSString stringWithFormat:@"%@", model.gift_price]; + self.priceLabel.text = [NSString stringWithFormat:@"%@", model.total_gift_price]; - if ([model.win_type isEqualToString:@"1"]) { - _constellationImageView.image = ImageNamed(@"stake_2_sel"); - } else if ([model.win_type isEqualToString:@"2"]) { - _constellationImageView.image = ImageNamed(@"stake_1_sel"); - } else if ([model.win_type isEqualToString:@"3"]) { - _constellationImageView.image = ImageNamed(@"stake_4_sel"); - } else if ([model.win_type isEqualToString:@"4"]) { - _constellationImageView.image = ImageNamed(@"stake_5_sel"); - } else if ([model.win_type isEqualToString:@"5"]) { - _constellationImageView.image = ImageNamed(@"stake_3_sel"); - } +// if ([model.win_type isEqualToString:@"1"]) { +// _constellationImageView.image = ImageNamed(@"stake_2_sel"); +// } else if ([model.win_type isEqualToString:@"2"]) { +// _constellationImageView.image = ImageNamed(@"stake_1_sel"); +// } else if ([model.win_type isEqualToString:@"3"]) { +// _constellationImageView.image = ImageNamed(@"stake_4_sel"); +// } else if ([model.win_type isEqualToString:@"4"]) { +// _constellationImageView.image = ImageNamed(@"stake_5_sel"); +// } else if ([model.win_type isEqualToString:@"5"]) { +// _constellationImageView.image = ImageNamed(@"stake_3_sel"); +// } - _constellationLabel.text = [NSString stringWithFormat:@"炼仙传说:%@", model.type_name]; + _constellationLabel.text = [NSString stringWithFormat:@"%@", model.win_type_name]; } - (void)remove { diff --git a/QXLive/活动/炼仙传说/WLStakeResultSuccessView.xib b/QXLive/活动/炼仙传说/WLStakeResultSuccessView.xib index cc56800..9147a01 100644 --- a/QXLive/活动/炼仙传说/WLStakeResultSuccessView.xib +++ b/QXLive/活动/炼仙传说/WLStakeResultSuccessView.xib @@ -1,9 +1,9 @@ - + - + @@ -46,7 +46,7 @@ - + @@ -137,9 +137,9 @@ - + - + diff --git a/QXLive/活动/炼仙传说/WL_StakeView.m b/QXLive/活动/炼仙传说/WL_StakeView.m index c113381..3a77b3c 100644 --- a/QXLive/活动/炼仙传说/WL_StakeView.m +++ b/QXLive/活动/炼仙传说/WL_StakeView.m @@ -363,7 +363,7 @@ //全服播报 探索开始播报 [self onSocketStart:dataDict[@"data"]]; }else if ([code isEqualToString:@"3032"]){ - [self onSocketResult:dataDict[@"data"]]; +// [self onSocketResult:dataDict[@"data"]]; }else if ([code isEqualToString:@"3033"]){ [self onSocketEnd:dataDict[@"data"]]; } @@ -394,7 +394,14 @@ NSLog(@"onSocketEnd--%@", dataDict); WLStakeModel *model = [WLStakeModel mj_objectWithKeyValues:dataDict]; - +// if (model.is_win == 1) { +// self.resultDict = dataDict; +// [self.selBgArr enumerateObjectsUsingBlock:^(UIImageView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +// obj.hidden = [model.win_type integerValue] != idx + 1; +// }]; +// + [self onPopSuccessView:model]; +// } // //延时0.2秒,以防万一 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ if (self.resultDict == nil) { @@ -407,20 +414,20 @@ } - (void)onSocketResult:(NSDictionary *)dataDict { - if (self.resultDict == nil) { - self.resultDict = dataDict; +// if (self.resultDict == nil) { WLStakeModel *model = [WLStakeModel mj_objectWithKeyValues:dataDict]; if (model.is_win == 1) { - + self.resultDict = dataDict; [self.selBgArr enumerateObjectsUsingBlock:^(UIImageView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { obj.hidden = [model.win_type integerValue] != idx + 1; }]; [self onPopSuccessView:model]; - }else { - [self onPopFailureView:model]; } - } +// else { +// [self onPopFailureView:model]; +// } +// } } diff --git a/QXLive/活动/炼仙传说/WL_StakeView.xib b/QXLive/活动/炼仙传说/WL_StakeView.xib index 31e9d04..19e41d1 100644 --- a/QXLive/活动/炼仙传说/WL_StakeView.xib +++ b/QXLive/活动/炼仙传说/WL_StakeView.xib @@ -58,10 +58,17 @@ -