diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 37882ee..87707c5 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -787,7 +787,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = 1.0.10; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -853,7 +853,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = 1.0.10; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/QXLive.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/QXLive.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 0c67376..08de0be 100644 --- a/QXLive.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/QXLive.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -1,5 +1,8 @@ - + + IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + + diff --git a/QXLive/Base/QXBaseViewController.m b/QXLive/Base/QXBaseViewController.m index 4320201..aeb004d 100644 --- a/QXLive/Base/QXBaseViewController.m +++ b/QXLive/Base/QXBaseViewController.m @@ -10,6 +10,7 @@ @interface QXBaseViewController () @property (nonatomic,strong)UIImageView *bgImageView; @property (nonatomic,strong)NSString *imageUrl; +@property (nonatomic,strong)UIButton*backBtn; @end @implementation QXBaseViewController @@ -24,6 +25,10 @@ [self getData]; self.page = 1; } +-(void)didReceiveMemoryWarning{ + [super didReceiveMemoryWarning]; + [[SDImageCache sharedImageCache] clearMemory]; +} - (void)initSubViews{ } @@ -36,7 +41,9 @@ backBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeading; [backBtn addTarget:self action:@selector(backAction) forControlEvents:(UIControlEventTouchUpInside)]; self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backBtn]; + self.backBtn = backBtn; } + -(void)backAction{ if (self.navigationController.viewControllers.count > 1) { [self.navigationController popViewControllerAnimated:YES]; diff --git a/QXLive/Dynamic(语圈)/View/QXSendGiftView.h b/QXLive/Dynamic(语圈)/View/QXSendGiftView.h index 57e961f..6f72c3b 100644 --- a/QXLive/Dynamic(语圈)/View/QXSendGiftView.h +++ b/QXLive/Dynamic(语圈)/View/QXSendGiftView.h @@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)NSMutableArray *titles; @property (nonatomic,strong)UINavigationController *navgationVC; -@property (nonatomic,strong)UIViewController *vc; +@property (nonatomic,weak)UIViewController *vc; @property (nonatomic,strong)NSArray *pitUsers; diff --git a/QXLive/HomePage(声播)/Controlller/QXRankHomeSubVC.m b/QXLive/HomePage(声播)/Controlller/QXRankHomeSubVC.m index 55c41d1..132d090 100644 --- a/QXLive/HomePage(声播)/Controlller/QXRankHomeSubVC.m +++ b/QXLive/HomePage(声播)/Controlller/QXRankHomeSubVC.m @@ -35,7 +35,11 @@ // Do any additional setup after loading the view. [self initSubViews]; } - +-(void)viewDidLayoutSubviews{ + [super viewDidLayoutSubviews]; + self.myRankView.frame = CGRectMake(0, self.view.height-ScaleWidth(74)-kSafeAreaTop-kSafeAreaBottom, SCREEN_WIDTH, ScaleWidth(74)); + self.tableView.frame = CGRectMake(0, self.rankTypeView.bottom+10, SCREEN_WIDTH, self.view.height - self.rankTypeView.height-20-self.myRankView.height-kSafeAreaTop-kSafeAreaBottom); +} -(void)initSubViews{ self.bgImageHidden = YES; self.dataType = @"1"; @@ -180,7 +184,7 @@ -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ if (self.rankType == 4) {//CP QXRankCPListCell *cell = [QXRankCPListCell cellWithTableView:tableView]; -// cell.model = self.dataArray[indexPath.row]; + cell.model = self.dataArray[indexPath.row]; return cell; }else{ QXRankListCell *cell = [QXRankListCell cellWithTableView:tableView]; @@ -235,7 +239,7 @@ } -(QXMyRankView *)myRankView{ if (!_myRankView) { - _myRankView = [[QXMyRankView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT-TabbarContentHeight-60-44, SCREEN_WIDTH, 60)]; + _myRankView = [[QXMyRankView alloc] initWithFrame:CGRectMake(0, self.view.height-ScaleWidth(74)-kSafeAreaTop, SCREEN_WIDTH, ScaleWidth(74))]; } return _myRankView; } @@ -247,7 +251,7 @@ _tableView.backgroundColor = [UIColor clearColor]; _tableView.tableFooterView = [UIView new]; _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.rowHeight = 50; + _tableView.rowHeight = 64; MJWeakSelf _tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ [weakSelf getRankData]; diff --git a/QXLive/HomePage(声播)/Controlller/QXRankHomeVC.m b/QXLive/HomePage(声播)/Controlller/QXRankHomeVC.m index b71b55f..4a012e7 100644 --- a/QXLive/HomePage(声播)/Controlller/QXRankHomeVC.m +++ b/QXLive/HomePage(声播)/Controlller/QXRankHomeVC.m @@ -27,8 +27,22 @@ [super viewWillAppear:animated]; [self.navigationController setNavigationBarHidden:NO animated:YES]; } +- (void)setNavgationItems{ + UIButton*backBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)]; + [backBtn setImage:[[UIImage imageNamed:@"back"] imageByTintColor:RGB16(0xffffff)] forState:(UIControlStateNormal)]; + backBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeading; + [backBtn addTarget:self action:@selector(backAction) forControlEvents:(UIControlEventTouchUpInside)]; + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backBtn]; +} + -(void)initSubViews{ - self.view.backgroundColor = [UIColor whiteColor]; +// if ([QXConfig.backgroundImage hasPrefix:@"http"] || [QXConfig.backgroundImage hasPrefix:@"https"]) { +// [self updateBgImage:QXConfig.backgroundImage]; +// }else{ + [self updateBgImage:@"home_rank_vc_bg"]; +// } + + self.view.backgroundColor = [UIColor clearColor]; // self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"公会榜",@"真爱榜"]; self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"真爱榜"]; self.listVCArray = [NSMutableArray array]; @@ -36,8 +50,8 @@ self.categoryView.frame = CGRectMake(0, 0, SCREEN_WIDTH-100, 44); self.categoryView.delegate = self; self.categoryView.titles = self.titles; - self.categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#333333"]; - self.categoryView.titleColor = [UIColor colorWithHexString:@"#999999"]; + self.categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#ffffff"]; + self.categoryView.titleColor = [UIColor colorWithHexString:@"#ffffff"]; JXCategoryIndicatorImageView *indicatorImageView = [[JXCategoryIndicatorImageView alloc] init]; indicatorImageView.indicatorImageView.image = [UIImage imageNamed:@"home_slider"]; indicatorImageView.indicatorWidth = (SCREEN_WIDTH-100)/self.titles.count; diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXMyRankView.xib b/QXLive/HomePage(声播)/View/首页/排行榜/QXMyRankView.xib index 650a39e..20a6907 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXMyRankView.xib +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXMyRankView.xib @@ -4,21 +4,20 @@ - - + - + - + @@ -31,32 +30,32 @@ - + - - - + + @@ -151,12 +149,9 @@ - + - - - - + diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.h b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.h index bb9d080..3c81e3e 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.h +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.h @@ -6,7 +6,7 @@ // #import -//#import "SRRankListResponse.h" +#import "QXRankModel.h" NS_ASSUME_NONNULL_BEGIN @interface QXRankCPListCell : UITableViewCell @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @property (weak, nonatomic) IBOutlet UILabel *valueLabel; @property (weak, nonatomic) IBOutlet UILabel *nameLabel; -//@property (nonatomic,strong)SRRankListResponseModel *model; +@property (nonatomic,strong)QXMyRankModel *model; +(instancetype)cellWithTableView:(UITableView *)tableView; @end diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.m b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.m index 3b9453c..be659fc 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.m +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.m @@ -13,17 +13,18 @@ QXRankCPListCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId]; if (!cell) { cell = [[NSBundle mainBundle] loadNibNamed:cellId owner:nil options:nil].lastObject; + cell.backgroundColor = UIColor.clearColor; } return cell; } -//-(void)setModel:(SRRankListResponseModel *)model{ -// _model = model; -// [self.headerImageView1 sd_setImageWithURL:[NSURL URLWithString:model.head_picture1] placeholderImage:[UIImage imageNamed:@"user_header_placehoulder"]]; -// [self.headerImageView2 sd_setImageWithURL:[NSURL URLWithString:model.head_picture2] placeholderImage:[UIImage imageNamed:@"user_header_placehoulder"]]; -// self.nameLabel.text = [NSString stringWithFormat:@"%@\n%@",model.nickname1,model.nickname2]; -// self.valueLabel.text = model.number; -// self.numberLabel.text = model.rank; -//} +-(void)setModel:(QXMyRankModel *)model{ + _model = model; + [self.headerImageView1 sd_setImageWithURL:[NSURL URLWithString:model.user_avatar] placeholderImage:[UIImage imageNamed:@"user_header_placehoulder"]]; + [self.headerImageView2 sd_setImageWithURL:[NSURL URLWithString:model.user_avatar1] placeholderImage:[UIImage imageNamed:@"user_header_placehoulder"]]; + self.nameLabel.text = [NSString stringWithFormat:@"%@\n%@",model.nickname,model.nickname1]; + self.valueLabel.text = [NSString qx_showHotCountNum:model.total.longLongValue]; + self.numberLabel.text = model.rank; +} - (void)awakeFromNib { [super awakeFromNib]; // Initialization code diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.xib b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.xib index 560aef7..81aa719 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.xib +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPListCell.xib @@ -2,6 +2,7 @@ + @@ -10,23 +11,23 @@ - + - + + + + - + @@ -39,7 +40,7 @@ - + @@ -51,8 +52,8 @@ - - + + @@ -61,28 +62,28 @@ - - + + @@ -92,15 +93,19 @@ + + - + + + @@ -115,8 +120,9 @@ - - - + + + + diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPTopThreeView.xib b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPTopThreeView.xib index 8454abc..4f0fe26 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPTopThreeView.xib +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankCPTopThreeView.xib @@ -13,33 +13,33 @@ + + + - + - - - - + - + - - + + - + - + - - + + @@ -48,303 +48,336 @@ - - + + - - + + - - - - + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + - + - - + + - + - + - - + + - + - - + + - - + + - + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + - + - - + + - + - + - - + + - + - - + + - - + + - - - - + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + @@ -364,17 +397,18 @@ - + - - - - - - - - + + + + + + + + + diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.m b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.m index ef7943b..8e6b01a 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.m +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.m @@ -13,6 +13,7 @@ QXRankListCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId]; if (!cell) { cell = [[NSBundle mainBundle] loadNibNamed:cellId owner:nil options:nil].lastObject; + cell.backgroundColor = UIColor.clearColor; } return cell; } diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.xib b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.xib index a5d6f7a..e7eda9e 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.xib +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankListCell.xib @@ -2,6 +2,7 @@ + @@ -9,24 +10,24 @@ - - + + - + + + + - + @@ -39,22 +40,22 @@ - + @@ -64,13 +65,17 @@ - + + - + + + + @@ -85,7 +90,8 @@ - - + + + diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTopThreeView.xib b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTopThreeView.xib index 6a6874c..e0a2451 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTopThreeView.xib +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTopThreeView.xib @@ -10,296 +10,272 @@ - + + + + - + - - - - + - + - - + + - + - - - - - - - - - - - + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - + - + - - + + - + - - - - - - - - - - - + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - + - + - - + + - + - - - - - - - - - - - + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + @@ -316,17 +292,16 @@ - + - - - - - - - - + + + + + + + diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTypeView.m b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTypeView.m index bfe555b..876420c 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTypeView.m +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTypeView.m @@ -29,22 +29,25 @@ [self addSubview:self.weekBtn]; [self addSubview:self.monthBtn]; self.tmpBtn = self.dayBtn; - CGFloat btnWidth = (SCREEN_WIDTH-64*2-16*2)/3.0; - [self.dayBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(64); - make.height.mas_equalTo(35); - make.width.mas_equalTo(btnWidth); - make.centerY.mas_equalTo(self); - }]; + CGFloat btnWidth = 92; + CGFloat btnHeight = 36; [self.weekBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.dayBtn.mas_right).offset(16); - make.height.mas_equalTo(35); + make.height.mas_equalTo(btnHeight); + make.width.mas_equalTo(btnWidth); + make.centerY.mas_equalTo(self); + make.centerX.equalTo(self); + }]; + + [self.dayBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(self.weekBtn.mas_left).offset(-12); + make.height.mas_equalTo(btnHeight); make.width.mas_equalTo(btnWidth); make.centerY.mas_equalTo(self); }]; + [self.monthBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.weekBtn.mas_right).offset(16); - make.height.mas_equalTo(35); + make.left.equalTo(self.weekBtn.mas_right).offset(12); + make.height.mas_equalTo(btnHeight); make.width.mas_equalTo(btnWidth); make.centerY.mas_equalTo(self); }]; @@ -65,8 +68,8 @@ _dayBtn = [[QXRankTypeButton alloc] init]; [_dayBtn setTitle:@"日榜" forState:(UIControlStateNormal)]; [_dayBtn addTarget:self action:@selector(typeAction:) forControlEvents:(UIControlEventTouchUpInside)]; - _dayBtn.layer.masksToBounds = YES; - _dayBtn.layer.cornerRadius = 17.5; +// _dayBtn.layer.masksToBounds = YES; +// _dayBtn.layer.cornerRadius = 18; _dayBtn.tag = 1; } return _dayBtn; @@ -76,8 +79,8 @@ _weekBtn = [[QXRankTypeButton alloc] init]; [_weekBtn setTitle:@"周榜" forState:(UIControlStateNormal)]; [_weekBtn addTarget:self action:@selector(typeAction:) forControlEvents:(UIControlEventTouchUpInside)]; - _weekBtn.layer.masksToBounds = YES; - _weekBtn.layer.cornerRadius = 17.5; +// _weekBtn.layer.masksToBounds = YES; +// _weekBtn.layer.cornerRadius = 18; _weekBtn.tag = 2; } return _weekBtn; @@ -87,8 +90,8 @@ _monthBtn = [[QXRankTypeButton alloc] init]; [_monthBtn setTitle:@"月榜" forState:(UIControlStateNormal)]; [_monthBtn addTarget:self action:@selector(typeAction:) forControlEvents:(UIControlEventTouchUpInside)]; - _monthBtn.layer.masksToBounds = YES; - _monthBtn.layer.cornerRadius = 17.5; +// _monthBtn.layer.masksToBounds = YES; +// _monthBtn.layer.cornerRadius = 18; _monthBtn.tag = 3; } return _monthBtn; @@ -100,20 +103,22 @@ { self = [super init]; if (self) { - [self setTitleColor:QXConfig.btnTextColor forState:(UIControlStateSelected)]; - [self setTitleColor:QXConfig.textColor forState:(UIControlStateNormal)]; + [self setTitleColor:RGB16(0x421C11) forState:(UIControlStateSelected)]; + [self setTitleColor:RGB16(0xD0E957) forState:(UIControlStateNormal)]; + [self setBackgroundImage:[UIImage imageNamed:@"home_rank_btn_bg_nor"] forState:(UIControlStateNormal)]; + [self setBackgroundImage:[UIImage imageNamed:@"home_rank_btn_bg_sel"] forState:(UIControlStateSelected)]; self.titleLabel.font = [UIFont boldSystemFontOfSize:14]; - self.backgroundColor = RGB16(0xF6F6F6); +// self.backgroundColor = RGB16(0xF6F6F6); } return self; } -(void)setSelected:(BOOL)selected{ [super setSelected:selected]; - if (selected) { - self.backgroundColor = QXConfig.themeColor ; - }else{ - self.backgroundColor = RGB16(0xF6F6F6); - } +// if (selected) { +// self.backgroundColor = QXConfig.themeColor ; +// }else{ +// self.backgroundColor = RGB16(0xF6F6F6); +// } } @end diff --git a/QXLive/Info.plist b/QXLive/Info.plist index 38c6a17..97aa173 100644 --- a/QXLive/Info.plist +++ b/QXLive/Info.plist @@ -23,7 +23,7 @@ weixin CFBundleURLSchemes - wxfc7bf7ca8c71840d + wxc7681513be9f926b diff --git a/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib b/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib index c97b8f6..beddcce 100755 --- a/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib +++ b/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib @@ -77,7 +77,7 @@ - + @@ -135,7 +135,6 @@ - @@ -158,7 +157,6 @@ - diff --git a/QXLive/Other/AppDelegate.m b/QXLive/Other/AppDelegate.m index ceb6bee..3df000a 100644 --- a/QXLive/Other/AppDelegate.m +++ b/QXLive/Other/AppDelegate.m @@ -49,6 +49,7 @@ #import #import "QXAppStartViewController.h" #import "QXGiftPlayerManager.h" +#import "QXGiftDisplayManager.h" #import "IQKeyboardManager.h" #import "QXChirldViewController.h" #import "QXMineNetwork.h" @@ -258,14 +259,16 @@ QXLOG(@"========app已经进入后台========"); if ([QXGlobal.shareGlobal.roomId isExist]) { [[QXGiftPlayerManager shareManager] stopPlay]; + [[QXGiftDisplayManager sharedManager] inBackGround]; } } -(void)applicationWillResignActive:(UIApplication *)application{ QXLOG(@"========app即将进入后台========"); } -(void)applicationWillEnterForeground:(UIApplication *)application{ - if ([QXGlobal.shareGlobal.roomId isExist] && (QXGlobal.shareGlobal.miniView==nil)) { + if ([QXGlobal.shareGlobal.roomId isExist]) { [[QXGiftPlayerManager shareManager] startPlay]; + [[QXGiftDisplayManager sharedManager] becomeFront]; } } diff --git a/QXLive/Other/Assets.xcassets/app_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_bg.imageset/Contents.json index 41db05c..5744ec8 100644 --- a/QXLive/Other/Assets.xcassets/app_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/app_bg.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "背景3@2x.png", + "filename" : "一键登录背景@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/app_bg.imageset/一键登录背景@2x.png b/QXLive/Other/Assets.xcassets/app_bg.imageset/一键登录背景@2x.png new file mode 100644 index 0000000..43cbf6a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_bg.imageset/一键登录背景@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_bg.imageset/背景3@2x.png b/QXLive/Other/Assets.xcassets/app_bg.imageset/背景3@2x.png deleted file mode 100644 index a22e2ac..0000000 Binary files a/QXLive/Other/Assets.xcassets/app_bg.imageset/背景3@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json index ecbb49a..b769b7e 100644 --- a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "app_home_bg@2x.png", + "filename" : "首页背景@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png deleted file mode 100644 index 5deca85..0000000 Binary files a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/首页背景@2x.png b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/首页背景@2x.png new file mode 100644 index 0000000..31956a9 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/首页背景@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/chat_buble/Contents.json b/QXLive/Other/Assets.xcassets/chat_buble/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/QXLive/Other/Assets.xcassets/chat_buble/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/chat_buble1@2x.png b/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/chat_buble1@2x.png deleted file mode 100644 index ed172d4..0000000 Binary files a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/chat_buble1@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/chat_buble1@3x.png b/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/chat_buble1@3x.png deleted file mode 100644 index fed537e..0000000 Binary files a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/chat_buble1@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/chat_bubble2@2x.png b/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/chat_bubble2@2x.png deleted file mode 100644 index 47989a8..0000000 Binary files a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/chat_bubble2@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/chat_bubble2@3x.png b/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/chat_bubble2@3x.png deleted file mode 100644 index d5e111d..0000000 Binary files a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/chat_bubble2@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/Contents.json similarity index 73% rename from QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/Contents.json index 4921819..8e7fc59 100644 --- a/QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "rank_first_header@2x.png", + "filename" : "home_rank_btn_bg_nor@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "rank_first_header@3x.png", + "filename" : "home_rank_btn_bg_nor@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/home_rank_btn_bg_nor@2x.png b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/home_rank_btn_bg_nor@2x.png new file mode 100644 index 0000000..e21c66c Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/home_rank_btn_bg_nor@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/home_rank_btn_bg_nor@3x.png b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/home_rank_btn_bg_nor@3x.png new file mode 100644 index 0000000..9c88240 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/home_rank_btn_bg_nor@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/Contents.json similarity index 73% rename from QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/Contents.json index d1387f2..12bcd90 100644 --- a/QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "rank_third_header@2x.png", + "filename" : "home_rank_btn_bg_sel@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "rank_third_header@3x.png", + "filename" : "home_rank_btn_bg_sel@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/home_rank_btn_bg_sel@2x.png b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/home_rank_btn_bg_sel@2x.png new file mode 100644 index 0000000..6891c93 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/home_rank_btn_bg_sel@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/home_rank_btn_bg_sel@3x.png b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/home_rank_btn_bg_sel@3x.png new file mode 100644 index 0000000..38f6ed4 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/home_rank_btn_bg_sel@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/Contents.json similarity index 74% rename from QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/Contents.json index 7aa09f6..fda74c3 100644 --- a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble2.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "chat_bubble2@2x.png", + "filename" : "home_rank_list_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "chat_bubble2@3x.png", + "filename" : "home_rank_list_bg@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/home_rank_list_bg@2x.png b/QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/home_rank_list_bg@2x.png new file mode 100644 index 0000000..9b56eaf Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/home_rank_list_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/home_rank_list_bg@3x.png b/QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/home_rank_list_bg@3x.png new file mode 100644 index 0000000..ae84cdf Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/home_rank_list_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/Group 283.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_rank_top_bg.imageset/Contents.json similarity index 77% rename from QXLive/Other/Assets.xcassets/login/Group 283.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/home/home_rank_top_bg.imageset/Contents.json index 79b7729..f386ba5 100644 --- a/QXLive/Other/Assets.xcassets/login/Group 283.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_rank_top_bg.imageset/Contents.json @@ -5,12 +5,11 @@ "scale" : "1x" }, { - "filename" : "Group 283@2x.png", + "filename" : "home_rank_top_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 283@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_top_bg.imageset/home_rank_top_bg@2x.png b/QXLive/Other/Assets.xcassets/home/home_rank_top_bg.imageset/home_rank_top_bg@2x.png new file mode 100644 index 0000000..e5790f0 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_top_bg.imageset/home_rank_top_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/Contents.json new file mode 100644 index 0000000..a623186 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_rank_top_cp_name_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_rank_top_cp_name_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/home_rank_top_cp_name_bg@2x.png b/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/home_rank_top_cp_name_bg@2x.png new file mode 100644 index 0000000..f2e5765 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/home_rank_top_cp_name_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/home_rank_top_cp_name_bg@3x.png b/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/home_rank_top_cp_name_bg@3x.png new file mode 100644 index 0000000..665dcfb Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/home_rank_top_cp_name_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/Contents.json similarity index 72% rename from QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/Contents.json index 3339894..42a21b8 100644 --- a/QXLive/Other/Assets.xcassets/chat_buble/chat_bubble1.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "chat_buble1@2x.png", + "filename" : "home_rank_top_name_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "chat_buble1@3x.png", + "filename" : "home_rank_top_name_bg@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/home_rank_top_name_bg@2x.png b/QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/home_rank_top_name_bg@2x.png new file mode 100644 index 0000000..673090a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/home_rank_top_name_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/home_rank_top_name_bg@3x.png b/QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/home_rank_top_name_bg@3x.png new file mode 100644 index 0000000..221427b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/home_rank_top_name_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login_app_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_rank_vc_bg.imageset/Contents.json similarity index 77% rename from QXLive/Other/Assets.xcassets/login_app_bg.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/home/home_rank_vc_bg.imageset/Contents.json index c69054c..805c178 100644 --- a/QXLive/Other/Assets.xcassets/login_app_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_rank_vc_bg.imageset/Contents.json @@ -5,12 +5,11 @@ "scale" : "1x" }, { - "filename" : "Mask group@2x.png", + "filename" : "home_rank_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Mask group@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_rank_vc_bg.imageset/home_rank_bg@2x.png b/QXLive/Other/Assets.xcassets/home/home_rank_vc_bg.imageset/home_rank_bg@2x.png new file mode 100644 index 0000000..2c1a6cd Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_rank_vc_bg.imageset/home_rank_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Contents.json index 4703c95..756c7e3 100644 --- a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 448@2x.png", + "filename" : "my_rank_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 448@3x.png", + "filename" : "my_rank_bg@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@2x.png b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@2x.png deleted file mode 100644 index ae6615e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@3x.png b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@3x.png deleted file mode 100644 index 5c724b7..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/my_rank_bg@2x.png b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/my_rank_bg@2x.png new file mode 100644 index 0000000..f8ea614 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/my_rank_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/my_rank_bg@3x.png b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/my_rank_bg@3x.png new file mode 100644 index 0000000..4a04485 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/my_rank_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_first_bg.imageset/rank_first_bg@2x.png b/QXLive/Other/Assets.xcassets/home/rank_first_bg.imageset/rank_first_bg@2x.png index 3c4deea..aa1527f 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_first_bg.imageset/rank_first_bg@2x.png and b/QXLive/Other/Assets.xcassets/home/rank_first_bg.imageset/rank_first_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_first_bg.imageset/rank_first_bg@3x.png b/QXLive/Other/Assets.xcassets/home/rank_first_bg.imageset/rank_first_bg@3x.png index ae9132f..18fb230 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_first_bg.imageset/rank_first_bg@3x.png and b/QXLive/Other/Assets.xcassets/home/rank_first_bg.imageset/rank_first_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/rank_first_header@2x.png b/QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/rank_first_header@2x.png deleted file mode 100644 index d29c7b5..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/rank_first_header@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/rank_first_header@3x.png b/QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/rank_first_header@3x.png deleted file mode 100644 index 07149cf..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_first_header.imageset/rank_first_header@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/Contents.json deleted file mode 100644 index 0c48a0b..0000000 --- a/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "rank_real_love_first_header@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "rank_real_love_first_header@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/rank_real_love_first_header@2x.png b/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/rank_real_love_first_header@2x.png deleted file mode 100644 index b32075e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/rank_real_love_first_header@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/rank_real_love_first_header@3x.png b/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/rank_real_love_first_header@3x.png deleted file mode 100644 index a463f7d..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/rank_real_love_first_header@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/Contents.json deleted file mode 100644 index 0c48a0b..0000000 --- a/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "rank_real_love_first_header@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "rank_real_love_first_header@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/rank_real_love_first_header@2x.png b/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/rank_real_love_first_header@2x.png deleted file mode 100644 index 76a35b8..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/rank_real_love_first_header@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/rank_real_love_first_header@3x.png b/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/rank_real_love_first_header@3x.png deleted file mode 100644 index 6473efc..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/rank_real_love_first_header@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/Contents.json deleted file mode 100644 index 9c3e859..0000000 --- a/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "rank_real_love_third_header@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "rank_real_love_third_header@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/rank_real_love_third_header@2x.png b/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/rank_real_love_third_header@2x.png deleted file mode 100644 index b987c91..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/rank_real_love_third_header@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/rank_real_love_third_header@3x.png b/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/rank_real_love_third_header@3x.png deleted file mode 100644 index 32436cc..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/rank_real_love_third_header@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_value_bg.imageset/rank_real_love_value_bg@2x.png b/QXLive/Other/Assets.xcassets/home/rank_real_love_value_bg.imageset/rank_real_love_value_bg@2x.png index dd967a0..f58655a 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_real_love_value_bg.imageset/rank_real_love_value_bg@2x.png and b/QXLive/Other/Assets.xcassets/home/rank_real_love_value_bg.imageset/rank_real_love_value_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_real_love_value_bg.imageset/rank_real_love_value_bg@3x.png b/QXLive/Other/Assets.xcassets/home/rank_real_love_value_bg.imageset/rank_real_love_value_bg@3x.png index db0e864..4046c5c 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_real_love_value_bg.imageset/rank_real_love_value_bg@3x.png and b/QXLive/Other/Assets.xcassets/home/rank_real_love_value_bg.imageset/rank_real_love_value_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_second_bg.imageset/rank_second_bg@2x.png b/QXLive/Other/Assets.xcassets/home/rank_second_bg.imageset/rank_second_bg@2x.png index 7d465fa..61f2985 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_second_bg.imageset/rank_second_bg@2x.png and b/QXLive/Other/Assets.xcassets/home/rank_second_bg.imageset/rank_second_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_second_bg.imageset/rank_second_bg@3x.png b/QXLive/Other/Assets.xcassets/home/rank_second_bg.imageset/rank_second_bg@3x.png index 7d054e5..216b816 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_second_bg.imageset/rank_second_bg@3x.png and b/QXLive/Other/Assets.xcassets/home/rank_second_bg.imageset/rank_second_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_third_bg.imageset/rank_third_bg@2x.png b/QXLive/Other/Assets.xcassets/home/rank_third_bg.imageset/rank_third_bg@2x.png index db3f5df..ab44318 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_third_bg.imageset/rank_third_bg@2x.png and b/QXLive/Other/Assets.xcassets/home/rank_third_bg.imageset/rank_third_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_third_bg.imageset/rank_third_bg@3x.png b/QXLive/Other/Assets.xcassets/home/rank_third_bg.imageset/rank_third_bg@3x.png index 7af65a4..f46973b 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_third_bg.imageset/rank_third_bg@3x.png and b/QXLive/Other/Assets.xcassets/home/rank_third_bg.imageset/rank_third_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/rank_third_header@2x.png b/QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/rank_third_header@2x.png deleted file mode 100644 index 790a113..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/rank_third_header@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/rank_third_header@3x.png b/QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/rank_third_header@3x.png deleted file mode 100644 index 9c30785..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/rank_third_header.imageset/rank_third_header@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_value_bg.imageset/rank_value_bg@2x.png b/QXLive/Other/Assets.xcassets/home/rank_value_bg.imageset/rank_value_bg@2x.png index f641a60..8222ca9 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_value_bg.imageset/rank_value_bg@2x.png and b/QXLive/Other/Assets.xcassets/home/rank_value_bg.imageset/rank_value_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/rank_value_bg.imageset/rank_value_bg@3x.png b/QXLive/Other/Assets.xcassets/home/rank_value_bg.imageset/rank_value_bg@3x.png index def1f98..27afbf6 100644 Binary files a/QXLive/Other/Assets.xcassets/home/rank_value_bg.imageset/rank_value_bg@3x.png and b/QXLive/Other/Assets.xcassets/home/rank_value_bg.imageset/rank_value_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Contents.json index 0015030..ac62fbd 100644 --- a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "火@2x.png", + "filename" : "room_hot_icon@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "火@3x.png", + "filename" : "room_hot_icon@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/room_hot_icon@2x.png b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/room_hot_icon@2x.png new file mode 100644 index 0000000..f7d2021 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/room_hot_icon@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/room_hot_icon@3x.png b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/room_hot_icon@3x.png new file mode 100644 index 0000000..450db77 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/room_hot_icon@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/火@2x.png b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/火@2x.png deleted file mode 100644 index d209586..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/火@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/火@3x.png b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/火@3x.png deleted file mode 100644 index 63b5217..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/火@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/Group 283.imageset/Group 283@2x.png b/QXLive/Other/Assets.xcassets/login/Group 283.imageset/Group 283@2x.png deleted file mode 100644 index 32c3eb5..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/Group 283.imageset/Group 283@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/Group 283.imageset/Group 283@3x.png b/QXLive/Other/Assets.xcassets/login/Group 283.imageset/Group 283@3x.png deleted file mode 100644 index a04ba33..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/Group 283.imageset/Group 283@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/forgot_pwd@2x.png b/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/forgot_pwd@2x.png index da8b7e3..2f3a52f 100644 Binary files a/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/forgot_pwd@2x.png and b/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/forgot_pwd@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/forgot_pwd@3x.png b/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/forgot_pwd@3x.png index c31bc13..6a02ffb 100644 Binary files a/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/forgot_pwd@3x.png and b/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/forgot_pwd@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@2x.png b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@2x.png index 00d80c2..1ab4839 100644 Binary files a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@2x.png and b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@3x.png b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@3x.png index bbbef18..a77a541 100644 Binary files a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@3x.png and b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json index 74e9be7..7e21ebb 100644 --- a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "iPadProApp_83.5pt@2x.png", + "filename" : "login_logo.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/iPadProApp_83.5pt@2x.png b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/iPadProApp_83.5pt@2x.png deleted file mode 100644 index e5be181..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/iPadProApp_83.5pt@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/login_logo.png b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/login_logo.png new file mode 100644 index 0000000..2ba770a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/login_logo.png differ diff --git a/QXLive/Other/Assets.xcassets/login/random.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/random.imageset/Contents.json index 4c3d347..3cdea87 100644 --- a/QXLive/Other/Assets.xcassets/login/random.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/random.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "random@2x.png", + "filename" : "随机@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "random@3x.png", + "filename" : "随机@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/random.imageset/random@2x.png b/QXLive/Other/Assets.xcassets/login/random.imageset/random@2x.png deleted file mode 100644 index 1881666..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/random.imageset/random@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/random.imageset/random@3x.png b/QXLive/Other/Assets.xcassets/login/random.imageset/random@3x.png deleted file mode 100644 index 6d183aa..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/random.imageset/random@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/random.imageset/随机@2x.png b/QXLive/Other/Assets.xcassets/login/random.imageset/随机@2x.png new file mode 100644 index 0000000..8b443d3 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/random.imageset/随机@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/random.imageset/随机@3x.png b/QXLive/Other/Assets.xcassets/login/random.imageset/随机@3x.png new file mode 100644 index 0000000..94277d0 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/random.imageset/随机@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/Contents.json index 63faddd..155b1f3 100644 --- a/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "welcome_midi@2x.png", + "filename" : "欢迎来到梵音@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "welcome_midi@3x.png", + "filename" : "欢迎来到梵音@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/welcome_midi@2x.png b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/welcome_midi@2x.png deleted file mode 100644 index b17c94e..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/welcome_midi@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/welcome_midi@3x.png b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/welcome_midi@3x.png deleted file mode 100644 index fcf0b62..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/welcome_midi@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/欢迎来到梵音@2x.png b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/欢迎来到梵音@2x.png new file mode 100644 index 0000000..fa0c5c8 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/欢迎来到梵音@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/欢迎来到梵音@3x.png b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/欢迎来到梵音@3x.png new file mode 100644 index 0000000..23490f7 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/欢迎来到梵音@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login_app_bg.imageset/Mask group@2x.png b/QXLive/Other/Assets.xcassets/login_app_bg.imageset/Mask group@2x.png deleted file mode 100644 index f61ea2c..0000000 Binary files a/QXLive/Other/Assets.xcassets/login_app_bg.imageset/Mask group@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login_app_bg.imageset/Mask group@3x.png b/QXLive/Other/Assets.xcassets/login_app_bg.imageset/Mask group@3x.png deleted file mode 100644 index 2381704..0000000 Binary files a/QXLive/Other/Assets.xcassets/login_app_bg.imageset/Mask group@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Contents.json b/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Contents.json index f86771e..a33e1da 100644 --- a/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 7289@2x.png", + "filename" : "room_song_close@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 7289@3x.png", + "filename" : "room_song_close@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Group 7289@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Group 7289@2x.png deleted file mode 100644 index a0209ae..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Group 7289@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Group 7289@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Group 7289@3x.png deleted file mode 100644 index 30e5255..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Group 7289@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/room_song_close@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/room_song_close@2x.png new file mode 100644 index 0000000..4d83c51 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/room_song_close@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/room_song_close@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/room_song_close@3x.png new file mode 100644 index 0000000..e7028fe Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_close.imageset/room_song_close@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Contents.json b/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Contents.json index ebffab6..08a319d 100644 --- a/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 7287@2x.png", + "filename" : "room_song_give@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 7287@3x.png", + "filename" : "room_song_give@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Group 7287@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Group 7287@2x.png deleted file mode 100644 index 12d9ec6..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Group 7287@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Group 7287@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Group 7287@3x.png deleted file mode 100644 index 232a703..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Group 7287@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/room_song_give@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/room_song_give@2x.png new file mode 100644 index 0000000..5b24d39 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/room_song_give@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/room_song_give@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/room_song_give@3x.png new file mode 100644 index 0000000..3173d5f Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_give.imageset/room_song_give@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Contents.json b/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Contents.json index ff058f5..faf0b45 100644 --- a/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 7288@2x.png", + "filename" : "room_song_next@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 7288@3x.png", + "filename" : "room_song_next@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Group 7288@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Group 7288@2x.png deleted file mode 100644 index 61cf9f6..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Group 7288@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Group 7288@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Group 7288@3x.png deleted file mode 100644 index 934e0b8..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Group 7288@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/room_song_next@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/room_song_next@2x.png new file mode 100644 index 0000000..813e28f Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/room_song_next@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/room_song_next@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/room_song_next@3x.png new file mode 100644 index 0000000..0bf5f8f Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_next.imageset/room_song_next@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Contents.json b/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Contents.json index 60d9213..b4ffeaf 100644 --- a/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 7285@2x.png", + "filename" : "room_song_original_sel@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 7285@3x.png", + "filename" : "room_song_original_sel@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Group 7285@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Group 7285@2x.png deleted file mode 100644 index 83b0d45..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Group 7285@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Group 7285@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Group 7285@3x.png deleted file mode 100644 index 43205f4..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/Group 7285@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/room_song_original_sel@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/room_song_original_sel@2x.png new file mode 100644 index 0000000..e067b7b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/room_song_original_sel@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/room_song_original_sel@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/room_song_original_sel@3x.png new file mode 100644 index 0000000..6fb06b9 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_original_sel.imageset/room_song_original_sel@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Contents.json b/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Contents.json index 5c4d3b1..fa88a17 100644 --- a/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x.png", + "filename" : "room_song_up@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x.png", + "filename" : "room_song_up@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Frame@2x.png deleted file mode 100644 index 556cf67..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Frame@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Frame@3x.png deleted file mode 100644 index 8d9de07..0000000 Binary files a/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/Frame@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/room_song_up@2x.png b/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/room_song_up@2x.png new file mode 100644 index 0000000..53c7e7d Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/room_song_up@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/room_song_up@3x.png b/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/room_song_up@3x.png new file mode 100644 index 0000000..2c1b69c Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_song_up.imageset/room_song_up@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/Contents.json b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/Contents.json index 416a255..33c1508 100644 --- a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "iPhoneApp_60pt@2x.png", + "filename" : "user_header_placehoulder.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@2x.png b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@2x.png deleted file mode 100644 index 86411c5..0000000 Binary files a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/user_header_placehoulder.png b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/user_header_placehoulder.png new file mode 100644 index 0000000..2ba770a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/user_header_placehoulder.png differ diff --git a/QXLive/Other/NoitceAndKey.h b/QXLive/Other/NoitceAndKey.h index 056d779..35e3277 100644 --- a/QXLive/Other/NoitceAndKey.h +++ b/QXLive/Other/NoitceAndKey.h @@ -21,9 +21,9 @@ typedef NS_ENUM(NSInteger) { #if DEVELOPENT == 1 static NSString *const AppScheme = @"qxlivetest"; -static NSString *const WechatAppId = @"wxfc7bf7ca8c71840d"; -static NSString *const WechatAppSecret = @"b220c133628ac57252cfa2deef03b144"; -static NSString *const WechatUniversalLink = @"https://mdh.xscmmidi.site/"; +static NSString *const WechatAppId = @"wxc7681513be9f926b"; +static NSString *const WechatAppSecret = @"37afd7c6b9135b642bd01190305868fe"; +static NSString *const WechatUniversalLink = @"https://test.vespa.qxyushen.top/"; /// 人脸核身 static NSString *const FaceAuthId = @"TIDAQDf8"; @@ -31,8 +31,8 @@ static NSString *const FaceAuthSecret = @"wtyBWku7i6T28Op5b0vlOtrfZbkKnBcI6Is8v6 static NSString *const FaceAuthLicense = @"Fq0Sj4UpfryHBB3inAxCwLmJUw3nNGc42mqvvz/5NYa1z/bvs1mKfPOqKC84yJNJpaUWEs+/Fyx3suFU1ww0Z4Cny+8Atmnfc0rzZ+4DGRKGa3KGNNpdJpfe5QGeRGKNtlbu0rFS0t24IX6MVs6gikx60IgrphRaZb0Xn/rZbqoMBPhZad80QU40PM+28QcOtufSd6QQwyKyjM/vCo8gnR8v9lTewz7y7GWkISVoymwW8BQMIkvWEXiGoi6u3mCuj2gn7cwGcb2HCXvM0EIzSLgKSwMFrIKYVmbEQ0ZIwUqCAk7IJv5V2VyGPUc1VIli0lWWPhwaL+1kVhpPytiK5A=="; /// 腾讯IM -static NSInteger const TencentIMID = 1600106397; -static NSString *const TencentIMSecret = @"192d5035de4f1c32e8b26ea8580c57ce4988835e2377db35d1f4ac2a8d6bb9d7"; +static NSInteger const TencentIMID = 1600096890; +static NSString *const TencentIMSecret = @"448a3259085924f89957c1884c761974e8fded64b9ab1c67b8e0a5a1c4b68f3f"; static NSString *const AddressOfMQTTServer = @"1.13.181.248"; static NSInteger const AddressOfMQTTPort = 1883; @@ -45,9 +45,9 @@ static NSString *const AuthSDKKey = @"Q8xhyn+MAyHw8FQLjKOWU8ZrZMXsuflPGSxDvwKu8U #else static NSString *const AppScheme = @"qxlive"; -static NSString *const WechatAppId = @"wxfc7bf7ca8c71840d"; -static NSString *const WechatAppSecret = @"b220c133628ac57252cfa2deef03b144"; -static NSString *const WechatUniversalLink = @"https://mdh.xscmmidi.site/"; +static NSString *const WechatAppId = @"wxc7681513be9f926b"; +static NSString *const WechatAppSecret = @"37afd7c6b9135b642bd01190305868fe"; +static NSString *const WechatUniversalLink = @"https://vespa.qxyushen.top/"; /// 人脸核身 static NSString *const FaceAuthId = @"IDA8YkL0"; @@ -55,19 +55,19 @@ static NSString *const FaceAuthSecret = @"RqNCp7PoY77oJqVu9hFEDM0Ol2DNDQQQ97vy9C static NSString *const FaceAuthLicense = @"P6N+VYfdu1Op5p+QwUGdI4y64PqOnxMzChX2SWWvrXjKi5gSKTKYnksyPYGpdDoEiZGUuvidfW3fJx0DHobAmD/MMpCxdzRyvyn4Z0d7Ccno6TEO2eigEbAOL4rrM8xZHE6+POuORUrmDjRR7yKwT6yVJoMa96ULUZ54tAHY5TAMBPhZad80QU40PM+28QcOtufSd6QQwyKyjM/vCo8gnR8v9lTewz7y7GWkISVoymwW8BQMIkvWEXiGoi6u3mCuj2gn7cwGcb2HCXvM0EIzSLgKSwMFrIKYVmbEQ0ZIwUqCAk7IJv5V2VyGPUc1VIli0lWWPhwaL+1kVhpPytiK5A=="; /// 腾讯IM -static NSInteger const TencentIMID = 1600101474; -static NSString *const TencentIMSecret = @"96d9453fbdc23f5326f351c83e27fc65db0ea6cdc0ac706770bfbeeaf6c89456"; +static NSInteger const TencentIMID = 1600096860; +static NSString *const TencentIMSecret = @"d9a5b8088ed39113d0c92ae434bc37528c4715c1f1d2eaedb172134eacd06103"; -static NSString *const AddressOfMQTTServer = @"62.234.12.147"; +static NSString *const AddressOfMQTTServer = @"1.13.101.98"; static NSInteger const AddressOfMQTTPort = 1883; static NSInteger const AppPushId = 46163; ///声网 -static NSString *const AgoraAuthId = @"a3f0f0c78307434fa1c697c3429fbdcf"; +static NSString *const AgoraAuthId = @"3e8f3add448d4692bc1d04c75ffe801b"; //一键登录AuthSDKInfo -static NSString *const AuthSDKKey = @"Qyj6q/o52PnGW8NJE48dN4ha+0KWDVyuF05Xj9HRV85u8YBs4xIkelP44/5xEv3+cMVs5aDf5/1ESuDp6rWq3tcbDoaUSaNya8S31LDrNfajmXBRucTnIpfp02T2NWjzQmKrhQVJUwH2UWp3p63fxfxE7AzA38qKtqjXKPWt+pqeeMO6lBzB0jrZv+aGPj4IsEdVw0lAW4yO0QPqKORWJNHQgEbB4sWl17Ryby4UzYzHc4gN6kAJh74ickyuKp3j"; +static NSString *const AuthSDKKey = @"5tSOUubmo+kwXM4U9P+f5VqLez4YnLDYA6+vOi4gffihD3s0I9rvuCqdyb3z/hOHhUUJCpAO1uuXS5S7klzxPBrZN1+ah8x2YuoGqrNe7dRXk4F7yS+y+FhHsIo22rUdA6RXsF78fFRuJRTOa3bVsqNK5Oe6weXZubFm0UEig9KcuHzfUcQgsOIlXp1SnCIBwHTXraaVmABfEEF1D9eGyDcm+PpQbr/aGPiXf0BtITXz2lTjJ6WxnbwblNY0VwF/"; #endif /// 声网 diff --git a/QXLive/Other/QXApi.h b/QXLive/Other/QXApi.h index d579d08..0fdd634 100644 --- a/QXLive/Other/QXApi.h +++ b/QXLive/Other/QXApi.h @@ -16,12 +16,12 @@ //tadmin.xscmmidi.site --管理后台 //tmd.xscmmidi.site -- 这是接口 api #if DEVELOPENT == 1 -static NSString* ServerUrl = @"https://tmd.xscmmidi.site/"; +static NSString* ServerUrl = @"https://test.vespa.qxyushen.top/"; //static NSString* ServerUrl = @"http://test.chat.qxyushen.top"; -static NSString* H5ServerUrl = @"https://tmd.xscmmidi.site/h5/"; +static NSString* H5ServerUrl = @"https://test.vespa.qxyushen.top/h5/"; #else -static NSString* ServerUrl = @"https://md.xscmmidi.site/"; -static NSString* H5ServerUrl = @"https://md.xscmmidi.site/h5/"; +static NSString* ServerUrl = @"https://vespa.qxyushen.top/"; +static NSString* H5ServerUrl = @"https://vespa.qxyushen.top/h5/"; #endif #pragma mark - 引导页 /// 引导页 diff --git a/QXLive/Other/QXDefine.h b/QXLive/Other/QXDefine.h index dac242c..ea2afd8 100644 --- a/QXLive/Other/QXDefine.h +++ b/QXLive/Other/QXDefine.h @@ -14,9 +14,9 @@ ///导航高度 + safe高 #define NavContentHeight (kSafeAreaTop + NavHeight) ///称号高 -#define UserIconHeight 17 +#define UserIconHeight 15 /// 称号宽 -#define UserIconWidth 74 +#define UserIconWidth 57 ///导航高 #define NavHeight 44 ///工具栏高度 diff --git a/QXLive/Other/chat_buble.png b/QXLive/Other/chat_buble.png deleted file mode 100644 index b4b35ba..0000000 Binary files a/QXLive/Other/chat_buble.png and /dev/null differ diff --git a/QXLive/Room(房间)/Controller/QXRoomViewController.m b/QXLive/Room(房间)/Controller/QXRoomViewController.m index c57997f..85834f6 100644 --- a/QXLive/Room(房间)/Controller/QXRoomViewController.m +++ b/QXLive/Room(房间)/Controller/QXRoomViewController.m @@ -36,6 +36,7 @@ #import "QXRoomViewController+QXGiftDrift.h" #import "QXRedBagRecordViewController.h" #import "QXRoomEmojiView.h" +#import "QXGiftDisplayManager.h" @interface QXRoomViewController ()< QXRoomBottomViewDelegate, @@ -119,6 +120,7 @@ QXRoomUserInfoViewDelegate [self playHWDMP4]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [[QXGiftPlayerManager shareManager] startPlay]; + [[QXGiftDisplayManager sharedManager] becomeFront]; }); self.navigationController.viewControllers = marr; // self.navigationController.interactivePopGestureRecognizer.enabled = NO; @@ -133,6 +135,7 @@ QXRoomUserInfoViewDelegate -(void)viewWillDisappear:(BOOL)animated{ [super viewWillDisappear:animated]; [[QXGiftPlayerManager shareManager] stopPlay]; + [[QXGiftDisplayManager sharedManager] inBackGround]; } -(void)initSubViews{ @@ -602,8 +605,8 @@ QXRoomUserInfoViewDelegate } /// 暂时不要pk hasPK = NO; - /// 暂时不要ktv - hasSong = NO; +// /// 暂时不要ktv +// hasSong = NO; /// 普通麦位 if (self.seatContentView.myPitNumber <= 0) { self.bottomView.status = 1; diff --git a/QXLive/Room(房间)/View/QXRoomChatListView.h b/QXLive/Room(房间)/View/QXRoomChatListView.h index 22c1a65..a28978b 100644 --- a/QXLive/Room(房间)/View/QXRoomChatListView.h +++ b/QXLive/Room(房间)/View/QXRoomChatListView.h @@ -23,6 +23,8 @@ typedef NS_ENUM(NSInteger) { QXRoomChatMessageTypeGift = 2, /// 表情 QXRoomChatMessageTypeEmoji = 3, + /// 系统公告 + QXRoomChatMessageTypeNotice = 10, }QXRoomChatMessageType; @class QXRoomChatListModel; @interface QXRoomChatListView : UIView @@ -49,14 +51,14 @@ typedef NS_ENUM(NSInteger) { @interface QXRoomGiftListCell : UITableViewCell @property(nonatomic,strong)UIView *bgView; -@property(nonatomic,strong)UIImageView *headerImageView; -@property(nonatomic,strong)UIView *iconBgView; +//@property(nonatomic,strong)UIImageView *headerImageView; +//@property(nonatomic,strong)UIView *iconBgView; /// 礼物图片 -@property(nonatomic,strong)UIImageView *giftImageView; +//@property(nonatomic,strong)UIImageView *giftImageView; /// 礼物数量 -@property(nonatomic,strong)UILabel *giftCountLabel; -@property(nonatomic,strong)NSMutableArray *iconViewArray; -@property(nonatomic,strong)UILabel *nameLabel; +//@property(nonatomic,strong)UILabel *giftCountLabel; +//@property(nonatomic,strong)NSMutableArray *iconViewArray; +//@property(nonatomic,strong)UILabel *nameLabel; @property(nonatomic,strong)UILabel *titleLabel; @property(nonatomic,strong)UIImageView *bubbleImageView; @property (nonatomic,strong)QXRoomChatListModel *message; diff --git a/QXLive/Room(房间)/View/QXRoomChatListView.m b/QXLive/Room(房间)/View/QXRoomChatListView.m index 0487892..ece5592 100644 --- a/QXLive/Room(房间)/View/QXRoomChatListView.m +++ b/QXLive/Room(房间)/View/QXRoomChatListView.m @@ -7,6 +7,7 @@ #import "QXRoomChatListView.h" #import "UIImage+WebP.h" +#define messageNoticeColor RGB16(0xCCA882) #define messageNameColor RGB16(0x00C8FF) #define messageGiftColor RGB16(0xFFE309) #define messageBubbleColor RGB16A(0x000000, 0.3) @@ -66,7 +67,7 @@ NSInteger maxMessageCount = 20; [self addSubview:self.tableView]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.equalTo(self); - make.top.equalTo(self).offset(0); + make.top.equalTo(self).offset(10); make.bottom.equalTo(self).offset(-10); }]; @@ -169,7 +170,7 @@ NSInteger maxMessageCount = 20; } -(void)insertNoitce{ QXRoomChatListModel *model = [QXRoomChatListModel new]; - model.messageType = QXRoomChatMessageTypeSystem; + model.messageType = QXRoomChatMessageTypeNotice; model.text = @"羽声语音严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。"; [self.dataArray addObject:model]; [self.tableView reloadData]; @@ -315,13 +316,13 @@ NSInteger maxMessageCount = 20; height = 28+19+13+8 + height; } }else if (model.messageType == QXRoomChatMessageTypeGift) { - if ([model.FromUserInfo.chat_bubble isExist]) { - height = [model.text heightForFont:[UIFont systemFontOfSize:14] width:ScaleWidth(280)-60-18]; - height = 28+19+13+16 + height; - }else{ - height = [model.text heightForFont:[UIFont systemFontOfSize:14] width:ScaleWidth(280)-60-18-16]; - height = 28+19+13+8 + height; - } +// if ([model.FromUserInfo.chat_bubble isExist]) { +// height = [model.text heightForFont:[UIFont systemFontOfSize:14] width:ScaleWidth(280)-16*2-8]; +// height = 16*2 + height+1; +// }else{ + height = [model.text heightForFont:[UIFont systemFontOfSize:14] width:ScaleWidth(280)-16*2-8]; + height = 8*2+messageBubbleMargin*2 + height+1; +// } }else if(model.messageType == QXRoomChatMessageTypeEmoji){ if ([model.FromUserInfo.chat_bubble isExist]) { height = 28+19+13+16 + 40; @@ -689,26 +690,26 @@ NSInteger maxMessageCount = 20; } } self.titleLabel.attributedText = attr; - self.nameLabel.text = message.FromUserInfo.nickname; - [self.headerImageView sd_setImageWithURL:[NSURL URLWithString:message.FromUserInfo.avatar]]; - self.iconBgView.hidden = YES; - for (int i = 0;i < message.FromUserInfo.icon.count;i++) { - if (i < 3) { - self.iconBgView.hidden = NO; - UIImageView *iconImageView = self.iconViewArray[i]; - iconImageView.hidden = NO; - [iconImageView sd_setImageWithURL:[NSURL URLWithString:message.FromUserInfo.icon[i]]]; - }else{ - self.iconBgView.hidden = YES; - } - } +// self.nameLabel.text = message.FromUserInfo.nickname; +// [self.headerImageView sd_setImageWithURL:[NSURL URLWithString:message.FromUserInfo.avatar]]; +// self.iconBgView.hidden = YES; +// for (int i = 0;i < message.FromUserInfo.icon.count;i++) { +// if (i < 3) { +// self.iconBgView.hidden = NO; +// UIImageView *iconImageView = self.iconViewArray[i]; +// iconImageView.hidden = NO; +// [iconImageView sd_setImageWithURL:[NSURL URLWithString:message.FromUserInfo.icon[i]]]; +// }else{ +// self.iconBgView.hidden = YES; +// } +// } } -(void)initSubviews{ self.bgView = [[UIView alloc] init]; [self.contentView addSubview:self.bgView]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(16); - make.right.mas_equalTo(0); + make.right.mas_lessThanOrEqualTo(-8); make.top.mas_equalTo(messageBubbleMargin); make.bottom.mas_equalTo(-messageBubbleMargin); }]; @@ -723,36 +724,36 @@ NSInteger maxMessageCount = 20; make.edges.equalTo(self.bgView); }]; - self.headerImageView = [[UIImageView alloc] init]; - self.headerImageView.contentMode = UIViewContentModeScaleAspectFill; - self.headerImageView.backgroundColor = [UIColor whiteColor]; - [self.headerImageView addRoundedCornersWithRadius:14]; - [self.bgView addSubview:self.headerImageView]; - - [self.headerImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.top.mas_equalTo(19); - make.size.mas_equalTo(CGSizeMake(28, 28)); - }]; - - UIButton *headerBtn = [[UIButton alloc] init]; - [headerBtn addTarget:self action:@selector(headerAction) forControlEvents:(UIControlEventTouchUpInside)]; - [self.bgView addSubview:headerBtn]; - [headerBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.equalTo(self.headerImageView).offset(-2); - make.bottom.right.equalTo(self.headerImageView).offset(2); - }]; - - self.nameLabel = [[UILabel alloc] init]; - self.nameLabel.textColor = RGB16(0xDED6ED); - self.nameLabel.font = [UIFont systemFontOfSize:14]; - [self.bgView addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.headerImageView).offset(-3); - make.left.equalTo(self.headerImageView.mas_right).offset(8); - make.height.mas_equalTo(18); - }]; - +// self.headerImageView = [[UIImageView alloc] init]; +// self.headerImageView.contentMode = UIViewContentModeScaleAspectFill; +// self.headerImageView.backgroundColor = [UIColor whiteColor]; +// [self.headerImageView addRoundedCornersWithRadius:14]; +// [self.bgView addSubview:self.headerImageView]; +// +// [self.headerImageView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.mas_equalTo(16); +// make.top.mas_equalTo(19); +// make.size.mas_equalTo(CGSizeMake(28, 28)); +// }]; +// +// UIButton *headerBtn = [[UIButton alloc] init]; +// [headerBtn addTarget:self action:@selector(headerAction) forControlEvents:(UIControlEventTouchUpInside)]; +// [self.bgView addSubview:headerBtn]; +// [headerBtn mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.top.equalTo(self.headerImageView).offset(-2); +// make.bottom.right.equalTo(self.headerImageView).offset(2); +// }]; +// +// self.nameLabel = [[UILabel alloc] init]; +// self.nameLabel.textColor = RGB16(0xDED6ED); +// self.nameLabel.font = [UIFont systemFontOfSize:14]; +// [self.bgView addSubview:self.nameLabel]; +// [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { +// make.top.equalTo(self.headerImageView).offset(-3); +// make.left.equalTo(self.headerImageView.mas_right).offset(8); +// make.height.mas_equalTo(18); +// }]; +// self.titleLabel = [[UILabel alloc] init]; @@ -760,85 +761,95 @@ NSInteger maxMessageCount = 20; self.titleLabel.font = [UIFont systemFontOfSize:14]; self.titleLabel.numberOfLines = 0; [self.bgView addSubview:self.titleLabel]; +// [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.equalTo(self.nameLabel).offset(0); +// make.top.equalTo(self.headerImageView.mas_bottom).offset(13); +// make.right.mas_lessThanOrEqualTo(-18); +// }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.nameLabel).offset(0); - make.top.equalTo(self.headerImageView.mas_bottom).offset(13); - make.right.mas_lessThanOrEqualTo(-18); + make.left.equalTo(self.bgView).offset(8); + make.top.mas_equalTo(8); + make.bottom.mas_equalTo(-8); + make.right.mas_equalTo(-8); }]; + - - self.nameLabel.text = @"张三站撒旦撒大萨达撒"; +// self.nameLabel.text = @"张三站撒旦撒大萨达撒"; [self.contentView bringSubviewToFront:self.titleLabel]; - self.iconBgView = [[UIView alloc] init]; - [self.bgView addSubview:self.iconBgView]; - [self.iconBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.nameLabel); - make.width.mas_equalTo(UserIconWidth*2+6); - make.height.mas_equalTo(16); - make.top.equalTo(self.nameLabel.mas_bottom).offset(2); - }]; - - CGFloat iconWidth = UserIconWidth; - CGFloat iconHeight = UserIconHeight; - CGFloat margin = 6; - for (int i = 0; i < 3; i++) { - UIImageView *iconImageView = [[UIImageView alloc] init]; - iconImageView.hidden = YES; - iconImageView.contentMode = UIViewContentModeScaleAspectFit; - [self.iconBgView addSubview:iconImageView]; - [iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(i*(iconWidth+margin)); - make.width.mas_equalTo(iconWidth); - make.height.mas_equalTo(iconHeight); - make.centerY.equalTo(self.iconBgView); - }]; - [self.iconViewArray addObject:iconImageView]; - } +// self.iconBgView = [[UIView alloc] init]; +// [self.bgView addSubview:self.iconBgView]; +// [self.iconBgView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.equalTo(self.nameLabel); +// make.width.mas_equalTo(UserIconWidth*2+6); +// make.height.mas_equalTo(16); +// make.top.equalTo(self.nameLabel.mas_bottom).offset(2); +// }]; +// +// CGFloat iconWidth = UserIconWidth; +// CGFloat iconHeight = UserIconHeight; +// CGFloat margin = 6; +// for (int i = 0; i < 3; i++) { +// UIImageView *iconImageView = [[UIImageView alloc] init]; +// iconImageView.hidden = YES; +// iconImageView.contentMode = UIViewContentModeScaleAspectFit; +// [self.iconBgView addSubview:iconImageView]; +// [iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.mas_equalTo(i*(iconWidth+margin)); +// make.width.mas_equalTo(iconWidth); +// make.height.mas_equalTo(iconHeight); +// make.centerY.equalTo(self.iconBgView); +// }]; +// [self.iconViewArray addObject:iconImageView]; +// } } -(void)loadBubble{ - if ([self.message.FromUserInfo.chat_bubble isExist]) { - self.bubbleImageView.backgroundColor = UIColor.clearColor; -// self.bubbleImageView.image = [[UIImage imageNamed:@"chat_bubble2"] resizableImageWithCapInsets:UIEdgeInsetsMake(30, 40, 40, 40) resizingMode:(UIImageResizingModeStretch)];; - [self.bubbleImageView sd_setImageWithURL:[NSURL URLWithString:self.message.FromUserInfo.chat_bubble] placeholderImage:nil options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) { - image = [image resizableImageWithCapInsets:UIEdgeInsetsMake(40, 40, 40, 40) resizingMode:(UIImageResizingModeStretch)]; - self.bubbleImageView.image = image; - }]; - [self.bgView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(8); - make.right.mas_equalTo(0); - make.top.mas_equalTo(0); - make.bottom.mas_equalTo(0); - }]; - [self.headerImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.top.mas_equalTo(19); - }]; - }else{ - [self.bgView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(-8); - make.top.mas_equalTo(messageBubbleMargin); - make.bottom.mas_equalTo(-messageBubbleMargin); - }]; - [self.headerImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(9); - make.top.mas_equalTo(11); - }]; - self.bubbleImageView.image = nil; - self.bubbleImageView.backgroundColor = messageBubbleColor; - } -} --(NSMutableArray *)iconViewArray{ - if (!_iconViewArray) { - _iconViewArray = [NSMutableArray array]; - } - return _iconViewArray; +// if ([self.message.FromUserInfo.chat_bubble isExist]) { +// self.bubbleImageView.backgroundColor = UIColor.clearColor; +//// self.bubbleImageView.image = [[UIImage imageNamed:@"chat_bubble2"] resizableImageWithCapInsets:UIEdgeInsetsMake(30, 40, 40, 40) resizingMode:(UIImageResizingModeStretch)];; +// [self.bubbleImageView sd_setImageWithURL:[NSURL URLWithString:self.message.FromUserInfo.chat_bubble] placeholderImage:nil options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) { +// image = [image resizableImageWithCapInsets:UIEdgeInsetsMake(40, 40, 40, 40) resizingMode:(UIImageResizingModeStretch)]; +// self.bubbleImageView.image = image; +// }]; +// [self.bgView mas_updateConstraints:^(MASConstraintMaker *make) { +// make.left.mas_equalTo(8); +// make.right.mas_equalTo(0); +// make.top.mas_equalTo(0); +// make.bottom.mas_equalTo(0); +// }]; +// [self.titleLabel mas_updateConstraints:^(MASConstraintMaker *make) { +// make.left.mas_equalTo(16); +// make.top.mas_equalTo(16); +// make.bottom.mas_equalTo(-16); +// make.right.mas_equalTo(-16); +// }]; +// }else{ +// [self.bgView mas_updateConstraints:^(MASConstraintMaker *make) { +// make.left.mas_equalTo(16); +// make.right.mas_equalTo(-8); +// make.top.mas_equalTo(messageBubbleMargin); +// make.bottom.mas_equalTo(-messageBubbleMargin); +// }]; +// [self.titleLabel mas_updateConstraints:^(MASConstraintMaker *make) { +// make.left.mas_equalTo(8); +// make.top.mas_equalTo(8); +// make.bottom.mas_equalTo(-8); +// make.right.mas_equalTo(-8); +// }]; +// self.bubbleImageView.image = nil; +// self.bubbleImageView.backgroundColor = messageBubbleColor; +// } } +//-(NSMutableArray *)iconViewArray{ +// if (!_iconViewArray) { +// _iconViewArray = [NSMutableArray array]; +// } +// return _iconViewArray; +//} @end @@ -1103,6 +1114,9 @@ NSInteger maxMessageCount = 20; } } } + if (message.messageType == QXRoomChatMessageTypeNotice) { + [attr yy_setColor:messageNameColor range:NSMakeRange(0, attr.length)]; + } self.titleLabel.attributedText = attr; } diff --git a/QXLive/Room(房间)/View/点歌/QXRoomSongListSubView.m b/QXLive/Room(房间)/View/点歌/QXRoomSongListSubView.m index c8d1b71..5684077 100644 --- a/QXLive/Room(房间)/View/点歌/QXRoomSongListSubView.m +++ b/QXLive/Room(房间)/View/点歌/QXRoomSongListSubView.m @@ -161,10 +161,24 @@ } } + -(void)textDidChange:(UITextField*)textField{ + if ([self isMarkedText]) { + // 中文输入中，不回调 + QXLOG(@"中文输入中，不回调"); + return; + } + QXLOG(@"中文输入结束，回调"); + [[SDImageCache sharedImageCache] clearMemory]; + self.page = 0; [self getSongList]; } +- (BOOL)isMarkedText { + UITextRange *markedTextRange = self.textField.markedTextRange; + return markedTextRange && ![markedTextRange isEmpty]; +} + -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ return self.dataArray.count; } diff --git a/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayManager.h b/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayManager.h index 449a115..12fa538 100644 --- a/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayManager.h +++ b/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayManager.h @@ -18,6 +18,10 @@ - (void)setupDisplayViewInContainer:(UIView *)container; - (void)clearAll; + +- (void)inBackGround; + +- (void)becomeFront; @end diff --git a/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayManager.m b/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayManager.m index d39f4a1..fa50e05 100644 --- a/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayManager.m +++ b/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayManager.m @@ -18,6 +18,7 @@ @property (nonatomic, strong) NSMutableDictionary *accumulatedGifts; @property (nonatomic, strong) NSMutableDictionary *waitingUpdateGifts; // 等待更新的礼物 @property (nonatomic, assign) BOOL isProcessingQueue; // 防止重复处理队列 +@property (nonatomic, assign) BOOL isInBackground; // 防止重复处理队列 @end @@ -74,6 +75,9 @@ } - (void)receiveGift:(QXRoomChatListModel *)gift { + if (self.isInBackground) { + return; + } if (!gift) return; dispatch_async(dispatch_get_main_queue(), ^{ @@ -220,7 +224,20 @@ self.isProcessingQueue = NO; } +-(void)inBackGround{ + self.isInBackground = YES; + for (QXGiftDisplayView *view in self.displayViews) { + [view finishAnimationImmediately]; + } + [self.giftQueue removeAllObjects]; + [self.accumulatedGifts removeAllObjects]; + [self.waitingUpdateGifts removeAllObjects]; + self.isProcessingQueue = NO; +} +-(void)becomeFront{ + self.isInBackground = NO; +} // 调试方法 - (void)printDebugInfo { NSLog(@"=== 飘屏管理器状态 ==="); diff --git a/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayView.m b/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayView.m index b153aac..78e7056 100644 --- a/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayView.m +++ b/QXLive/Room(房间)/View/礼物特效/QXGiftDisplayView.m @@ -91,11 +91,14 @@ self.senderLabel.text = [NSString stringWithFormat:@"%@",gift.FromUserInfo.nickname?: @""]; // 更新礼物信息 - self.giftLabel.text = [NSString stringWithFormat:@"%@送给%@",gift.ToUserInfo.nickname?: @"", gift.GiftInfo.gift_name ?: @"礼物"]; + self.giftLabel.text = [NSString stringWithFormat:@"送给%@%@",gift.ToUserInfo.nickname?: @"", gift.GiftInfo.gift_name ?: @"礼物"]; // 更新礼物数量 - self.countLabel.text = [NSString stringWithFormat:@"x%@", gift.gift_num]; - + if (gift.gift_num.intValue>0) { + self.countLabel.text = [NSString stringWithFormat:@"x%@", gift.gift_num]; + }else{ + self.countLabel.text = @""; + } // 设置头像（这里可以使用SDWebImage等库加载网络图片） [self.avatarImageView sd_setImageWithURL:[NSURL URLWithString:gift.FromUserInfo.avatar]]; @@ -157,19 +160,23 @@ NSLog(@"更新礼物数量: %ld", (long)count); // 更新数量显示 - self.countLabel.text = [NSString stringWithFormat:@"x%ld", (long)count]; - - // 数量更新动画 - [UIView animateWithDuration:0.2 animations:^{ - self.countLabel.transform = CGAffineTransformMakeScale(1.5, 1.5); - } completion:^(BOOL finished) { + if (count>0) { + self.countLabel.text = [NSString stringWithFormat:@"x%ld", (long)count]; + // 数量更新动画 [UIView animateWithDuration:0.2 animations:^{ - self.countLabel.transform = CGAffineTransformIdentity; + self.countLabel.transform = CGAffineTransformMakeScale(1.5, 1.5); + } completion:^(BOOL finished) { + [UIView animateWithDuration:0.2 animations:^{ + self.countLabel.transform = CGAffineTransformIdentity; + }]; + + // 重置计时器 + [self resetHideTimer]; }]; - - // 重置计时器 - [self resetHideTimer]; - }]; + }else{ + self.countLabel.text = @""; + } + } - (void)startHideTimer { diff --git a/QXLive/Room(房间)/View/红包/QXRedBagSendView.m b/QXLive/Room(房间)/View/红包/QXRedBagSendView.m index 0860a89..03fc314 100644 --- a/QXLive/Room(房间)/View/红包/QXRedBagSendView.m +++ b/QXLive/Room(房间)/View/红包/QXRedBagSendView.m @@ -183,7 +183,7 @@ MJWeakSelf [QXMineNetwork getWalletInfoSuccessBlock:^(NSString * _Nonnull coin, NSString * _Nonnull earnings, NSString * _Nonnull title, NSString * _Nonnull url) { weakSelf.coin = coin; - weakSelf.earnings = coin; + weakSelf.earnings = earnings; weakSelf.moneyLabel.text = [NSString stringWithFormat:@"%@金币可用",self.coin]; } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { @@ -770,7 +770,7 @@ -(void)helpAction{ self.isFromRule = YES; - NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.baidu.com"]]; + NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@api/Page/page_show?id=25",ServerUrl]]]; [self.webView loadRequest:request]; self.backBtn.hidden = NO; self.helpBtn.hidden = YES; diff --git a/QXLive/Tabbar/QXTabbarController.m b/QXLive/Tabbar/QXTabbarController.m index 7f47e05..f26c587 100644 --- a/QXLive/Tabbar/QXTabbarController.m +++ b/QXLive/Tabbar/QXTabbarController.m @@ -66,7 +66,10 @@ QXLOG(@"视图即将展示"); [self getAppVersion]; } - +-(void)didReceiveMemoryWarning{ + [super didReceiveMemoryWarning]; + [[SDImageCache sharedImageCache] clearMemory]; +} -(void)getAppVersion{ MJWeakSelf [QXLoginNetwork getAppVersionSuccessBlock:^(QXAppVersionModel * _Nonnull model) { diff --git a/QXLive/Tools/COS/QXCOSUploadManager.m b/QXLive/Tools/COS/QXCOSUploadManager.m index 6492338..4c92f05 100644 --- a/QXLive/Tools/COS/QXCOSUploadManager.m +++ b/QXLive/Tools/COS/QXCOSUploadManager.m @@ -21,7 +21,7 @@ self = [super init]; if (self) { // 设置并发数4 - [QCloudHTTPSessionManager shareClient].customConcurrentCount = 4; + [QCloudHTTPSessionManager shareClient].customConcurrentCount = 1; // 设置自动上限8 [QCloudHTTPSessionManager shareClient].maxConcurrencyTask = 9; } @@ -176,15 +176,20 @@ // 监听上传结果 [put setFinishBlock:^(QCloudUploadObjectResult *result, NSError *error) { - if (!error) { - NSLog(@"upload object success!"); - } else { + if (error) { NSLog(@"upload object failed, error: %@" , error); + if (complete) { + complete([NSArray arrayWithArray:callBackNames] ,QXCOSUploadImageFailed); + } + return; + } else { + NSLog(@"upload object success!--i=%d",i); } NSString * fileUrl = result.location; [callBackNames addObject:fileUrl]; + NSLog(@"添加第%d个图片",i); if (isAsync) { - if (i == files.count-1) { + if (callBackNames.count == files.count) { NSLog(@"upload object finished!"); if (complete) { complete([NSArray arrayWithArray:callBackNames] ,QXCOSUploadImageSuccess);