diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index d84cc20..f6b5841 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -756,7 +756,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = QXLive/QXLive.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 8798G5VMH9; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -776,7 +776,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QXLive/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "羽声语音"; + INFOPLIST_KEY_CFBundleDisplayName = "秘地"; INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天"; @@ -791,7 +791,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.0; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -816,7 +816,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = QXLive/QXLive.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 8798G5VMH9; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -836,7 +836,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QXLive/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "羽声语音"; + INFOPLIST_KEY_CFBundleDisplayName = "秘地"; INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天"; @@ -851,7 +851,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.0; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1061,7 +1061,7 @@ DEVELOPMENT_TEAM = 8798G5VMH9; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QXLiveScreen/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "羽声"; + INFOPLIST_KEY_CFBundleDisplayName = "秘地"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1087,7 +1087,7 @@ DEVELOPMENT_TEAM = 8798G5VMH9; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QXLiveScreen/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "羽声"; + INFOPLIST_KEY_CFBundleDisplayName = "秘地"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1113,7 +1113,7 @@ DEVELOPMENT_TEAM = 8798G5VMH9; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "QXLiveScreen copy-Info.plist"; - INFOPLIST_KEY_CFBundleDisplayName = "羽声"; + INFOPLIST_KEY_CFBundleDisplayName = "秘地"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1139,7 +1139,7 @@ DEVELOPMENT_TEAM = 8798G5VMH9; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "QXLiveScreen copy-Info.plist"; - INFOPLIST_KEY_CFBundleDisplayName = "羽声"; + INFOPLIST_KEY_CFBundleDisplayName = "秘地"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1185,7 +1185,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QXLive/QXLiveDev.plist; - INFOPLIST_KEY_CFBundleDisplayName = "羽声测试"; + INFOPLIST_KEY_CFBundleDisplayName = "秘地测试"; INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天"; @@ -1200,7 +1200,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1245,7 +1245,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QXLive/QXLiveDev.plist; - INFOPLIST_KEY_CFBundleDisplayName = "羽声测试"; + INFOPLIST_KEY_CFBundleDisplayName = "秘地测试"; INFOPLIST_KEY_NSCameraUsageDescription = "访问您的相机，允许可以开启直播和录制视频"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "访问您的位置，系统将获取您附近的用户进行推荐展示"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "访问您的麦克风，允许可以录制声音以便在聊天室进行语音聊天"; @@ -1260,7 +1260,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate index 3fe0c91..d794cf7 100644 Binary files a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate and b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index e9c6d20..bec0772 100644 --- a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -16,22 +16,6 @@ stopOnStyle = "0"> - - - - diff --git a/QXLive/Base/QXAppStartViewController.m b/QXLive/Base/QXAppStartViewController.m index f07dda9..eae3f87 100644 --- a/QXLive/Base/QXAppStartViewController.m +++ b/QXLive/Base/QXAppStartViewController.m @@ -17,7 +17,7 @@ [super viewDidLoad]; // Do any additional setup after loading the view. self.bgImaegView = [[UIImageView alloc] initWithFrame:[UIScreen mainScreen].bounds]; - self.bgImaegView.image = [UIImage imageNamed:@"启动页"];; + self.bgImaegView.image = [UIImage imageNamed:@"app_start_midi"];; self.bgImaegView.contentMode = UIViewContentModeScaleAspectFill; [self.view addSubview:self.bgImaegView]; // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:noticeUserLogin object:nil]; diff --git a/QXLive/Config/QXConfig.m b/QXLive/Config/QXConfig.m index 33e5a7f..f08091f 100644 --- a/QXLive/Config/QXConfig.m +++ b/QXLive/Config/QXConfig.m @@ -22,8 +22,8 @@ config.backgroundImage = @"app_bg"; config.placehoulderTextColor = RGB16(0x9b9b9b); /// appstore - config.themeColor = RGB16(0x0dffb9); - config.btnTextColor = RGB16(0x333333); + config.themeColor = RGB16(0x6C49E4); + config.btnTextColor = RGB16(0xffffff); // config.themeColor = RGB16(0xFC7285); // config.btnTextColor = RGB16(0xFFFFFF); diff --git a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m index 5ed62ee..4b0ea7a 100644 --- a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m +++ b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m @@ -20,6 +20,7 @@ #import "QXFirstRechargePopView.h" #import "QXRechargeView.h" #import "QXAppstoreHomeView.h" +#import "QXConfig.h" @interface QXHomeViewController () @property (nonatomic, strong) JXPagerView *pagingView; @@ -60,32 +61,53 @@ } - (void)initSubViews{ - UILabel *tLabel = [[UILabel alloc] init]; - tLabel.text = QXText(@"羽声"); - tLabel.font = [UIFont boldSystemFontOfSize:20]; - [self.view addSubview:tLabel]; - [tLabel mas_makeConstraints:^(MASConstraintMaker *make) { +// UILabel *tLabel = [[UILabel alloc] init]; +// tLabel.text = QXText(@"秘地"); +// tLabel.font = [UIFont boldSystemFontOfSize:20]; +// [self.view addSubview:tLabel]; +// [tLabel mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.mas_equalTo(16); +// make.top.mas_equalTo(kSafeAreaTop +10); +// }]; + + + if ([QXConfig.backgroundImage hasPrefix:@"http"] || [QXConfig.backgroundImage hasPrefix:@"https"]) { + [self updateBgImage:QXConfig.backgroundImage]; + }else{ + [self updateBgImage:@"app_home_bg"]; + } + UIImageView *logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mi_di"]]; + [self.view addSubview:logoImageView]; + [logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(16); - make.top.mas_equalTo(kSafeAreaTop +10); + make.top.mas_equalTo(kSafeAreaTop +8); + make.width.mas_equalTo(66); + make.height.mas_equalTo(32); }]; + [self.view addSubview:self.rankRightBtn]; [self.view addSubview:self.searchRightBtn]; [self.view addSubview:self.roomBtn]; [self.roomBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(30); - make.centerY.equalTo(tLabel); + make.width.mas_equalTo(54); + make.height.mas_equalTo(26); + make.centerY.equalTo(logoImageView); make.right.equalTo(self.view).offset(-10); }]; - [self.searchRightBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.roomBtn.mas_left).offset(-10); - make.centerY.width.height.equalTo(self.roomBtn); - }]; + [self.rankRightBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.searchRightBtn.mas_left).offset(-10); + make.right.equalTo(self.roomBtn.mas_left).offset(-10); + make.centerY.equalTo(self.roomBtn); + make.width.height.mas_equalTo(32); + }]; + + [self.searchRightBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(self.rankRightBtn.mas_left).offset(-10); make.centerY.equalTo(self.roomBtn); make.width.height.mas_equalTo(30); }]; + self.listVCArray = [NSMutableArray array]; [self requestSlideToolData]; @@ -277,7 +299,7 @@ } - (CGSize)sizeForCellInCycleScrollView:(GKCycleScrollView *)cycleScrollView { - return CGSizeMake((SCREEN_WIDTH)/3, 113); + return CGSizeMake(180, 155); } - (void)cycleScrollView:(GKCycleScrollView *)cycleScrollView didSelectCellAtIndex:(NSInteger)index { @@ -371,28 +393,28 @@ _categoryView = [[JXCategoryTitleView alloc] init]; _categoryView.frame = CGRectMake(15, 0, SCREEN_WIDTH-30, 44); _categoryView.delegate = self; - _categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#333333"]; - _categoryView.titleColor = [UIColor colorWithHexString:@"#666666"]; + _categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#FFFFFF"]; + _categoryView.titleColor = RGB16A(0xF1ECFF, 0.45); _categoryView.cellWidth = JXCategoryViewAutomaticDimension; _categoryView.contentEdgeInsetLeft = 3; _categoryView.cellSpacing = 16; _categoryView.titleLabelZoomEnabled = YES; - _categoryView.titleFont = [UIFont boldSystemFontOfSize:13]; - _categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:18]; + _categoryView.titleFont = [UIFont boldSystemFontOfSize:16]; + _categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:20]; _categoryView.averageCellSpacingEnabled = NO; JXCategoryIndicatorImageView *indicatorView = [[JXCategoryIndicatorImageView alloc] init]; indicatorView.indicatorWidth = JXCategoryViewAutomaticDimension; indicatorView.indicatorImageView.image = [UIImage imageNamed:@"home_slider"]; - indicatorView.indicatorImageViewSize = CGSizeMake(29, 8); + indicatorView.indicatorImageViewSize = CGSizeMake(50, 28); self.indicatorView = indicatorView; - indicatorView.verticalMargin = 11; + indicatorView.verticalMargin = 5; _categoryView.indicators = @[indicatorView]; } return _categoryView; } -(UIView *)headerView{ if (!_headerView) { - _headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, self.cycleScrollView.height+self.bannerScrollView.height)]; + _headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, self.cycleScrollView.height+self.bannerScrollView.height+10)]; [_headerView addSubview:self.cycleScrollView]; [_headerView addSubview:self.bannerScrollView]; } @@ -400,7 +422,7 @@ } -(SDCycleScrollView *)bannerScrollView{ if (!_bannerScrollView) { - _bannerScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(16, self.cycleScrollView.bottom, SCREEN_WIDTH-32, ScaleWidth(95)) delegate:self placeholderImage:nil]; + _bannerScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(16, self.cycleScrollView.bottom+10, SCREEN_WIDTH-32, ScaleWidth(95)) delegate:self placeholderImage:nil]; _bannerScrollView.backgroundColor = [UIColor clearColor]; _bannerScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; [_bannerScrollView addRoundedCornersWithRadius:8] ; @@ -410,18 +432,20 @@ } -(GKCycleScrollView *)cycleScrollView{ if (!_cycleScrollView) { - _cycleScrollView = [[GKCycleScrollView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, ScaleWidth(113))]; + _cycleScrollView = [[GKCycleScrollView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 155)]; _cycleScrollView.dataSource = self; _cycleScrollView.delegate = self; _cycleScrollView.minimumCellAlpha = 0.0; _cycleScrollView.leftRightMargin = 16.0f; - _cycleScrollView.topBottomMargin = 10.0f; + _cycleScrollView.topBottomMargin = 15.0f; + _cycleScrollView.isInfiniteLoop = YES; + _cycleScrollView.isAutoScroll = YES; } return _cycleScrollView; } -(QXGiftScrollView *)giftScrollView{ if (!_giftScrollView) { - _giftScrollView = [[QXGiftScrollView alloc] initWithFrame:CGRectMake(16, self.cycleScrollView.bottom, SCREEN_WIDTH-32, 31)]; + _giftScrollView = [[QXGiftScrollView alloc] initWithFrame:CGRectMake(16, self.cycleScrollView.bottom, SCREEN_WIDTH-32, 36)]; _giftScrollView.delegate = self; } return _giftScrollView; diff --git a/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m b/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m index 5b29cde..ec53b11 100644 --- a/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m +++ b/QXLive/HomePage(声播)/View/房间/QXRoomChatListView.m @@ -141,7 +141,7 @@ NSInteger maxMessageCount = 20; -(void)insertNoitce{ QXRoomChatListModel *model = [QXRoomChatListModel new]; model.messageType = QXRoomChatMessageTypeSystem; - model.text = @"羽声严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。"; + model.text = @"秘地严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。"; [self.dataArray addObject:model]; [self.tableView reloadData]; [self scrollToBottom]; diff --git a/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.h b/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.h index 1acd671..e5e5a47 100644 --- a/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.h +++ b/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.h @@ -25,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN @interface QXGiftScrollViewCell : UICollectionViewCell @property (nonatomic,strong)UIImageView *noticeImageView; +@property (nonatomic,strong)UIImageView *bgImageView; @property (nonatomic,strong)MarqueeLabel *titleLabel; @property (nonatomic,strong)UIImageView *gotoRoomImageView; @property (nonatomic,strong)QXGiftScrollModel *model; diff --git a/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m b/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m index ddb3373..10ebdf5 100644 --- a/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m +++ b/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m @@ -25,9 +25,9 @@ static NSInteger maxCount = 5; } -(void)initSubViews{ - [self addRoundedCornersWithRadius:15.5]; - self.layer.borderWidth = 2; - self.layer.borderColor = RGB16(0x333333).CGColor; +// [self addRoundedCornersWithRadius:15.5]; +// self.layer.borderWidth = 2; +// self.layer.borderColor = RGB16(0x333333).CGColor; self.cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:self.bounds delegate:self placeholderImage:nil]; self.cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleNone; self.cycleScrollView.scrollDirection = UICollectionViewScrollDirectionVertical; @@ -83,35 +83,46 @@ static NSInteger maxCount = 5; } - (void)setModel:(QXGiftScrollModel *)model{ _model = model; - self.titleLabel.text = [NSString stringWithFormat:@"%@%@%@ %@X%@",model.fromUserName,QXText(@"送给了"),model.toUserName,model.giftName,model.number]; + NSString *giftInfo = [NSString stringWithFormat:@"%@%@%@ %@X%@",model.fromUserName,QXText(@"送给了"),model.toUserName,model.giftName,model.number]; + NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:giftInfo]; + [attr yy_setColor:RGB16A(0xffffff, 0.84) range:[giftInfo rangeOfString:QXText(@"送给了")]]; + self.titleLabel.attributedText = attr; } -(void)initSubViews{ + self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_gift_bg"]]; + [self.contentView addSubview:self.bgImageView]; + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.left.top.bottom.equalTo(self); + }]; self.gotoRoomImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_goto_room"]]; + self.gotoRoomImageView.contentMode = UIViewContentModeScaleAspectFit; [self.contentView addSubview:self.gotoRoomImageView]; [self.gotoRoomImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.bottom.equalTo(self); - make.width.mas_equalTo(85); - }]; - - - self.noticeImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_notice"]]; - [self.contentView addSubview:self.noticeImageView]; - [self.noticeImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self).offset(12); + make.right.mas_equalTo(-ScaleWidth(25)); make.centerY.equalTo(self); - make.size.mas_equalTo(CGSizeMake(24, 24)); + make.width.mas_equalTo(ScaleWidth(50)); + make.height.mas_equalTo(ScaleWidth(20)); }]; + +// self.noticeImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_notice"]]; +// [self.contentView addSubview:self.noticeImageView]; +// [self.noticeImageView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.equalTo(self).offset(12); +// make.centerY.equalTo(self); +// make.size.mas_equalTo(CGSizeMake(24, 24)); +// }]; + self.titleLabel = [[MarqueeLabel alloc] initWithFrame:CGRectZero]; self.titleLabel.scrollDuration = 2; self.titleLabel.marqueeType = MLLeftRight; - self.titleLabel.textColor = QXConfig.textColor; + self.titleLabel.textColor = QXConfig.themeColor; self.titleLabel.font = [UIFont systemFontOfSize:14]; [self.contentView addSubview:self.titleLabel]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.equalTo(self); - make.left.equalTo(self.noticeImageView.mas_right).offset(8); + make.left.mas_equalTo(ScaleWidth(52)); make.right.equalTo(self.gotoRoomImageView.mas_left).offset(-8); }]; } diff --git a/QXLive/HomePage(声播)/View/首页/QXHomeRoomCell.xib b/QXLive/HomePage(声播)/View/首页/QXHomeRoomCell.xib index 696e970..b0259b7 100644 --- a/QXLive/HomePage(声播)/View/首页/QXHomeRoomCell.xib +++ b/QXLive/HomePage(声播)/View/首页/QXHomeRoomCell.xib @@ -33,6 +33,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51,46 +76,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + @@ -120,28 +109,34 @@ + + - - - - + + + diff --git a/QXLive/HomePage(声播)/View/首页/QXHomeTopCell.h b/QXLive/HomePage(声播)/View/首页/QXHomeTopCell.h index 919fc3d..eef0368 100644 --- a/QXLive/HomePage(声播)/View/首页/QXHomeTopCell.h +++ b/QXLive/HomePage(声播)/View/首页/QXHomeTopCell.h @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)UIView *roomPeopleBgView; -@property (nonatomic,strong)UIImageView *roomPeopleBgImageView; +//@property (nonatomic,strong)UIImageView *roomPeopleBgImageView; @property (nonatomic,strong)UIImageView *firstHeaderImageView; @property (nonatomic,strong)UIImageView *secondHeaderImageView; @property (nonatomic,strong)UIImageView *thirdHeaderImageView; diff --git a/QXLive/HomePage(声播)/View/首页/QXHomeTopCell.m b/QXLive/HomePage(声播)/View/首页/QXHomeTopCell.m index 3e388e3..1776586 100644 --- a/QXLive/HomePage(声播)/View/首页/QXHomeTopCell.m +++ b/QXLive/HomePage(声播)/View/首页/QXHomeTopCell.m @@ -8,6 +8,8 @@ #import "QXHomeTopCell.h" @interface QXHomeTopCell() @property(nonatomic,strong)NSMutableArray *imgs; +@property(nonatomic,strong)UIImageView *peopleIconView; +// @end @implementation QXHomeTopCell @@ -27,14 +29,15 @@ [self addSubview:self.roomCoverImageView]; - self.disPlayMaskView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH/3, 91)]; + self.disPlayMaskView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 180, 40)]; [self.disPlayMaskView setTopToBottomGradientBackgroundWithColors:@[[UIColor colorWithHexString:@"#00000000"],[UIColor colorWithHexString:@"#00000096"]] frame:self.disPlayMaskView.bounds]; [self.disPlayMaskView addRoundedCornersWithRadius:7]; [self addSubview:self.disPlayMaskView]; self.titleLabel = [[UILabel alloc] init]; - self.titleLabel.textColor = RGB16(0x333333); + self.titleLabel.textColor = RGB16A(0xF1ECFF, 0.85); + self.titleLabel.textAlignment = NSTextAlignmentCenter; self.titleLabel.font = [UIFont systemFontOfSize:12]; [self addSubview:self.titleLabel]; @@ -51,9 +54,9 @@ self.roomPeopleBgView = [[UIView alloc] init]; [self.roomPeopleBgView addRoundedCornersWithRadius:7]; [self addSubview:self.roomPeopleBgView]; - self.roomPeopleBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_top_room_people_bg"]]; - self.roomPeopleBgImageView.contentMode = UIViewContentModeScaleToFill; - [self.roomPeopleBgView addSubview:self.roomPeopleBgImageView]; +// self.roomPeopleBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_top_room_people_bg"]]; +// self.roomPeopleBgImageView.contentMode = UIViewContentModeScaleToFill; +// [self.roomPeopleBgView addSubview:self.roomPeopleBgImageView]; self.firstHeaderImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_header_placehoulder"]]; self.firstHeaderImageView.backgroundColor = [UIColor whiteColor]; [self.firstHeaderImageView addRoundedCornersWithRadius:8]; @@ -76,12 +79,16 @@ self.countLabel.textColor = UIColor.whiteColor; [self.roomPeopleBgView addSubview:self.countLabel]; + self.peopleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"room_people"]]; + [self.roomPeopleBgView addSubview:self.peopleIconView]; + [self.roomCoverImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.top.right.equalTo(self); - make.height.mas_equalTo(91); + make.height.mas_equalTo(135); }]; [self.disPlayMaskView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.bottom.equalTo(self.roomCoverImageView); + make.left.right.bottom.equalTo(self.roomCoverImageView); + make.height.mas_equalTo(40); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.equalTo(self); @@ -96,34 +103,43 @@ make.centerX.centerY.equalTo(self.animateBgView); }]; [self.roomPeopleBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0); - make.size.mas_equalTo(CGSizeMake(93, 24)); - make.bottom.equalTo(self.roomCoverImageView.mas_bottom); + make.left.mas_equalTo(8); +// make.size.mas_equalTo(CGSizeMake(93, 24)); + make.height.mas_equalTo(24); + make.right.mas_equalTo(-8); + make.bottom.equalTo(self.roomCoverImageView.mas_bottom).offset(-8); }]; - [self.roomPeopleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.right.left.equalTo(self.roomPeopleBgView); - }]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-5); - make.width.mas_equalTo(32); - make.height.mas_equalTo(12); - make.centerY.equalTo(self.roomPeopleBgView); - }]; - [self.thirdHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) { +// [self.roomPeopleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.top.bottom.right.left.equalTo(self.roomPeopleBgView); +// }]; + [self.firstHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(16, 16)); - make.right.equalTo(self.countLabel.mas_left).offset(-5); - make.centerY.equalTo(self.roomPeopleBgView); + make.left.equalTo(self.roomPeopleBgView.mas_left); + make.bottom.equalTo(self.roomPeopleBgView); }]; [self.secondHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(16, 16)); - make.right.equalTo(self.thirdHeaderImageView.mas_left).offset(6); - make.centerY.equalTo(self.roomPeopleBgView); + make.left.equalTo(self.firstHeaderImageView.mas_right).offset(-6); + make.centerY.equalTo(self.firstHeaderImageView); }]; - [self.firstHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) { + [self.thirdHeaderImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(16, 16)); - make.right.equalTo(self.secondHeaderImageView.mas_left).offset(6); - make.centerY.equalTo(self.roomPeopleBgView); + make.left.equalTo(self.secondHeaderImageView.mas_right).offset(-6); + make.centerY.equalTo(self.firstHeaderImageView); }]; + [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(self.roomPeopleBgView); + make.width.mas_equalTo(32); + make.height.mas_equalTo(12); + make.centerY.equalTo(self.firstHeaderImageView); + }]; + [self.peopleIconView mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(self.countLabel.mas_left).offset(-2); + make.centerY.equalTo(self.firstHeaderImageView); + make.width.height.mas_equalTo(14); + }]; + + self.countLabel.text = @"23人"; } diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTopThreeView.xib b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTopThreeView.xib index 26c3a0a..6a6874c 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTopThreeView.xib +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTopThreeView.xib @@ -16,7 +16,7 @@ - + @@ -108,7 +108,7 @@ - + diff --git a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTypeView.m b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTypeView.m index d729f31..bfe555b 100644 --- a/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTypeView.m +++ b/QXLive/HomePage(声播)/View/首页/排行榜/QXRankTypeView.m @@ -100,7 +100,8 @@ { self = [super init]; if (self) { - [self setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)]; + [self setTitleColor:QXConfig.btnTextColor forState:(UIControlStateSelected)]; + [self setTitleColor:QXConfig.textColor forState:(UIControlStateNormal)]; self.titleLabel.font = [UIFont boldSystemFontOfSize:14]; self.backgroundColor = RGB16(0xF6F6F6); } diff --git a/QXLive/HomePage(声播)/View/首页/搜索/QXSearchCell.m b/QXLive/HomePage(声播)/View/首页/搜索/QXSearchCell.m index 3c39416..8fe0ab8 100644 --- a/QXLive/HomePage(声播)/View/首页/搜索/QXSearchCell.m +++ b/QXLive/HomePage(声播)/View/首页/搜索/QXSearchCell.m @@ -64,7 +64,7 @@ self.contentView.layer.masksToBounds = YES; self.contentView.layer.borderColor = [UIColor blackColor].CGColor; self.contentView.layer.borderWidth = 0; - _titleLabel.textColor = RGB16(0x006B4C); + _titleLabel.textColor = QXConfig.themeColor; } break; default: @@ -78,12 +78,12 @@ return; } if (userTag.isSelected) { - self.contentView.backgroundColor = RGB16(0xBBFFEB); + self.contentView.backgroundColor = RGB16A(0x6C49E4, 0.1); self.contentView.layer.cornerRadius = 11; self.contentView.layer.masksToBounds = YES; self.contentView.layer.borderColor = [UIColor blackColor].CGColor; self.contentView.layer.borderWidth = 0; - _titleLabel.textColor = RGB16(0x006B4C); + _titleLabel.textColor = QXConfig.themeColor; }else{ self.contentView.backgroundColor = RGB16(0xF3F3F3); self.contentView.layer.cornerRadius = 11; diff --git a/QXLive/HomePage(声播)/View/首页/搜索/QXSearchTopView.m b/QXLive/HomePage(声播)/View/首页/搜索/QXSearchTopView.m index e651618..c2e3a20 100644 --- a/QXLive/HomePage(声播)/View/首页/搜索/QXSearchTopView.m +++ b/QXLive/HomePage(声播)/View/首页/搜索/QXSearchTopView.m @@ -40,7 +40,7 @@ self.bgView.layer.borderColor = RGB16(0x333333).CGColor; [self addSubview:self.bgView]; - self.searchIcon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_search"]]; + self.searchIcon = [[UIImageView alloc] initWithImage:[[UIImage imageNamed:@"home_search"] imageByTintColor:RGB16(0x333333)]]; [self.bgView addSubview:self.searchIcon]; self.textField = [[UITextField alloc] init]; diff --git a/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.m b/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.m index e5b2b3c..ff5d3f1 100755 --- a/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.m +++ b/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.m @@ -82,17 +82,17 @@ } -(void)configLanguage{ - [self.comitUserInfoBtn setTitle:QXText(@"进入羽声") forState:(UIControlStateNormal)]; + [self.comitUserInfoBtn setTitle:QXText(@"进入秘地") forState:(UIControlStateNormal)]; [self.comitUserInfoBtn setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)]; self.comitUserInfoBtn.backgroundColor = QXConfig.themeColor; - self.nickTitleLabel.text = QXText(@"希望大家怎么称呼你"); + self.nickTitleLabel.text = QXText(@"起个好听的名字"); NSString *noChangeText = [NSString stringWithFormat:@"(%@)",QXText(@"注册成功，不可更改")]; NSString *str = [NSString stringWithFormat:@"%@%@",QXText(@"选择您的性别"),noChangeText]; NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:str]; [attr yy_setFont:[UIFont boldSystemFontOfSize:16] range:NSMakeRange(0, str.length)]; - [attr yy_setFont:[UIFont systemFontOfSize:12] range:[noChangeText rangeOfString:str]]; - [attr yy_setColor:RGB16(0x333333) range:NSMakeRange(0, str.length)]; - [attr yy_setColor:RGB16(0x666666) range:[noChangeText rangeOfString:str]]; + [attr yy_setFont:[UIFont systemFontOfSize:16] range:[noChangeText rangeOfString:str]]; + [attr yy_setColor:RGB16A(0x000000, 0.45) range:NSMakeRange(0, str.length)]; + [attr yy_setColor:RGB16A(0x000000, 0.45) range:[noChangeText rangeOfString:str]]; self.sexTitleLabel.attributedText = attr; self.birthdayTitleLabel.text = QXText(@"您的生日"); @@ -100,9 +100,9 @@ NSString *str1 = [NSString stringWithFormat:@"%@%@",QXText(@"邀请码"),noChangeText1]; NSMutableAttributedString *attr1 = [[NSMutableAttributedString alloc] initWithString:str1]; [attr1 yy_setFont:[UIFont boldSystemFontOfSize:16] range:NSMakeRange(0, str1.length)]; - [attr1 yy_setFont:[UIFont systemFontOfSize:12] range:[noChangeText1 rangeOfString:str1]]; - [attr1 yy_setColor:RGB16(0x333333) range:NSMakeRange(0, str1.length)]; - [attr1 yy_setColor:RGB16(0x666666) range:[noChangeText rangeOfString:str1]]; + [attr1 yy_setFont:[UIFont systemFontOfSize:16] range:[noChangeText1 rangeOfString:str1]]; + [attr1 yy_setColor:RGB16A(0x000000, 0.45) range:NSMakeRange(0, str1.length)]; + [attr1 yy_setColor:RGB16A(0x000000, 0.45) range:[noChangeText rangeOfString:str1]]; self.invitTitleLabel.attributedText = attr1; [self.randomBtn setTitle:QXText(@"随机") forState:(UIControlStateNormal)]; diff --git a/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib b/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib index 3312f4d..36b0d90 100755 --- a/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib +++ b/QXLive/Login(登录)/Controlller/QXFillUserInfoViewController.xib @@ -11,7 +11,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -40,16 +40,16 @@ - + - + @@ -60,7 +60,7 @@ + + + + + + + + - + - + - + + + - - - + + + + + - - + + + + - + - - + - @@ -371,26 +377,24 @@ - - - - + + - + @@ -401,7 +405,6 @@ - @@ -411,10 +414,13 @@ - - - - + + + + + + + diff --git a/QXLive/Login(登录)/Controlller/QXForgotPwdViewController.m b/QXLive/Login(登录)/Controlller/QXForgotPwdViewController.m index 4c95189..3dc77a9 100644 --- a/QXLive/Login(登录)/Controlller/QXForgotPwdViewController.m +++ b/QXLive/Login(登录)/Controlller/QXForgotPwdViewController.m @@ -16,6 +16,7 @@ @property (nonatomic,strong)UIButton *secondBtn; @property (nonatomic,strong)UIView *topView; +@property (nonatomic,strong)UIImageView *forgotImageView; @property (nonatomic,strong)UIScrollView *scrollView; @property (nonatomic,strong)QXLoginTextField *accountTextField; @property (nonatomic,strong)QXLoginTextField *codeTextField; @@ -83,28 +84,32 @@ // self.scrollView.scrollEnabled = NO; // self.scrollView.backgroundColor = [UIColor clearColor]; // [self.view addSubview:self.scrollView]; +// forgot_pwd + self.forgotImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"forgot_pwd"]]; + self.forgotImageView.frame = CGRectMake((SCREEN_WIDTH-128)/2, NavContentHeight+20, 128, 128); + [self.view addSubview:self.forgotImageView]; /// 获取验证码 - self.accountTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, NavContentHeight+15, SCREEN_WIDTH-32, 44) type:(LoginTextTypeAccount)]; - self.accountTextField.backgroundColor = RGB16(0xEFF2F8); - [self.accountTextField addRoundedCornersWithRadius:11]; + self.accountTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.forgotImageView.bottom+15, SCREEN_WIDTH-32, 44) type:(LoginTextTypeAccount)]; + self.accountTextField.backgroundColor = RGB16(0xECEAF4); + [self.accountTextField addRoundedCornersWithRadius:22]; [self.view addSubview:self.accountTextField]; self.codeTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(self.accountTextField.left, self.accountTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypeCode)]; - self.codeTextField.backgroundColor = RGB16(0xEFF2F8); + self.codeTextField.backgroundColor = RGB16(0xECEAF4); self.codeTextField.delegate = self; - [self.codeTextField addRoundedCornersWithRadius:11]; + [self.codeTextField addRoundedCornersWithRadius:22]; [self.view addSubview:self.codeTextField]; // 修改新密码 self.passwordTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(self.accountTextField.left, self.codeTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypePassword)]; - self.passwordTextField.backgroundColor = RGB16(0xEFF2F8); - [self.passwordTextField addRoundedCornersWithRadius:11]; + self.passwordTextField.backgroundColor = RGB16(0xECEAF4); + [self.passwordTextField addRoundedCornersWithRadius:22]; [self.view addSubview:self.passwordTextField]; self.repasswordTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(self.accountTextField.left, self.passwordTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypeRepassword)]; - self.repasswordTextField.backgroundColor = RGB16(0xEFF2F8); - [self.repasswordTextField addRoundedCornersWithRadius:11]; + self.repasswordTextField.backgroundColor = RGB16(0xECEAF4); + [self.repasswordTextField addRoundedCornersWithRadius:22]; [self.view addSubview:self.repasswordTextField]; // self.firstCommitBtn = [[UIButton alloc] initWithFrame:CGRectMake(38, self.codeTextField.bottom+20, SCREEN_WIDTH-38*2, 42)]; diff --git a/QXLive/Login(登录)/Controlller/QXLoginViewController.m b/QXLive/Login(登录)/Controlller/QXLoginViewController.m index a743d10..85c4894 100644 --- a/QXLive/Login(登录)/Controlller/QXLoginViewController.m +++ b/QXLive/Login(登录)/Controlller/QXLoginViewController.m @@ -69,21 +69,25 @@ } -(void)initSubViews{ - // self.logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@""]]; - // [self.view addSubview:self.logoImageView]; + self.backBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, kSafeAreaTop+5, 40, 40)]; [self.backBtn setImage:[UIImage imageNamed:@"back"] forState:(UIControlStateNormal)]; [self.backBtn addTarget:self action:@selector(backAction) forControlEvents:(UIControlEventTouchUpInside)]; [self.view addSubview:self.backBtn]; - self.isCodeLogin = YES; - self.welcomeLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, kSafeAreaTop+86, SCREEN_WIDTH-32, 36)]; - self.welcomeLabel.font = [UIFont boldSystemFontOfSize:24]; - self.welcomeLabel.text = QXText(@"欢迎来到羽声"); - self.welcomeLabel.textColor = QXConfig.textColor; - [self.view addSubview:self.welcomeLabel]; +// self.isCodeLogin = YES; +// self.welcomeLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, kSafeAreaTop+86, SCREEN_WIDTH-32, 36)]; +// self.welcomeLabel.font = [UIFont boldSystemFontOfSize:24]; +//// self.welcomeLabel.text = QXText(@"欢迎来到秘地"); +//// welcome_midi +// self.welcomeLabel.textColor = QXConfig.textColor; +// [self.view addSubview:self.welcomeLabel]; - self.subTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, self.welcomeLabel.bottom+20, SCREEN_WIDTH-32, 27)]; + self.logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"welcome_midi"]]; + self.logoImageView.frame = CGRectMake(16, NavContentHeight+19, 170, 120); + [self.view addSubview:self.logoImageView]; + + self.subTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, self.logoImageView.bottom+15, SCREEN_WIDTH-32, 27)]; self.subTitleLabel.font = [UIFont boldSystemFontOfSize:18]; self.subTitleLabel.text = QXText(@"验证码登录"); self.subTitleLabel.textColor = QXConfig.textColor; @@ -91,19 +95,19 @@ self.accountTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.subTitleLabel.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypeAccount)]; - self.accountTextField.backgroundColor = RGB16(0xEFF2F8); - [self.accountTextField addRoundedCornersWithRadius:11]; + self.accountTextField.backgroundColor = RGB16(0xF0EEF7); + [self.accountTextField addRoundedCornersWithRadius:22]; [self.view addSubview:self.accountTextField]; self.codeTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.accountTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypeCode)]; - self.codeTextField.backgroundColor = RGB16(0xEFF2F8); - [self.codeTextField addRoundedCornersWithRadius:11]; + self.codeTextField.backgroundColor = RGB16(0xF0EEF7); + [self.codeTextField addRoundedCornersWithRadius:22]; self.codeTextField.delegate = self; [self.view addSubview:self.codeTextField]; self.passwordTextField = [[QXLoginTextField alloc] initWithFrame:CGRectMake(16, self.accountTextField.bottom+16, SCREEN_WIDTH-32, 44) type:(LoginTextTypePassword)]; - self.passwordTextField.backgroundColor = RGB16(0xEFF2F8); - [self.passwordTextField addRoundedCornersWithRadius:11]; + self.passwordTextField.backgroundColor = RGB16(0xF0EEF7); + [self.passwordTextField addRoundedCornersWithRadius:22]; [self.view addSubview:self.passwordTextField]; self.passwordTextField.hidden = YES; @@ -244,33 +248,33 @@ model.preferredStatusBarStyle = UIStatusBarStyleDarkContent; model.logoImage = [UIImage imageNamed:@"login_logo"]; model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) { - frame.origin = CGPointMake((SCREEN_WIDTH - 240) * .5, 75 + kSafeAreaTop); - frame.size = CGSizeMake(240, 170); + frame.origin = CGPointMake((SCREEN_WIDTH - 88) * .5, 150+ kSafeAreaTop); + frame.size = CGSizeMake(88, 88); return frame; }; model.sloganText = [[NSAttributedString alloc] initWithString:@"本机号码" attributes:@{NSForegroundColorAttributeName : RGB16(0x666666),NSFontAttributeName : [UIFont systemFontOfSize:12]}]; model.sloganFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) { - frame.origin.y = 329+kSafeAreaTop+40; + frame.origin.y = 280+kSafeAreaTop+40; return frame; }; model.numberColor = QXConfig.textColor; model.numberFont = [UIFont boldSystemFontOfSize:30]; model.numberFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) { - frame.origin.y = kSafeAreaTop+329; + frame.origin.y = kSafeAreaTop+280; return frame; }; - model.loginBtnText = [[NSAttributedString alloc] initWithString:@"一键登录" attributes:@{NSForegroundColorAttributeName : QXConfig.textColor,NSFontAttributeName : [UIFont systemFontOfSize:15]}]; + model.loginBtnText = [[NSAttributedString alloc] initWithString:@"一键登录" attributes:@{NSForegroundColorAttributeName : QXConfig.btnTextColor,NSFontAttributeName : [UIFont systemFontOfSize:15]}]; model.loginBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) { - frame.origin.y = 427+kSafeAreaTop; + frame.origin.y = 380+kSafeAreaTop; frame.origin.x = 38; frame.size = CGSizeMake(SCREEN_WIDTH-76, 42); return frame; }; - model.loginBtnBgImgs = @[[UIImage imageNamed:@"login_btn_bg"],[UIImage imageNamed:@"login_btn_bg"],[UIImage imageNamed:@"login_btn_bg"]]; + model.loginBtnBgImgs = @[[[UIImage imageNamed:@"login_btn_bg"] imageByTintColor:QXConfig.themeColor],[[UIImage imageNamed:@"login_btn_bg"]imageByTintColor:QXConfig.themeColor],[[UIImage imageNamed:@"login_btn_bg"]imageByTintColor:QXConfig.themeColor]]; model.changeBtnTitle = [[NSAttributedString alloc] initWithString:@"其他手机号登录" attributes:@{NSForegroundColorAttributeName : QXConfig.textColor,NSFontAttributeName : [UIFont systemFontOfSize:15]}]; model.changeBtnFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) { - frame.origin.y = 427+kSafeAreaTop+12+42; + frame.origin.y = 380+kSafeAreaTop+12+42; frame.origin.x = 38; frame.size = CGSizeMake(SCREEN_WIDTH-76, 42); return frame; @@ -284,7 +288,7 @@ model.privacyTwo = @[[NSString stringWithFormat:@"%@",QXText(@"《隐私政策》")],[NSString stringWithFormat:@"%@%@?id=4",ServerUrl,QXAppProtocol]]; model.privacyOperatorPreText = @"《"; model.privacyOperatorSufText = @"》"; - model.privacyColors = @[RGB16(0x333333),RGB16(0xFF8ACC)]; + model.privacyColors = @[RGB16(0x333333),QXConfig.themeColor]; model.privacyAlignment = NSTextAlignmentCenter; diff --git a/QXLive/Login(登录)/View/QXLoginBottomView.m b/QXLive/Login(登录)/View/QXLoginBottomView.m index 8ec41cf..a41e8de 100644 --- a/QXLive/Login(登录)/View/QXLoginBottomView.m +++ b/QXLive/Login(登录)/View/QXLoginBottomView.m @@ -119,8 +119,8 @@ }]; [attr yy_setFont:[UIFont systemFontOfSize:12] range:NSMakeRange(0, str.length)]; [attr yy_setColor:RGB16(0x333333) range:NSMakeRange(0, str.length)]; - [attr yy_setColor:RGB16(0xFF8ACC) range:[str rangeOfString:QXText(@"《用户使用协议》")]]; - [attr yy_setColor:RGB16(0xFF8ACC) range:[str rangeOfString:QXText(@"《隐私政策》")]]; + [attr yy_setColor:QXConfig.themeColor range:[str rangeOfString:QXText(@"《用户使用协议》")]]; + [attr yy_setColor:QXConfig.themeColor range:[str rangeOfString:QXText(@"《隐私政策》")]]; _textLabel = [[YYLabel alloc] initWithFrame:CGRectMake(self.agreeBtn.right, 0, self.width-80-25, self.height)]; _textLabel.attributedText = attr; _textLabel.userInteractionEnabled = YES; diff --git a/QXLive/Login(登录)/View/QXLoginTextField.m b/QXLive/Login(登录)/View/QXLoginTextField.m index def88db..c965ddc 100644 --- a/QXLive/Login(登录)/View/QXLoginTextField.m +++ b/QXLive/Login(登录)/View/QXLoginTextField.m @@ -55,7 +55,7 @@ self.codeBtn = [[UIButton alloc] init]; self.codeBtn.needEventInterval = 0.5; [self.codeBtn setTitle:QXText(@"获取验证码") forState:(UIControlStateNormal)]; - [self.codeBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)]; + [self.codeBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)]; self.codeBtn.titleLabel.font = [UIFont systemFontOfSize:16]; [self.codeBtn addTarget:self action:@selector(codeAction:) forControlEvents:(UIControlEventTouchUpInside)]; self.codeBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentTrailing; diff --git a/QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m b/QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m index 0b5bbce..f0a21bc 100755 --- a/QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m +++ b/QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m @@ -330,7 +330,7 @@ if (!_roomNameLabel) { _roomNameLabel = [[UILabel alloc] init]; _roomNameLabel.font = [UIFont boldSystemFontOfSize:16]; - _roomNameLabel.textColor = QXConfig.textColor; + _roomNameLabel.textColor = RGB16A(0x000000, 0.45); _roomNameLabel.text = QXText(@"房间标题"); } return _roomNameLabel; @@ -340,7 +340,7 @@ _textFieldbgView = [[UIView alloc] init]; _textFieldbgView.layer.masksToBounds = YES; _textFieldbgView.layer.cornerRadius = 11; - _textFieldbgView.backgroundColor = [UIColor colorWithHexString:@"#EFF2F8"]; + _textFieldbgView.backgroundColor = [UIColor colorWithHexString:@"#F0EEF7"]; } return _textFieldbgView; } @@ -372,7 +372,7 @@ if (!_roomNoticeLabel) { _roomNoticeLabel = [[UILabel alloc] init]; _roomNoticeLabel.font = [UIFont boldSystemFontOfSize:15]; - _roomNoticeLabel.textColor = QXConfig.textColor; + _roomNoticeLabel.textColor = RGB16A(0x000000, 0.45); _roomNoticeLabel.text = QXText(@"房间公告"); } return _roomNoticeLabel; @@ -399,7 +399,7 @@ -(UIView *)noticeBgView{ if (!_noticeBgView) { _noticeBgView = [[UIView alloc] init]; - _noticeBgView.backgroundColor = RGB16(0xEFF2F8); + _noticeBgView.backgroundColor = RGB16(0xF0EEF7); [_noticeBgView addRoundedCornersWithRadius:11]; } return _noticeBgView; @@ -427,7 +427,7 @@ _randomBtn = [[UIButton alloc] init]; [_randomBtn setTitle:QXText(@"随机名称") forState:(UIControlStateNormal)]; _randomBtn.titleLabel.font = [UIFont systemFontOfSize:14]; - [_randomBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)]; + [_randomBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)]; [_randomBtn addTarget:self action:@selector(getRandomName) forControlEvents:UIControlEventTouchUpInside]; } return _randomBtn; @@ -437,7 +437,7 @@ _submitBtn = [[UIButton alloc] init]; [_submitBtn setTitle:QXText(@"提交审核") forState:UIControlStateNormal]; _submitBtn.titleLabel.font = [UIFont systemFontOfSize:15]; - [_submitBtn setTitleColor:QXConfig.textColor forState:UIControlStateNormal]; + [_submitBtn setTitleColor:QXConfig.btnTextColor forState:UIControlStateNormal]; _submitBtn.backgroundColor = QXConfig.themeColor; _submitBtn.layer.masksToBounds = YES; _submitBtn.layer.cornerRadius = 21; @@ -449,9 +449,9 @@ -(UILabel *)warningLabel{ if (!_warningLabel) { _warningLabel = [[UILabel alloc] init]; - _warningLabel.backgroundColor = RGB16(0x333333); - [_warningLabel addRoundedCornersWithRadius:3]; - _warningLabel.textColor = UIColor.whiteColor; +// _warningLabel.backgroundColor = RGB16(0x333333); +// [_warningLabel addRoundedCornersWithRadius:3]; + _warningLabel.textColor = RGB16(0xEEA24C); _warningLabel.font = [UIFont systemFontOfSize:11]; _warningLabel.textAlignment = NSTextAlignmentCenter; _warningLabel.text = QXText(@"创建房间需要审核，通过后可开启直播"); diff --git a/QXLive/Mine(音域)/Controller/每日任务/QXTaskViewController.m b/QXLive/Mine(音域)/Controller/每日任务/QXTaskViewController.m index 1fd2800..fbbcac9 100644 --- a/QXLive/Mine(音域)/Controller/每日任务/QXTaskViewController.m +++ b/QXLive/Mine(音域)/Controller/每日任务/QXTaskViewController.m @@ -34,14 +34,14 @@ self.navigationItem.title = QXText(@"每日任务"); UIButton*recordBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)]; [recordBtn setTitle:QXText(@"礼盒记录") forState:(UIControlStateNormal)]; - [recordBtn setTitleColor:RGB16(0xFF8ACC) forState:(UIControlStateNormal)]; + [recordBtn setTitleColor:QXConfig.themeColor forState:(UIControlStateNormal)]; recordBtn.titleLabel.font = [UIFont systemFontOfSize:16]; [recordBtn addTarget:self action:@selector(recordAction) forControlEvents:(UIControlEventTouchUpInside)]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:recordBtn]; } - (void)initSubViews{ self.bgImageHidden = YES; - self.view.backgroundColor = RGB16(0xF8E3C8); + self.view.backgroundColor = RGB16(0xD7CDFF); self.tableView.tableHeaderView = self.topView; [self.view addSubview:self.tableView]; } diff --git a/QXLive/Mine(音域)/Controller/设置/QXRealNameViewController.m b/QXLive/Mine(音域)/Controller/设置/QXRealNameViewController.m index 2d2dca0..6154ea1 100644 --- a/QXLive/Mine(音域)/Controller/设置/QXRealNameViewController.m +++ b/QXLive/Mine(音域)/Controller/设置/QXRealNameViewController.m @@ -111,6 +111,7 @@ self.realTextField = [[QXLoginTextField alloc] init]; self.realTextField.type = LoginTextTypeRealName; self.realTextField.backgroundColor = RGB16(0xEFF2F8); + [self.realTextField addRoundedCornersWithRadius:11]; [self.view addSubview:self.realTextField]; [self.realTextField mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(16); @@ -122,6 +123,7 @@ self.idNumberTextField = [[QXLoginTextField alloc] init]; self.idNumberTextField.type = LoginTextTypeIdNumber; self.idNumberTextField.backgroundColor = RGB16(0xEFF2F8); + [self.idNumberTextField addRoundedCornersWithRadius:11]; [self.view addSubview:self.idNumberTextField]; [self.idNumberTextField mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(16); @@ -257,7 +259,7 @@ weakSelf.realNamedict = dict; [weakSelf startFace]; } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { - + showToast(msg); }]; // [QXGlobal shareGlobal].isRealName = YES; diff --git a/QXLive/Mine(音域)/View/充值/QXRechargePriceCell.m b/QXLive/Mine(音域)/View/充值/QXRechargePriceCell.m index 6d3381c..4655ee8 100644 --- a/QXLive/Mine(音域)/View/充值/QXRechargePriceCell.m +++ b/QXLive/Mine(音域)/View/充值/QXRechargePriceCell.m @@ -37,7 +37,7 @@ - (void)awakeFromNib { [super awakeFromNib]; // Initialization code - self.bgView.layer.borderColor = RGB16(0x333333).CGColor; + self.bgView.layer.borderColor = QXConfig.themeColor.CGColor; } @end diff --git a/QXLive/Mine(音域)/View/我的房间/QXMyCpRoomListCell.m b/QXLive/Mine(音域)/View/我的房间/QXMyCpRoomListCell.m index f842c78..f0f36c7 100644 --- a/QXLive/Mine(音域)/View/我的房间/QXMyCpRoomListCell.m +++ b/QXLive/Mine(音域)/View/我的房间/QXMyCpRoomListCell.m @@ -15,6 +15,7 @@ // Initialization code self.roomDetailBtn.backgroundColor = QXConfig.themeColor; [self.roomDetailBtn setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)]; + self.moneyLabel.textColor = QXConfig.themeColor; } -(void)setType:(NSInteger)type{ _type = type; diff --git a/QXLive/Mine(音域)/View/我的房间/QXMyCpRoomListCell.xib b/QXLive/Mine(音域)/View/我的房间/QXMyCpRoomListCell.xib index 9f55701..ad5f2df 100644 --- a/QXLive/Mine(音域)/View/我的房间/QXMyCpRoomListCell.xib +++ b/QXLive/Mine(音域)/View/我的房间/QXMyCpRoomListCell.xib @@ -248,7 +248,7 @@ - + diff --git a/QXLive/Mine(音域)/View/我的房间/QXMyRoomListCell.m b/QXLive/Mine(音域)/View/我的房间/QXMyRoomListCell.m index 9d7ce51..a018e2d 100644 --- a/QXLive/Mine(音域)/View/我的房间/QXMyRoomListCell.m +++ b/QXLive/Mine(音域)/View/我的房间/QXMyRoomListCell.m @@ -20,8 +20,9 @@ self.roomDetailBtn.backgroundColor = QXConfig.themeColor; [self.roomDetailBtn setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)]; - [self.roomSubsidyBtn setTitleColor:UIColor.whiteColor forState:(UIControlStateNormal)]; - self.roomSubsidyBtn.backgroundColor = RGB16(0x333333); + [self.roomSubsidyBtn setTitleColor:RGB16(0xC58600) forState:(UIControlStateNormal)]; + self.roomSubsidyBtn.backgroundColor = RGB16A(0xDEB52E, 0.25); + self.moneyLabel.textColor = QXConfig.themeColor; } -(void)setBgImageCount:(NSInteger)bgImageCount{ _bgImageCount = bgImageCount; diff --git a/QXLive/Mine(音域)/View/每日任务/QXDayTaskCell.m b/QXLive/Mine(音域)/View/每日任务/QXDayTaskCell.m index d409cac..208f376 100644 --- a/QXLive/Mine(音域)/View/每日任务/QXDayTaskCell.m +++ b/QXLive/Mine(音域)/View/每日任务/QXDayTaskCell.m @@ -23,7 +23,7 @@ self.titleLabel.text = model.task_name; NSString*subTitle = [NSString stringWithFormat:@"金币+%@",model.gold_reward]; NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:subTitle]; - [attr yy_setColor:RGB16(0xE24171) range:[subTitle rangeOfString:[NSString stringWithFormat:@"+%@",model.gold_reward]]]; + [attr yy_setColor:RGB16(0xFF8827) range:[subTitle rangeOfString:[NSString stringWithFormat:@"+%@",model.gold_reward]]]; self.subTitleLabel.attributedText = attr; [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:model.icon]]; if (model.task_status.intValue == 1) { @@ -60,7 +60,8 @@ [super awakeFromNib]; // Initialization code [self.finishBtn addRoundedCornersWithRadius:15]; - self.finishBtn.layer.borderColor = RGB16(0xE24171).CGColor; + [self.finishBtn setTitleColor:RGB16(0xC134EE) forState:(UIControlStateNormal)]; + self.finishBtn.layer.borderColor = RGB16(0xC134EE).CGColor; self.finishBtn.layer.borderWidth = 1; } diff --git a/QXLive/Mine(音域)/View/编辑/QXUserInfoEditHeaderView.m b/QXLive/Mine(音域)/View/编辑/QXUserInfoEditHeaderView.m index 454d323..5822d6f 100644 --- a/QXLive/Mine(音域)/View/编辑/QXUserInfoEditHeaderView.m +++ b/QXLive/Mine(音域)/View/编辑/QXUserInfoEditHeaderView.m @@ -37,7 +37,7 @@ } -(void)initSubviews{ self.cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(0, 0, self.width, 169+kSafeAreaTop+16) delegate:self placeholderImage:nil]; - self.cycleScrollView.backgroundColor = QXConfig.themeColor; + self.cycleScrollView.backgroundColor = [UIColor clearColor]; self.cycleScrollView.imageURLStringsGroup = @[[QXGlobal shareGlobal].loginModel.avatar?[QXGlobal shareGlobal].loginModel.avatar:@""]; self.cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; [self addSubview:self.cycleScrollView]; diff --git a/QXLive/Mine(音域)/View/钱包/QXWalletTopView.m b/QXLive/Mine(音域)/View/钱包/QXWalletTopView.m index 932f9a6..ecce35c 100644 --- a/QXLive/Mine(音域)/View/钱包/QXWalletTopView.m +++ b/QXLive/Mine(音域)/View/钱包/QXWalletTopView.m @@ -33,7 +33,7 @@ self.titleLabel = [[UILabel alloc] init]; self.titleLabel.text = QXText(@"金币余额"); self.titleLabel.font = [UIFont boldSystemFontOfSize:16]; - self.titleLabel.textColor = QXConfig.textColor; + self.titleLabel.textColor = RGB16(0xffffff); [self addSubview:self.titleLabel]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.left.equalTo(self).offset(16); @@ -65,15 +65,18 @@ switch (type) { case QXWalletTopViewTypeRecharge:{ self.cornImageView.image = [UIImage imageNamed:@"wallet_corn"]; + self.topBgImageView.image = [UIImage imageNamed:@"wallet_top_bg"]; self.titleLabel.text = QXText(@"金币余额"); } break; case QXWalletTopViewTypeWithDraw:{ + self.topBgImageView.image = [UIImage imageNamed:@"wallet_top_bg1"]; self.cornImageView.image = [UIImage imageNamed:@"wallet_diamond"]; self.titleLabel.text = QXText(@"我的钻石"); } break; case QXWalletTopViewTypeDiamond:{ + self.topBgImageView.image = [UIImage imageNamed:@"wallet_top_bg1"]; self.cornImageView.image = [UIImage imageNamed:@"wallet_diamond"]; self.titleLabel.text = QXText(@"钻石余额"); } diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt.png index 7136001..2a3bf5c 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt@2x.png index 5763ec1..51d4582 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadNotification_20pt.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadNotification_20pt.png index 344dcc5..b409565 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadNotification_20pt.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadNotification_20pt.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadNotification_20pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadNotification_20pt@2x.png index f36b632..7d8f110 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadNotification_20pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadNotification_20pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadProApp_83.5pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadProApp_83.5pt@2x.png index 795fa4d..95a131c 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadProApp_83.5pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadProApp_83.5pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight5_29pt.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight5_29pt.png index 1c5ec2e..80a9f21 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight5_29pt.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight5_29pt.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight5_29pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight5_29pt@2x.png index a95db5d..75a26b5 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight5_29pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight5_29pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight7_40pt.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight7_40pt.png index f36b632..7d8f110 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight7_40pt.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight7_40pt.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight7_40pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight7_40pt@2x.png index 34dacdc..89b3270 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight7_40pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadSpootlight7_40pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneApp_60pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneApp_60pt@2x.png index 913e53d..836a033 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneApp_60pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneApp_60pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneApp_60pt@3x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneApp_60pt@3x.png index e3787cd..97b45b7 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneApp_60pt@3x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneApp_60pt@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneNotification_20pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneNotification_20pt@2x.png index f36b632..7d8f110 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneNotification_20pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneNotification_20pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneNotification_20pt@3x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneNotification_20pt@3x.png index d32ca1a..a39dafa 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneNotification_20pt@3x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneNotification_20pt@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight5_29pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight5_29pt@2x.png index a95db5d..75a26b5 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight5_29pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight5_29pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight5_29pt@3x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight5_29pt@3x.png index 7d9495d..0449268 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight5_29pt@3x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight5_29pt@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight7_40pt@2x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight7_40pt@2x.png index 34dacdc..89b3270 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight7_40pt@2x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight7_40pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight7_40pt@3x.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight7_40pt@3x.png index 913e53d..836a033 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight7_40pt@3x.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPhoneSpootlight7_40pt@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/store_1024pt.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/store_1024pt.png index f71f0c3..01ea4e4 100644 Binary files a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/store_1024pt.png and b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/store_1024pt.png differ diff --git a/QXLive/Other/Assets.xcassets/app_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_bg.imageset/Contents.json index cc8c379..8be6582 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" : "Group 7242@2x.png", + "filename" : "背景2@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/app_bg.imageset/Group 7242@2x.png b/QXLive/Other/Assets.xcassets/app_bg.imageset/Group 7242@2x.png deleted file mode 100644 index 228c1c7..0000000 Binary files a/QXLive/Other/Assets.xcassets/app_bg.imageset/Group 7242@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/app_bg.imageset/背景2@2x.png b/QXLive/Other/Assets.xcassets/app_bg.imageset/背景2@2x.png new file mode 100644 index 0000000..3d34e8b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_bg.imageset/背景2@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/启动页.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json similarity index 86% rename from QXLive/Other/Assets.xcassets/启动页.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json index 111ee58..ecbb49a 100644 --- a/QXLive/Other/Assets.xcassets/启动页.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "启动页.png", + "filename" : "app_home_bg@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 new file mode 100644 index 0000000..5deca85 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_start_midi.imageset/Contents.json similarity index 79% rename from QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/app_start_midi.imageset/Contents.json index 5c4d3b1..b1211d1 100644 --- a/QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/app_start_midi.imageset/Contents.json @@ -5,12 +5,11 @@ "scale" : "1x" }, { - "filename" : "Frame@2x.png", + "filename" : "app_start_midi@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/app_start_midi.imageset/app_start_midi@2x.png b/QXLive/Other/Assets.xcassets/app_start_midi.imageset/app_start_midi@2x.png new file mode 100644 index 0000000..824b468 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_start_midi.imageset/app_start_midi@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/dynamic/dynamic_topic_tag.imageset/Group 6930@2x.png b/QXLive/Other/Assets.xcassets/dynamic/dynamic_topic_tag.imageset/Group 6930@2x.png index d76e602..23983bc 100644 Binary files a/QXLive/Other/Assets.xcassets/dynamic/dynamic_topic_tag.imageset/Group 6930@2x.png and b/QXLive/Other/Assets.xcassets/dynamic/dynamic_topic_tag.imageset/Group 6930@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/dynamic/dynamic_topic_tag.imageset/Group 6930@3x.png b/QXLive/Other/Assets.xcassets/dynamic/dynamic_topic_tag.imageset/Group 6930@3x.png index 53faef9..da179a6 100644 Binary files a/QXLive/Other/Assets.xcassets/dynamic/dynamic_topic_tag.imageset/Group 6930@3x.png and b/QXLive/Other/Assets.xcassets/dynamic/dynamic_topic_tag.imageset/Group 6930@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/Contents.json similarity index 76% rename from QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/Contents.json index 2d8dfd6..91c2eb2 100644 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 1758@2x.png", + "filename" : "home_gift_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 1758@3x.png", + "filename" : "home_gift_bg@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@2x.png b/QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@2x.png new file mode 100644 index 0000000..08e9ed7 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@3x.png b/QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@3x.png new file mode 100644 index 0000000..54ad178 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_gift_bg.imageset/home_gift_bg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Contents.json index 4de36dd..3884a50 100644 --- a/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 12@2x.png", + "filename" : "去围观@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 12@3x.png", + "filename" : "去围观@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Frame 12@2x.png b/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Frame 12@2x.png deleted file mode 100644 index cc0e515..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Frame 12@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Frame 12@3x.png b/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Frame 12@3x.png deleted file mode 100644 index 5d75f21..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/Frame 12@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@2x.png b/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@2x.png new file mode 100644 index 0000000..339853d Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@3x.png b/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@3x.png new file mode 100644 index 0000000..72f3c6a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_goto_room.imageset/去围观@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Contents.json index 51df604..6bfdd3f 100644 --- a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 6871@2x.png", + "filename" : "排行榜@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 6871@3x.png", + "filename" : "排行榜@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 6871@2x.png b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 6871@2x.png deleted file mode 100644 index acc3167..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 6871@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 6871@3x.png b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 6871@3x.png deleted file mode 100644 index e4da859..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 6871@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@2x.png b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@2x.png new file mode 100644 index 0000000..f2c9561 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@3x.png b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@3x.png new file mode 100644 index 0000000..6d18f6a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_room.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_room.imageset/Contents.json index c494cb4..748c407 100644 --- a/QXLive/Other/Assets.xcassets/home/home_room.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_room.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "组 775@2x.png", + "filename" : "编组 4@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "组 775@3x.png", + "filename" : "编组 4@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_room.imageset/组 775@2x.png b/QXLive/Other/Assets.xcassets/home/home_room.imageset/组 775@2x.png deleted file mode 100644 index bf924ef..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_room.imageset/组 775@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_room.imageset/组 775@3x.png b/QXLive/Other/Assets.xcassets/home/home_room.imageset/组 775@3x.png deleted file mode 100644 index 07da44a..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_room.imageset/组 775@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@2x.png b/QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@2x.png new file mode 100644 index 0000000..e2452db Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@3x.png b/QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@3x.png new file mode 100644 index 0000000..cf9dbfb Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_search.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_search.imageset/Contents.json index a1ca523..15e4379 100644 --- a/QXLive/Other/Assets.xcassets/home/home_search.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_search.imageset/Contents.json @@ -5,11 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 25@2x.png", + "filename" : "搜索@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "搜索@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_search.imageset/Group 25@2x.png b/QXLive/Other/Assets.xcassets/home/home_search.imageset/Group 25@2x.png deleted file mode 100644 index 890b200..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_search.imageset/Group 25@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@2x.png b/QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@2x.png new file mode 100644 index 0000000..aa329ed Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@3x.png b/QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@3x.png new file mode 100644 index 0000000..4e7db5b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Contents.json index 0e12d37..885d628 100644 --- a/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 69@2x.png", + "filename" : "推荐底图@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 69@3x.png", + "filename" : "推荐底图@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Rectangle 69@2x.png b/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Rectangle 69@2x.png deleted file mode 100644 index bfd6e61..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Rectangle 69@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Rectangle 69@3x.png b/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Rectangle 69@3x.png deleted file mode 100644 index 996a778..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_slider.imageset/Rectangle 69@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@2x.png b/QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@2x.png new file mode 100644 index 0000000..17b50ff Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@3x.png b/QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@3x.png new file mode 100644 index 0000000..479197e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_slider.imageset/推荐底图@3x.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 756c7e3..4703c95 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" : "my_rank_bg@2x.png", + "filename" : "Rectangle 448@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "my_rank_bg@3x.png", + "filename" : "Rectangle 448@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 new file mode 100644 index 0000000..ae6615e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@2x.png 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 new file mode 100644 index 0000000..5c724b7 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Rectangle 448@3x.png 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 deleted file mode 100644 index 3187dc8..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/my_rank_bg@2x.png and /dev/null 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 deleted file mode 100644 index fc3364c..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/my_rank_bg@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Frame 1@2x(1).png b/QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Frame 1@2x(1).png deleted file mode 100644 index 82b6d08..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Frame 1@2x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Frame 1@3x(1).png b/QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Frame 1@3x(1).png deleted file mode 100644 index 91460a4..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Frame 1@3x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Frame 1@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Frame 1@2x.png deleted file mode 100644 index 443b772..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Frame 1@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Frame 1@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Frame 1@3x.png deleted file mode 100644 index 0b6f09c..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Frame 1@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Contents.json deleted file mode 100644 index 2601f8f..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316067@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316067@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Frame 1321316067@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Frame 1321316067@2x.png deleted file mode 100644 index 5b14dc6..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Frame 1321316067@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Frame 1321316067@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Frame 1321316067@3x.png deleted file mode 100644 index 7727ee3..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316067.imageset/Frame 1321316067@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Contents.json deleted file mode 100644 index e5c0633..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316069@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316069@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Frame 1321316069@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Frame 1321316069@2x.png deleted file mode 100644 index 8afe83f..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Frame 1321316069@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Frame 1321316069@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Frame 1321316069@3x.png deleted file mode 100644 index 62bee84..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316069.imageset/Frame 1321316069@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Contents.json deleted file mode 100644 index 9fa3387..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316107@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316107@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Frame 1321316107@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Frame 1321316107@2x.png deleted file mode 100644 index f9a44c9..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Frame 1321316107@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Frame 1321316107@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Frame 1321316107@3x.png deleted file mode 100644 index 19d3227..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316107.imageset/Frame 1321316107@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Contents.json deleted file mode 100644 index b7cc407..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316108@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316108@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Frame 1321316108@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Frame 1321316108@2x.png deleted file mode 100644 index 22ef99d..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Frame 1321316108@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Frame 1321316108@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Frame 1321316108@3x.png deleted file mode 100644 index d632715..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316108.imageset/Frame 1321316108@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Contents.json deleted file mode 100644 index 330549c..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316149@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316149@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Frame 1321316149@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Frame 1321316149@2x.png deleted file mode 100644 index 8b1e29e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Frame 1321316149@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Frame 1321316149@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Frame 1321316149@3x.png deleted file mode 100644 index 672f097..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316149.imageset/Frame 1321316149@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Contents.json deleted file mode 100644 index eddc4bd..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316150@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316150@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Frame 1321316150@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Frame 1321316150@2x.png deleted file mode 100644 index 190c8bc..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Frame 1321316150@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Frame 1321316150@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Frame 1321316150@3x.png deleted file mode 100644 index a8cdc19..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316150.imageset/Frame 1321316150@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Contents.json deleted file mode 100644 index 0453cfc..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316153@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316153@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Frame 1321316153@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Frame 1321316153@2x.png deleted file mode 100644 index 8dd3682..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Frame 1321316153@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Frame 1321316153@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Frame 1321316153@3x.png deleted file mode 100644 index 0eca7e2..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316153.imageset/Frame 1321316153@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Contents.json deleted file mode 100644 index ba949dd..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316154@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316154@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Frame 1321316154@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Frame 1321316154@2x.png deleted file mode 100644 index ddddf93..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Frame 1321316154@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Frame 1321316154@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Frame 1321316154@3x.png deleted file mode 100644 index 6652bd4..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316154.imageset/Frame 1321316154@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Contents.json deleted file mode 100644 index fa3208b..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316155@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316155@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Frame 1321316155@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Frame 1321316155@2x.png deleted file mode 100644 index 998cd59..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Frame 1321316155@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Frame 1321316155@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Frame 1321316155@3x.png deleted file mode 100644 index 638a9a5..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316155.imageset/Frame 1321316155@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Contents.json deleted file mode 100644 index c35bd8e..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316156@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316156@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Frame 1321316156@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Frame 1321316156@2x.png deleted file mode 100644 index 12c74a5..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Frame 1321316156@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Frame 1321316156@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Frame 1321316156@3x.png deleted file mode 100644 index cdc7b40..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316156.imageset/Frame 1321316156@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Contents.json deleted file mode 100644 index def9492..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316157@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316157@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Frame 1321316157@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Frame 1321316157@2x.png deleted file mode 100644 index c6c84d0..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Frame 1321316157@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Frame 1321316157@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Frame 1321316157@3x.png deleted file mode 100644 index 998afb8..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316157.imageset/Frame 1321316157@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Contents.json deleted file mode 100644 index 1eee9e4..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316167@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316167@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Frame 1321316167@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Frame 1321316167@2x.png deleted file mode 100644 index b6abb5f..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Frame 1321316167@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Frame 1321316167@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Frame 1321316167@3x.png deleted file mode 100644 index ab0af84..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316167.imageset/Frame 1321316167@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Contents.json deleted file mode 100644 index fee0e47..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316168@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316168@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Frame 1321316168@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Frame 1321316168@2x.png deleted file mode 100644 index a3bf40a..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Frame 1321316168@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Frame 1321316168@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Frame 1321316168@3x.png deleted file mode 100644 index 8c59a12..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316168.imageset/Frame 1321316168@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Contents.json deleted file mode 100644 index dc9db30..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316169@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316169@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Frame 1321316169@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Frame 1321316169@2x.png deleted file mode 100644 index 2b3b9a3..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Frame 1321316169@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Frame 1321316169@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Frame 1321316169@3x.png deleted file mode 100644 index d1da547..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316169.imageset/Frame 1321316169@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Contents.json deleted file mode 100644 index 189a536..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316170@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316170@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Frame 1321316170@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Frame 1321316170@2x.png deleted file mode 100644 index ec1389e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Frame 1321316170@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Frame 1321316170@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Frame 1321316170@3x.png deleted file mode 100644 index ec1b5bf..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316170.imageset/Frame 1321316170@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Contents.json deleted file mode 100644 index dd256d0..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316173@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316173@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Frame 1321316173@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Frame 1321316173@2x.png deleted file mode 100644 index 5e375ed..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Frame 1321316173@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Frame 1321316173@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Frame 1321316173@3x.png deleted file mode 100644 index 60bc1b4..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316173.imageset/Frame 1321316173@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Contents.json deleted file mode 100644 index f5f83a9..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316174@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316174@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Frame 1321316174@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Frame 1321316174@2x.png deleted file mode 100644 index c2e466b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Frame 1321316174@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Frame 1321316174@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Frame 1321316174@3x.png deleted file mode 100644 index e109778..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316174.imageset/Frame 1321316174@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Contents.json deleted file mode 100644 index 2ec7cb2..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1321316175@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1321316175@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Frame 1321316175@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Frame 1321316175@2x.png deleted file mode 100644 index 028f4c3..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Frame 1321316175@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Frame 1321316175@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Frame 1321316175@3x.png deleted file mode 100644 index 3a04d96..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1321316175.imageset/Frame 1321316175@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Frame 1589@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Frame 1589@2x.png deleted file mode 100644 index 2b8e2c5..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Frame 1589@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Frame 1589@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Frame 1589@3x.png deleted file mode 100644 index 09e1f4d..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Frame 1589@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Frame 1758@2x(1).png b/QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Frame 1758@2x(1).png deleted file mode 100644 index 566e234..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Frame 1758@2x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Frame 1758@3x(1).png b/QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Frame 1758@3x(1).png deleted file mode 100644 index 5583891..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Frame 1758@3x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Contents.json deleted file mode 100644 index e24eebd..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 1758@2x(2).png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 1758@3x(2).png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Frame 1758@2x(2).png b/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Frame 1758@2x(2).png deleted file mode 100644 index cde5c85..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Frame 1758@2x(2).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Frame 1758@3x(2).png b/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Frame 1758@3x(2).png deleted file mode 100644 index a31fa46..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(2).imageset/Frame 1758@3x(2).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Frame 1758@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Frame 1758@2x.png deleted file mode 100644 index 1adf8b8..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Frame 1758@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Frame 1758@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Frame 1758@3x.png deleted file mode 100644 index e379ad4..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 1758.imageset/Frame 1758@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Contents.json deleted file mode 100644 index 112332d..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 453@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 453@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Frame 453@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Frame 453@2x.png deleted file mode 100644 index 693fbe1..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Frame 453@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Frame 453@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Frame 453@3x.png deleted file mode 100644 index 9ba0652..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 453.imageset/Frame 453@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Contents.json deleted file mode 100644 index a5a4892..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 454@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 454@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Frame 454@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Frame 454@2x.png deleted file mode 100644 index 9337d26..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Frame 454@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Frame 454@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Frame 454@3x.png deleted file mode 100644 index 76c3700..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 454.imageset/Frame 454@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Contents.json deleted file mode 100644 index 152fe00..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 455@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 455@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Frame 455@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Frame 455@2x.png deleted file mode 100644 index ff2c19e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Frame 455@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Frame 455@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Frame 455@3x.png deleted file mode 100644 index 9056988..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 455.imageset/Frame 455@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Contents.json deleted file mode 100644 index cb95fad..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 456@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 456@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Frame 456@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Frame 456@2x.png deleted file mode 100644 index 998cd59..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Frame 456@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Frame 456@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Frame 456@3x.png deleted file mode 100644 index 638a9a5..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 456.imageset/Frame 456@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Contents.json deleted file mode 100644 index 617d1fe..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 8@2x(1).png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 8@3x(1).png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Frame 8@2x(1).png b/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Frame 8@2x(1).png deleted file mode 100644 index e9e087b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Frame 8@2x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Frame 8@3x(1).png b/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Frame 8@3x(1).png deleted file mode 100644 index b950f49..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 8(1).imageset/Frame 8@3x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Contents.json deleted file mode 100644 index 8730272..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 8@2x(2).png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 8@3x(2).png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Frame 8@2x(2).png b/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Frame 8@2x(2).png deleted file mode 100644 index 9a02337..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Frame 8@2x(2).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Frame 8@3x(2).png b/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Frame 8@3x(2).png deleted file mode 100644 index 4413458..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 8(2).imageset/Frame 8@3x(2).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Frame 8@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Frame 8@2x.png deleted file mode 100644 index 3aaa1bc..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Frame 8@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Frame 8@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Frame 8@3x.png deleted file mode 100644 index 640389b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Frame 8@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Contents.json deleted file mode 100644 index 866db75..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 841@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 841@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Frame 841@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Frame 841@2x.png deleted file mode 100644 index 6f58430..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Frame 841@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Frame 841@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Frame 841@3x.png deleted file mode 100644 index 8fe7174..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 841.imageset/Frame 841@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Contents.json deleted file mode 100644 index 0111df0..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame 943@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame 943@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Frame 943@2x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Frame 943@2x.png deleted file mode 100644 index 1215065..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Frame 943@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Frame 943@3x.png b/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Frame 943@3x.png deleted file mode 100644 index 2df4c69..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame 943.imageset/Frame 943@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Contents.json deleted file mode 100644 index 6a84000..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x(5).png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x(5).png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Frame@2x(5).png b/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Frame@2x(5).png deleted file mode 100644 index 686443e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Frame@2x(5).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Frame@3x(5).png b/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Frame@3x(5).png deleted file mode 100644 index 6f02d34..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame(5).imageset/Frame@3x(5).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Contents.json deleted file mode 100644 index ff1a4d5..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x(9).png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x(9).png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Frame@2x(9).png b/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Frame@2x(9).png deleted file mode 100644 index 00a9991..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Frame@2x(9).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Frame@3x(9).png b/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Frame@3x(9).png deleted file mode 100644 index 22f8b5e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Frame(9).imageset/Frame@3x(9).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Contents.json deleted file mode 100644 index a76d7be..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 6916@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 6916@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Group 6916@2x.png b/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Group 6916@2x.png deleted file mode 100644 index b9ffa1b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Group 6916@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Group 6916@3x.png b/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Group 6916@3x.png deleted file mode 100644 index f86fc4b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Group 6916.imageset/Group 6916@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Contents.json deleted file mode 100644 index 7587970..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 7085@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 7085@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Group 7085@2x.png b/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Group 7085@2x.png deleted file mode 100644 index 77e8b9b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Group 7085@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Group 7085@3x.png b/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Group 7085@3x.png deleted file mode 100644 index 79c9d25..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Group 7085.imageset/Group 7085@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Contents.json deleted file mode 100644 index 4627818..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 7282@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 7282@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Group 7282@2x.png b/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Group 7282@2x.png deleted file mode 100644 index 955086e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Group 7282@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Group 7282@3x.png b/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Group 7282@3x.png deleted file mode 100644 index 6541472..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Group 7282.imageset/Group 7282@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Contents.json deleted file mode 100644 index e367ae6..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Mask group 3@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Mask group 3@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Mask group 3@2x.png b/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Mask group 3@2x.png deleted file mode 100644 index cd4ebf7..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Mask group 3@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Mask group 3@3x.png b/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Mask group 3@3x.png deleted file mode 100644 index 61d4112..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Mask group 3.imageset/Mask group 3@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Contents.json deleted file mode 100644 index e60929a..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Mask group@2x(4).png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Mask group@3x(4).png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Mask group@2x(4).png b/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Mask group@2x(4).png deleted file mode 100644 index 4c5705d..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Mask group@2x(4).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Mask group@3x(4).png b/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Mask group@3x(4).png deleted file mode 100644 index 087d857..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Mask group(4).imageset/Mask group@3x(4).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Contents.json deleted file mode 100644 index c18bc02..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Mask group@2x(5).png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Mask group@3x(5).png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Mask group@2x(5).png b/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Mask group@2x(5).png deleted file mode 100644 index 47a1f1b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Mask group@2x(5).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Mask group@3x(5).png b/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Mask group@3x(5).png deleted file mode 100644 index e4fc89c..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Mask group(5).imageset/Mask group@3x(5).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Contents.json deleted file mode 100644 index ac2d4c9..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Microphone@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Microphone@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Microphone@2x.png b/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Microphone@2x.png deleted file mode 100644 index 9b97a05..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Microphone@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Microphone@3x.png b/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Microphone@3x.png deleted file mode 100644 index d3eee43..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Microphone.imageset/Microphone@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Contents.json deleted file mode 100644 index adfa944..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Rectangle 781@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Rectangle 781@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Rectangle 781@2x.png b/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Rectangle 781@2x.png deleted file mode 100644 index c6999df..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Rectangle 781@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Rectangle 781@3x.png b/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Rectangle 781@3x.png deleted file mode 100644 index 66e3cd0..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Rectangle 781.imageset/Rectangle 781@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Contents.json deleted file mode 100644 index fb17d07..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Rectangle 826@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Rectangle 826@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Rectangle 826@2x.png b/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Rectangle 826@2x.png deleted file mode 100644 index f6cc64b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Rectangle 826@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Rectangle 826@3x.png b/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Rectangle 826@3x.png deleted file mode 100644 index cf48c7c..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Rectangle 826.imageset/Rectangle 826@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Contents.json deleted file mode 100644 index d12c8b2..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Vector 523@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Vector 523@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Vector 523@2x.png b/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Vector 523@2x.png deleted file mode 100644 index e1a9eee..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Vector 523@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Vector 523@3x.png b/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Vector 523@3x.png deleted file mode 100644 index 61e5185..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Vector 523.imageset/Vector 523@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Contents.json deleted file mode 100644 index 0ec464c..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Vector 525@2x(1).png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Vector 525@3x(1).png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Vector 525@2x(1).png b/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Vector 525@2x(1).png deleted file mode 100644 index 425629f..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Vector 525@2x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Vector 525@3x(1).png b/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Vector 525@3x(1).png deleted file mode 100644 index 425629f..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Vector 525(1).imageset/Vector 525@3x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Contents.json deleted file mode 100644 index a32699e..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Vector 525@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Vector 525@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Vector 525@2x.png b/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Vector 525@2x.png deleted file mode 100644 index 236a41e..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Vector 525@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Vector 525@3x.png b/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Vector 525@3x.png deleted file mode 100644 index 1a4963d..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Vector 525.imageset/Vector 525@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Contents.json deleted file mode 100644 index 77f117c..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Vector 526@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Vector 526@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Vector 526@2x.png b/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Vector 526@2x.png deleted file mode 100644 index bf84f00..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Vector 526@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Vector 526@3x.png b/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Vector 526@3x.png deleted file mode 100644 index 1547f33..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/Vector 526.imageset/Vector 526@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_clear_charm.imageset/Group 7472@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_clear_charm.imageset/Group 7472@2x.png index 94d845f..8a98176 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_clear_charm.imageset/Group 7472@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_clear_charm.imageset/Group 7472@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_clear_charm.imageset/Group 7472@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_clear_charm.imageset/Group 7472@3x.png index e094cf5..533f630 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_clear_charm.imageset/Group 7472@3x.png and b/QXLive/Other/Assets.xcassets/home/room/room_clear_charm.imageset/Group 7472@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Contents.json index 780851a..5c4d3b1 100644 --- a/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(4).png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(4).png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@2x(4).png b/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@2x(4).png deleted file mode 100644 index 1d28ca9..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@2x(4).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@2x.png new file mode 100644 index 0000000..db880f2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@3x(4).png b/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@3x(4).png deleted file mode 100644 index b261f74..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@3x(4).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@3x.png new file mode 100644 index 0000000..54f046b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_notice_icon.imageset/Frame@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/room_people.imageset/Contents.json similarity index 76% rename from QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/home/room/room_people.imageset/Contents.json index d13c46d..4c11ced 100644 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1589.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/room/room_people.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 1589@2x.png", + "filename" : "room_people@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 1589@3x.png", + "filename" : "room_people@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/room/room_people.imageset/room_people@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_people.imageset/room_people@2x.png new file mode 100644 index 0000000..d180480 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_people.imageset/room_people@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_people.imageset/room_people@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_people.imageset/room_people@3x.png new file mode 100644 index 0000000..e834b25 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_people.imageset/room_people@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Contents.json index 1814a65..001688e 100644 --- a/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(3).png", + "filename" : "Frame 1321316288@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(3).png", + "filename" : "Frame 1321316288@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame 1321316288@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame 1321316288@2x.png new file mode 100644 index 0000000..c1367eb Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame 1321316288@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame 1321316288@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame 1321316288@3x.png new file mode 100644 index 0000000..d9a03ff Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame 1321316288@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame@2x(3).png b/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame@2x(3).png deleted file mode 100644 index 76ffccc..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame@2x(3).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame@3x(3).png b/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame@3x(3).png deleted file mode 100644 index f641f01..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_rank_icon.imageset/Frame@3x(3).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_seat_icon.imageset/Group 6905@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_seat_icon.imageset/Group 6905@2x.png index 85bb10b..8acc000 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_seat_icon.imageset/Group 6905@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_seat_icon.imageset/Group 6905@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_seat_icon.imageset/Group 6905@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_seat_icon.imageset/Group 6905@3x.png index a9b5fb9..49970c0 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_seat_icon.imageset/Group 6905@3x.png and b/QXLive/Other/Assets.xcassets/home/room/room_seat_icon.imageset/Group 6905@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Frame 1321316152@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Frame 1321316152@2x.png index 13aba7c..a9f8533 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Frame 1321316152@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Frame 1321316152@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Frame 1321316152@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Frame 1321316152@3x.png index 6f27d76..ccc889b 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Frame 1321316152@3x.png and b/QXLive/Other/Assets.xcassets/home/room/room_seat_lock.imageset/Frame 1321316152@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Frame@2x.png deleted file mode 100644 index 3e54b9d..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Frame@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Frame@3x.png deleted file mode 100644 index d5297b9..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_sing_set.imageset/Frame@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_close.imageset/Group 7289@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_close.imageset/Group 7289@2x.png index 2ca2b3e..a0209ae 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_close.imageset/Group 7289@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_song_close.imageset/Group 7289@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_close.imageset/Group 7289@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_close.imageset/Group 7289@3x.png index 4551eeb..30e5255 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_close.imageset/Group 7289@3x.png and b/QXLive/Other/Assets.xcassets/home/room/room_song_close.imageset/Group 7289@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_give.imageset/Group 7287@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_give.imageset/Group 7287@2x.png index af5f684..12d9ec6 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_give.imageset/Group 7287@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_song_give.imageset/Group 7287@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_give.imageset/Group 7287@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_give.imageset/Group 7287@3x.png index 497b466..232a703 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_give.imageset/Group 7287@3x.png and b/QXLive/Other/Assets.xcassets/home/room/room_song_give.imageset/Group 7287@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_next.imageset/Group 7288@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_next.imageset/Group 7288@2x.png index 7d33d0d..61cf9f6 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_next.imageset/Group 7288@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_song_next.imageset/Group 7288@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_next.imageset/Group 7288@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_next.imageset/Group 7288@3x.png index 83b95b3..934e0b8 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_next.imageset/Group 7288@3x.png and b/QXLive/Other/Assets.xcassets/home/room/room_song_next.imageset/Group 7288@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_original_sel.imageset/Group 7285@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_original_sel.imageset/Group 7285@2x.png index ec6a897..83b0d45 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_original_sel.imageset/Group 7285@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_song_original_sel.imageset/Group 7285@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_original_sel.imageset/Group 7285@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_original_sel.imageset/Group 7285@3x.png index bad0623..43205f4 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_original_sel.imageset/Group 7285@3x.png and b/QXLive/Other/Assets.xcassets/home/room/room_song_original_sel.imageset/Group 7285@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Contents.json index d9db5b7..5c4d3b1 100644 --- a/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(8).png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(8).png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@2x(8).png b/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@2x(8).png deleted file mode 100644 index 51ba3ba..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@2x(8).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@2x.png new file mode 100644 index 0000000..556cf67 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@3x(8).png b/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@3x(8).png deleted file mode 100644 index e515b35..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@3x(8).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@3x.png new file mode 100644 index 0000000..8d9de07 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_song_up.imageset/Frame@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_sound.imageset/Group 7257@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_sound.imageset/Group 7257@2x.png index 7de1fce..0735840 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_sound.imageset/Group 7257@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_sound.imageset/Group 7257@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_sound.imageset/Group 7257@3x.png b/QXLive/Other/Assets.xcassets/home/room/room_sound.imageset/Group 7257@3x.png index d7d386c..670637f 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_sound.imageset/Group 7257@3x.png and b/QXLive/Other/Assets.xcassets/home/room/room_sound.imageset/Group 7257@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Contents.json index 5a40fcc..54ea690 100644 --- a/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "Rectangle 823@2x.png", + "filename" : "Group 7307@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Group 7307@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Group 7307@2x.png new file mode 100644 index 0000000..6a704c5 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Group 7307@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Rectangle 823@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Rectangle 823@2x.png deleted file mode 100644 index 9fefd16..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_sound_bg.imageset/Rectangle 823@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/room_topic_bg.imageset/Mask group@2x.png b/QXLive/Other/Assets.xcassets/home/room/room_topic_bg.imageset/Mask group@2x.png index abf150a..061647d 100644 Binary files a/QXLive/Other/Assets.xcassets/home/room/room_topic_bg.imageset/Mask group@2x.png and b/QXLive/Other/Assets.xcassets/home/room/room_topic_bg.imageset/Mask group@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/Contents.json deleted file mode 100644 index 26ee2be..0000000 --- a/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "关系位@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "关系位@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/关系位@2x.png b/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/关系位@2x.png deleted file mode 100644 index 0922382..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/关系位@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/关系位@3x.png b/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/关系位@3x.png deleted file mode 100644 index 1173add..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room/关系位.imageset/关系位@3x.png and /dev/null 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 feb3722..0015030 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" : "Group 34@2x.png", + "filename" : "火@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 34@3x.png", + "filename" : "火@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Group 34@2x.png b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Group 34@2x.png deleted file mode 100644 index fd05300..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Group 34@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Group 34@3x.png b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Group 34@3x.png deleted file mode 100644 index b5d27e3..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Group 34@3x.png and /dev/null 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 new file mode 100644 index 0000000..d209586 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/火@2x.png 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 new file mode 100644 index 0000000..63b5217 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/火@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/camera.imageset/Contents.json similarity index 78% rename from QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/login/camera.imageset/Contents.json index f8bcbfa..a1f7606 100644 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 8.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/camera.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 8@2x.png", + "filename" : "camera@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 8@3x.png", + "filename" : "camera@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/camera.imageset/camera@2x.png b/QXLive/Other/Assets.xcassets/login/camera.imageset/camera@2x.png new file mode 100644 index 0000000..e703c4a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/camera.imageset/camera@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/camera.imageset/camera@3x.png b/QXLive/Other/Assets.xcassets/login/camera.imageset/camera@3x.png new file mode 100644 index 0000000..e8b95c0 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/camera.imageset/camera@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/Contents.json similarity index 77% rename from QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Contents.json rename to QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/Contents.json index a541573..b1f1d61 100644 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1(1).imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/forgot_pwd.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 1@2x(1).png", + "filename" : "forgot_pwd@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 1@3x(1).png", + "filename" : "forgot_pwd@3x.png", "idiom" : "universal", "scale" : "3x" } 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 new file mode 100644 index 0000000..da8b7e3 Binary files /dev/null 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 new file mode 100644 index 0000000..c31bc13 Binary files /dev/null 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/Contents.json b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Contents.json index b3ec00a..88244db 100644 --- a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 6883@2x.png", + "filename" : "协议已勾选@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 6883@3x.png", + "filename" : "协议已勾选@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Group 6883@2x.png b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Group 6883@2x.png deleted file mode 100644 index d43203a..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Group 6883@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Group 6883@3x.png b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Group 6883@3x.png deleted file mode 100644 index a63ae5c..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Group 6883@3x.png and /dev/null 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 new file mode 100644 index 0000000..00d80c2 Binary files /dev/null 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 new file mode 100644 index 0000000..bbbef18 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Contents.json index b29721e..61d30f6 100644 --- a/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Contents.json @@ -5,41 +5,13 @@ "scale" : "1x" }, { - "filename" : "Frame 1@2x.png", + "filename" : "矩形@2x.png", "idiom" : "universal", - "resizing" : { - "cap-insets" : { - "bottom" : 32, - "left" : 124, - "right" : 124, - "top" : 32 - }, - "center" : { - "height" : 1, - "mode" : "tile", - "width" : 1 - }, - "mode" : "9-part" - }, "scale" : "2x" }, { - "filename" : "Frame 1@3x.png", + "filename" : "矩形@3x.png", "idiom" : "universal", - "resizing" : { - "cap-insets" : { - "bottom" : 45, - "left" : 128, - "right" : 144, - "top" : 47 - }, - "center" : { - "height" : 34, - "mode" : "tile", - "width" : 1 - }, - "mode" : "9-part" - }, "scale" : "3x" } ], diff --git a/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Frame 1@2x.png b/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Frame 1@2x.png deleted file mode 100644 index bf7259a..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Frame 1@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Frame 1@3x.png b/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Frame 1@3x.png deleted file mode 100644 index 6ddb450..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/Frame 1@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/矩形@2x.png b/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/矩形@2x.png new file mode 100644 index 0000000..c460e82 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/矩形@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/矩形@3x.png b/QXLive/Other/Assets.xcassets/login/login_btn_bg.imageset/矩形@3x.png new file mode 100644 index 0000000..9bc626e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_btn_bg.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 c69054c..e97235d 100644 --- a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Mask group@2x.png", + "filename" : "启动图标 1@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Mask group@3x.png", + "filename" : "启动图标 1@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Mask group@2x.png b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Mask group@2x.png deleted file mode 100644 index 363c82a..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Mask group@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Mask group@3x.png b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Mask group@3x.png deleted file mode 100644 index 277d53d..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Mask group@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/启动图标 1@2x.png b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/启动图标 1@2x.png new file mode 100644 index 0000000..29a873c Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/启动图标 1@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/启动图标 1@3x.png b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/启动图标 1@3x.png new file mode 100644 index 0000000..405aad2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/启动图标 1@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Contents.json index 507993e..ad8be50 100644 --- a/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 6888@2x.png", + "filename" : "男生未选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 6888@3x.png", + "filename" : "男生未选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Group 6888@2x.png b/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Group 6888@2x.png deleted file mode 100644 index 3e845f1..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Group 6888@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Group 6888@3x.png b/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Group 6888@3x.png deleted file mode 100644 index f9022f5..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/Group 6888@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/男生未选中@2x.png b/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/男生未选中@2x.png new file mode 100644 index 0000000..0b14aa7 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/男生未选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/男生未选中@3x.png b/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/男生未选中@3x.png new file mode 100644 index 0000000..be5afab Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_sex_boy_nor.imageset/男生未选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Contents.json index 39fbda2..1d4808b 100644 --- a/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 6869@2x.png", + "filename" : "男生选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 6869@3x.png", + "filename" : "男生选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Group 6869@2x.png b/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Group 6869@2x.png deleted file mode 100644 index 317fc5d..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Group 6869@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Group 6869@3x.png b/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Group 6869@3x.png deleted file mode 100644 index 98f41e7..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/Group 6869@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/男生选中@2x.png b/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/男生选中@2x.png new file mode 100644 index 0000000..cddf3d9 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/男生选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/男生选中@3x.png b/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/男生选中@3x.png new file mode 100644 index 0000000..6109eb8 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_sex_boy_sel.imageset/男生选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Contents.json index d59be1d..0c8cf84 100644 --- a/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 6868@2x.png", + "filename" : "女生未选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 6868@3x.png", + "filename" : "女生未选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Group 6868@2x.png b/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Group 6868@2x.png deleted file mode 100644 index 72f1b58..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Group 6868@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Group 6868@3x.png b/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Group 6868@3x.png deleted file mode 100644 index 69eb540..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/Group 6868@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/女生未选中@2x.png b/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/女生未选中@2x.png new file mode 100644 index 0000000..fcb8cb1 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/女生未选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/女生未选中@3x.png b/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/女生未选中@3x.png new file mode 100644 index 0000000..f1174f2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_sex_girl_nor.imageset/女生未选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Contents.json index 92241b2..e68d607 100644 --- a/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 6926@2x(1).png", + "filename" : "女生已选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 6926@3x(1).png", + "filename" : "女生已选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Group 6926@2x(1).png b/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Group 6926@2x(1).png deleted file mode 100644 index ce66410..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Group 6926@2x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Group 6926@3x(1).png b/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Group 6926@3x(1).png deleted file mode 100644 index eba76bd..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/Group 6926@3x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/女生已选中@2x.png b/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/女生已选中@2x.png new file mode 100644 index 0000000..9549054 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/女生已选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/女生已选中@3x.png b/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/女生已选中@3x.png new file mode 100644 index 0000000..eaa87d2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_sex_girl_sel.imageset/女生已选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Contents.json similarity index 78% rename from QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Contents.json rename to QXLive/Other/Assets.xcassets/login/mi_di.imageset/Contents.json index 575adc4..f3f3de2 100644 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 1@2x.png", + "filename" : "mi_di@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 1@3x.png", + "filename" : "mi_di@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/mi_di.imageset/mi_di@2x.png b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/mi_di@2x.png new file mode 100644 index 0000000..b0376ad Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/mi_di@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/mi_di.imageset/mi_di@3x.png b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/mi_di@3x.png new file mode 100644 index 0000000..109de8f Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/mi_di@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/random.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/random.imageset/Contents.json new file mode 100644 index 0000000..4c3d347 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/login/random.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "random@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "random@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/login/random.imageset/random@2x.png b/QXLive/Other/Assets.xcassets/login/random.imageset/random@2x.png new file mode 100644 index 0000000..1881666 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/random.imageset/random@2x.png 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 new file mode 100644 index 0000000..6d183aa Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/random.imageset/random@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 new file mode 100644 index 0000000..63faddd --- /dev/null +++ b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "welcome_midi@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "welcome_midi@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} 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 new file mode 100644 index 0000000..b17c94e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/welcome_midi@2x.png 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 new file mode 100644 index 0000000..fcf0b62 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/welcome_midi@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Contents.json deleted file mode 100644 index b036fb6..0000000 --- a/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 7211@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 7211@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Group 7211@2x.png b/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Group 7211@2x.png deleted file mode 100644 index 80386c9..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Group 7211@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Group 7211@3x.png b/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Group 7211@3x.png deleted file mode 100644 index 2b22815..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/Group 7211.imageset/Group 7211@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Contents.json deleted file mode 100644 index ac2d4c9..0000000 --- a/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Microphone@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Microphone@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Microphone@2x.png b/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Microphone@2x.png deleted file mode 100644 index fc047b3..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Microphone@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Microphone@3x.png b/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Microphone@3x.png deleted file mode 100644 index c5fdf33..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/Microphone.imageset/Microphone@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Contents.json deleted file mode 100644 index de2e520..0000000 --- a/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 7210@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 7210@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Group 7210@2x.png b/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Group 7210@2x.png deleted file mode 100644 index 0c76bd1..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Group 7210@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Group 7210@3x.png b/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Group 7210@3x.png deleted file mode 100644 index 2126e61..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/become_anchor.imageset/Group 7210@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Mask group@2x.png b/QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Mask group@2x.png index 6d8dcd4..ee38cd3 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Mask group@2x.png and b/QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Mask group@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Mask group@3x.png b/QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Mask group@3x.png index 1f83090..060b07e 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Mask group@3x.png and b/QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Mask group@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Contents.json index da4c2cf..331e0b8 100644 --- a/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 7487@2x.png", + "filename" : "Group 7922@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 7487@3x.png", + "filename" : "Group 7922@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7487@2x.png b/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7487@2x.png deleted file mode 100644 index ef68414..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7487@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7487@3x.png b/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7487@3x.png deleted file mode 100644 index 3075702..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7487@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7922@2x.png b/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7922@2x.png new file mode 100644 index 0000000..03b09dc Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7922@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7922@3x.png b/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7922@3x.png new file mode 100644 index 0000000..46cc294 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/my_cproom_head_bg.imageset/Group 7922@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Contents.json index 1656291..5a66d61 100644 --- a/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 165@2x.png", + "filename" : "待审核@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 165@3x.png", + "filename" : "待审核@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Group 165@2x.png b/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Group 165@2x.png deleted file mode 100644 index 9d965a0..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Group 165@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Group 165@3x.png b/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Group 165@3x.png deleted file mode 100644 index 64274ea..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/Group 165@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/待审核@2x.png b/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/待审核@2x.png new file mode 100644 index 0000000..ae598af Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/待审核@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/待审核@3x.png b/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/待审核@3x.png new file mode 100644 index 0000000..36e1e26 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/my_room_wait.imageset/待审核@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/room_history_delete.imageset/Trash@2x.png b/QXLive/Other/Assets.xcassets/mine/room_history_delete.imageset/Trash@2x.png index e7a26f2..ce9554a 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/room_history_delete.imageset/Trash@2x.png and b/QXLive/Other/Assets.xcassets/mine/room_history_delete.imageset/Trash@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/room_history_delete.imageset/Trash@3x.png b/QXLive/Other/Assets.xcassets/mine/room_history_delete.imageset/Trash@3x.png index adfb5e1..9b18f14 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/room_history_delete.imageset/Trash@3x.png and b/QXLive/Other/Assets.xcassets/mine/room_history_delete.imageset/Trash@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Contents.json index 1814a65..5c4d3b1 100644 --- a/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(3).png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(3).png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@2x(3).png b/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@2x(3).png deleted file mode 100644 index 43426f2..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@2x(3).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@2x.png new file mode 100644 index 0000000..faea98e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@3x(3).png b/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@3x(3).png deleted file mode 100644 index 2e3cfda..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@3x(3).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@3x.png new file mode 100644 index 0000000..fd62328 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Frame@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Contents.json index b5de782..5c4d3b1 100644 --- a/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(1).png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(1).png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@2x(1).png b/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@2x(1).png deleted file mode 100644 index 6f34443..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@2x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@2x.png new file mode 100644 index 0000000..d59a592 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@3x(1).png b/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@3x(1).png deleted file mode 100644 index 62c5b03..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@3x(1).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@3x.png new file mode 100644 index 0000000..9ff26bc Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Frame@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_guild.imageset/Home@2x.png b/QXLive/Other/Assets.xcassets/mine/service_guild.imageset/Home@2x.png index 05ef332..484e8a5 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/service_guild.imageset/Home@2x.png and b/QXLive/Other/Assets.xcassets/mine/service_guild.imageset/Home@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_guild.imageset/Home@3x.png b/QXLive/Other/Assets.xcassets/mine/service_guild.imageset/Home@3x.png index 0dcbdf3..2038bfe 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/service_guild.imageset/Home@3x.png and b/QXLive/Other/Assets.xcassets/mine/service_guild.imageset/Home@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_level.imageset/Award, Trophy@2x.png b/QXLive/Other/Assets.xcassets/mine/service_level.imageset/Award, Trophy@2x.png index c026ce5..dcb8963 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/service_level.imageset/Award, Trophy@2x.png and b/QXLive/Other/Assets.xcassets/mine/service_level.imageset/Award, Trophy@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_level.imageset/Award, Trophy@3x.png b/QXLive/Other/Assets.xcassets/mine/service_level.imageset/Award, Trophy@3x.png index 2909908..0c5076b 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/service_level.imageset/Award, Trophy@3x.png and b/QXLive/Other/Assets.xcassets/mine/service_level.imageset/Award, Trophy@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_shop.imageset/Store@2x.png b/QXLive/Other/Assets.xcassets/mine/service_shop.imageset/Store@2x.png index 761e7e2..cf21f3c 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/service_shop.imageset/Store@2x.png and b/QXLive/Other/Assets.xcassets/mine/service_shop.imageset/Store@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_shop.imageset/Store@3x.png b/QXLive/Other/Assets.xcassets/mine/service_shop.imageset/Store@3x.png index 4143d7b..2359261 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/service_shop.imageset/Store@3x.png and b/QXLive/Other/Assets.xcassets/mine/service_shop.imageset/Store@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Contents.json index c98d767..5c4d3b1 100644 --- a/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame@2x(2).png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame@3x(2).png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@2x(2).png b/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@2x(2).png deleted file mode 100644 index 76a940e..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@2x(2).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@2x.png new file mode 100644 index 0000000..8aa6444 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@3x(2).png b/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@3x(2).png deleted file mode 100644 index e0ce879..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@3x(2).png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@3x.png new file mode 100644 index 0000000..a3ac671 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/service_task.imageset/Frame@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_wallet.imageset/Wallet@2x.png b/QXLive/Other/Assets.xcassets/mine/service_wallet.imageset/Wallet@2x.png index 5fa6174..11e34a6 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/service_wallet.imageset/Wallet@2x.png and b/QXLive/Other/Assets.xcassets/mine/service_wallet.imageset/Wallet@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/service_wallet.imageset/Wallet@3x.png b/QXLive/Other/Assets.xcassets/mine/service_wallet.imageset/Wallet@3x.png index c8ed911..72a33d8 100644 Binary files a/QXLive/Other/Assets.xcassets/mine/service_wallet.imageset/Wallet@3x.png and b/QXLive/Other/Assets.xcassets/mine/service_wallet.imageset/Wallet@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Contents.json index a0a8bf1..d17a073 100644 --- a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 7222@2x.png", + "filename" : "Group 7508@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 7222@3x.png", + "filename" : "Group 7508@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7222@2x.png b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7222@2x.png deleted file mode 100644 index 461d874..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7222@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7222@3x.png b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7222@3x.png deleted file mode 100644 index 18e3c62..0000000 Binary files a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7222@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7508@2x.png b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7508@2x.png new file mode 100644 index 0000000..bf45533 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7508@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7508@3x.png b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7508@3x.png new file mode 100644 index 0000000..916f654 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg.imageset/Group 7508@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Contents.json b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/Contents.json similarity index 75% rename from QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Contents.json rename to QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/Contents.json index 6aad269..4df5a36 100644 --- a/QXLive/Other/Assets.xcassets/home/room/Frame 1758(1).imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 1758@2x(1).png", + "filename" : "wallet_top_bg1@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 1758@3x(1).png", + "filename" : "wallet_top_bg1@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/wallet_top_bg1@2x.png b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/wallet_top_bg1@2x.png new file mode 100644 index 0000000..6f98371 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/wallet_top_bg1@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/wallet_top_bg1@3x.png b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/wallet_top_bg1@3x.png new file mode 100644 index 0000000..97891af Binary files /dev/null and b/QXLive/Other/Assets.xcassets/mine/钱包/wallet_top_bg1.imageset/wallet_top_bg1@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Contents.json b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Contents.json index f5ca247..df0b050 100644 --- a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 709@2x.png", + "filename" : "动态未选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 709@3x.png", + "filename" : "动态未选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Rectangle 709@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Rectangle 709@2x.png deleted file mode 100644 index 454fe10..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Rectangle 709@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Rectangle 709@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Rectangle 709@3x.png deleted file mode 100644 index 2770efa..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Rectangle 709@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/动态未选中@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/动态未选中@2x.png new file mode 100644 index 0000000..34654a1 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/动态未选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/动态未选中@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/动态未选中@3x.png new file mode 100644 index 0000000..f61fee3 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/动态未选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Contents.json b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Contents.json index d4c261c..4184327 100644 --- a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 710@2x.png", + "filename" : "动态已选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 710@3x.png", + "filename" : "动态已选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Rectangle 710@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Rectangle 710@2x.png deleted file mode 100644 index b9f9bd2..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Rectangle 710@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Rectangle 710@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Rectangle 710@3x.png deleted file mode 100644 index ca13a1f..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Rectangle 710@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/动态已选中@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/动态已选中@2x.png new file mode 100644 index 0000000..5fd97e0 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/动态已选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/动态已选中@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/动态已选中@3x.png new file mode 100644 index 0000000..a5d5abc Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/动态已选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Contents.json b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Contents.json index 670684e..5fbd4eb 100644 --- a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 708@2x.png", + "filename" : "首页未选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 708@3x.png", + "filename" : "首页未选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Rectangle 708@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Rectangle 708@2x.png deleted file mode 100644 index 838a01d..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Rectangle 708@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Rectangle 708@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Rectangle 708@3x.png deleted file mode 100644 index 8762d11..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Rectangle 708@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/首页未选中@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/首页未选中@2x.png new file mode 100644 index 0000000..b7a2b49 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/首页未选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/首页未选中@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/首页未选中@3x.png new file mode 100644 index 0000000..ec0697b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/首页未选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Contents.json b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Contents.json index e6638e7..8df779c 100644 --- a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 44@2x.png", + "filename" : "首页已选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 44@3x.png", + "filename" : "首页已选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Rectangle 44@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Rectangle 44@2x.png deleted file mode 100644 index f7f132f..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Rectangle 44@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Rectangle 44@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Rectangle 44@3x.png deleted file mode 100644 index 3eb6dd4..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Rectangle 44@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/首页已选中@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/首页已选中@2x.png new file mode 100644 index 0000000..c81f6b6 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/首页已选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/首页已选中@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/首页已选中@3x.png new file mode 100644 index 0000000..6b0ecec Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/首页已选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Contents.json b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Contents.json index 200f5d7..00fb9f6 100644 --- a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 713@2x.png", + "filename" : "我的未选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 713@3x.png", + "filename" : "我的未选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Rectangle 713@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Rectangle 713@2x.png deleted file mode 100644 index 111db06..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Rectangle 713@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Rectangle 713@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Rectangle 713@3x.png deleted file mode 100644 index 1ec317c..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Rectangle 713@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/我的未选中@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/我的未选中@2x.png new file mode 100644 index 0000000..a2e972f Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/我的未选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/我的未选中@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/我的未选中@3x.png new file mode 100644 index 0000000..fbd9072 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/我的未选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Contents.json b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Contents.json index 4de1316..ff086d6 100644 --- a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 714@2x.png", + "filename" : "我的已选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 714@3x.png", + "filename" : "我的已选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Rectangle 714@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Rectangle 714@2x.png deleted file mode 100644 index aae7b1c..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Rectangle 714@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Rectangle 714@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Rectangle 714@3x.png deleted file mode 100644 index e561de8..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Rectangle 714@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/我的已选中@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/我的已选中@2x.png new file mode 100644 index 0000000..b547049 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/我的已选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/我的已选中@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/我的已选中@3x.png new file mode 100644 index 0000000..8daa2ed Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/我的已选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Contents.json b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Contents.json index afb1412..a3265cb 100644 --- a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 711@2x.png", + "filename" : "消息未选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 711@3x.png", + "filename" : "消息未选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Rectangle 711@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Rectangle 711@2x.png deleted file mode 100644 index ed8efa9..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Rectangle 711@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Rectangle 711@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Rectangle 711@3x.png deleted file mode 100644 index c445946..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Rectangle 711@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/消息未选中@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/消息未选中@2x.png new file mode 100644 index 0000000..4677144 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/消息未选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/消息未选中@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/消息未选中@3x.png new file mode 100644 index 0000000..cd47f91 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/消息未选中@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Contents.json b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Contents.json index bb39ace..739b16e 100644 --- a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Rectangle 712@2x.png", + "filename" : "消息已选中@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Rectangle 712@3x.png", + "filename" : "消息已选中@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Rectangle 712@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Rectangle 712@2x.png deleted file mode 100644 index 48edde9..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Rectangle 712@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Rectangle 712@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Rectangle 712@3x.png deleted file mode 100644 index 02fb1d8..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Rectangle 712@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/消息已选中@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/消息已选中@2x.png new file mode 100644 index 0000000..1989504 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/消息已选中@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/消息已选中@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/消息已选中@3x.png new file mode 100644 index 0000000..ce357a2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/消息已选中@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 f9d6f07..416a255 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" : "iPadSpootlight7_40pt@2x.png", + "filename" : "iPhoneApp_60pt@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPadSpootlight7_40pt@2x.png b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPadSpootlight7_40pt@2x.png deleted file mode 100644 index 34dacdc..0000000 Binary files a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPadSpootlight7_40pt@2x.png and /dev/null differ 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 new file mode 100644 index 0000000..836a033 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/启动页.imageset/启动页.png b/QXLive/Other/Assets.xcassets/启动页.imageset/启动页.png deleted file mode 100644 index 8969d58..0000000 Binary files a/QXLive/Other/Assets.xcassets/启动页.imageset/启动页.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/Contents.json b/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/Contents.json index 22a28e0..8fbd9fa 100644 --- a/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/Contents.json @@ -5,11 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 7207@2x.png", + "filename" : "青少年背景@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "青少年背景@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/Group 7207@2x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/Group 7207@2x.png deleted file mode 100644 index b9d2879..0000000 Binary files a/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/Group 7207@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/青少年背景@2x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/青少年背景@2x.png new file mode 100644 index 0000000..ded9dad Binary files /dev/null and b/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/青少年背景@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/青少年背景@3x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/青少年背景@3x.png new file mode 100644 index 0000000..681bdf2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/弹窗/a_pop_chirld_mode.imageset/青少年背景@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_first_recharge.imageset/Group 7229@2x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_first_recharge.imageset/Group 7229@2x.png index 440149e..a1a4118 100644 Binary files a/QXLive/Other/Assets.xcassets/弹窗/a_pop_first_recharge.imageset/Group 7229@2x.png and b/QXLive/Other/Assets.xcassets/弹窗/a_pop_first_recharge.imageset/Group 7229@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_nice_gift.imageset/Mask group@2x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_nice_gift.imageset/Mask group@2x.png index 8d346c2..16db60d 100644 Binary files a/QXLive/Other/Assets.xcassets/弹窗/a_pop_nice_gift.imageset/Mask group@2x.png and b/QXLive/Other/Assets.xcassets/弹窗/a_pop_nice_gift.imageset/Mask group@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Contents.json b/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Contents.json index 1931c82..c90c800 100644 --- a/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 6971@2x.png", + "filename" : "实名认证弹窗背景@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 6971@3x.png", + "filename" : "实名认证弹窗背景@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Group 6971@2x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Group 6971@2x.png deleted file mode 100644 index 0d53eed..0000000 Binary files a/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Group 6971@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Group 6971@3x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Group 6971@3x.png deleted file mode 100644 index 378c62e..0000000 Binary files a/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/Group 6971@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/实名认证弹窗背景@2x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/实名认证弹窗背景@2x.png new file mode 100644 index 0000000..0843139 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/实名认证弹窗背景@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/实名认证弹窗背景@3x.png b/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/实名认证弹窗背景@3x.png new file mode 100644 index 0000000..4c4c0d9 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/弹窗/a_pop_realname.imageset/实名认证弹窗背景@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Contents.json index f594af8..b00a579 100644 --- a/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 1344@2x.png", + "filename" : "Frame 1731@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 1344@3x.png", + "filename" : "Frame 1731@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1344@2x.png b/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1344@2x.png deleted file mode 100644 index 197248b..0000000 Binary files a/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1344@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1344@3x.png b/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1344@3x.png deleted file mode 100644 index 7f06731..0000000 Binary files a/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1344@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1731@2x.png b/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1731@2x.png new file mode 100644 index 0000000..7103c55 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1731@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1731@3x.png b/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1731@3x.png new file mode 100644 index 0000000..ef6a632 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/弹窗/gift_number_bg.imageset/Frame 1731@3x.png differ diff --git a/QXLive/Other/Base.lproj/LaunchScreen.storyboard b/QXLive/Other/Base.lproj/LaunchScreen.storyboard index d7ea64e..1e95133 100644 --- a/QXLive/Other/Base.lproj/LaunchScreen.storyboard +++ b/QXLive/Other/Base.lproj/LaunchScreen.storyboard @@ -17,7 +17,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/QXLive/Other/zh-Hans.lproj/Localizable.strings b/QXLive/Other/zh-Hans.lproj/Localizable.strings index 52cdb9e..03742e5 100644 --- a/QXLive/Other/zh-Hans.lproj/Localizable.strings +++ b/QXLive/Other/zh-Hans.lproj/Localizable.strings @@ -30,7 +30,7 @@ NSPhotoLibraryUsageDescription = "访问您的相册,允许可以把视频保存 "青少年模式" = "青少年模式"; //登录 -"欢迎来到羽声" = "欢迎来到羽声"; +"欢迎来到秘地" = "欢迎来到秘地"; "密码登录" = "密码登录"; "验证码登录" = "验证码登录"; "其他方式登录" = "其他方式登录"; @@ -56,7 +56,7 @@ NSPhotoLibraryUsageDescription = "访问您的相册,允许可以把视频保存 "资源加载错误" = "资源加载错误"; "请不要上传超过1M的头像" = "请不要上传超过1M的头像"; "文件上传失败，请重新尝试" = "文件上传失败，请重新尝试"; -"进入羽声" = "进入羽声"; +"进入秘地" = "进入秘地"; "希望大家怎么称呼你" = "希望大家怎么称呼你"; "选择您的性别" = "选择您的性别"; "注册成功，不可更改" = "注册成功，不可更改"; diff --git a/QXLive/Tabbar/QXTabbarController.m b/QXLive/Tabbar/QXTabbarController.m index 42b708e..39c4eb9 100644 --- a/QXLive/Tabbar/QXTabbarController.m +++ b/QXLive/Tabbar/QXTabbarController.m @@ -171,7 +171,7 @@ // } QXTabbarConfig *config = [QXTabbarConfig shareInstance]; config.imageOffset = -5; - QXTabBar *customTabBar = [[QXTabBar alloc] initWithFrame:CGRectMake(15, 0, SCREEN_WIDTH-30, 50) centerCustom:NO config:config]; + QXTabBar *customTabBar = [[QXTabBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, TabbarContentHeight) centerCustom:NO config:config]; customTabBar.backgroundColor = [UIColor whiteColor]; customTabBar.layer.shadowColor = [UIColor grayColor].CGColor; customTabBar.layer.shadowOpacity = 0.5; @@ -179,8 +179,8 @@ customTabBar.layer.shadowRadius = 25.0; customTabBar.layer.shadowPath = [UIBezierPath bezierPathWithRoundedRect:customTabBar.bounds cornerRadius:customTabBar.layer.cornerRadius].CGPath; customTabBar.delegate = self; - customTabBar.layer.cornerRadius = 25.0; - customTabBar.layer.masksToBounds = NO; +// customTabBar.layer.cornerRadius = 25.0; +// customTabBar.layer.masksToBounds = NO; self.selectedIndex = 0; // [self.view addSubview:customTabBar]; self.customTabBar = customTabBar; diff --git a/QXLive/Tabbar/TabbarCustomView/QXTabBarButton.m b/QXLive/Tabbar/TabbarCustomView/QXTabBarButton.m index 22e6d86..d360778 100644 --- a/QXLive/Tabbar/TabbarCustomView/QXTabBarButton.m +++ b/QXLive/Tabbar/TabbarCustomView/QXTabBarButton.m @@ -25,14 +25,14 @@ [self addSubview:self.titleLbl]; [self.iconBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self); - make.top.equalTo(self.mas_top).offset(-1); - make.height.width.mas_equalTo(32); + make.top.equalTo(self.mas_top).offset(6); + make.height.width.mas_equalTo(24); }]; [self.titleLbl mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self); - make.top.equalTo(self.iconBtn.mas_bottom).offset(0); + make.top.equalTo(self.iconBtn.mas_bottom).offset(2); make.left.right.equalTo(self); make.height.mas_equalTo(12); }]; diff --git a/QXLive/Tabbar/弹窗/QXGiftCell.h b/QXLive/Tabbar/弹窗/QXGiftCell.h index 3e1b6cf..1b304cb 100644 --- a/QXLive/Tabbar/弹窗/QXGiftCell.h +++ b/QXLive/Tabbar/弹窗/QXGiftCell.h @@ -33,6 +33,7 @@ NS_ASSUME_NONNULL_BEGIN @property (weak, nonatomic) IBOutlet UIImageView *userHeaderView; @property (weak, nonatomic) IBOutlet UIView *numberBgView; @property (weak, nonatomic) IBOutlet UIImageView *grayCoverView; +@property (weak, nonatomic) IBOutlet UIImageView *giftNumBgImageView; @property (strong, nonatomic) QXGiftModel *roomGiftModel; @property (strong, nonatomic) QXUserGiftWallModel *giftWall; diff --git a/QXLive/Tabbar/弹窗/QXGiftCell.m b/QXLive/Tabbar/弹窗/QXGiftCell.m index 1ddd274..1dc1f8c 100644 --- a/QXLive/Tabbar/弹窗/QXGiftCell.m +++ b/QXLive/Tabbar/弹窗/QXGiftCell.m @@ -14,6 +14,7 @@ // Initialization code [self.selecteBtn setBackgroundImage:[UIImage imageWithColor:RGB16(0xEFF2F8)] forState:(UIControlStateNormal)]; [self.selecteBtn setBackgroundImage:[UIImage imageNamed:@"mine_dress_bg"] forState:(UIControlStateSelected)]; + self.giftNumBgImageView.image = [[UIImage imageNamed:@"gift_number_bg"] imageByTintColor:QXConfig.themeColor]; } -(void)setCellType:(QXGiftCellType)cellType{ diff --git a/QXLive/Tabbar/弹窗/QXGiftCell.xib b/QXLive/Tabbar/弹窗/QXGiftCell.xib index 3d828b6..24df6d3 100644 --- a/QXLive/Tabbar/弹窗/QXGiftCell.xib +++ b/QXLive/Tabbar/弹窗/QXGiftCell.xib @@ -33,7 +33,7 @@ @@ -135,6 +135,7 @@ + diff --git a/QXLive/Tools/QXTextView.m b/QXLive/Tools/QXTextView.m index 9d4cb16..6323d2c 100644 --- a/QXLive/Tools/QXTextView.m +++ b/QXLive/Tools/QXTextView.m @@ -30,7 +30,7 @@ } -(void)initSubview{ - self.lengthColor = RGB16(0xFF8ACC); + self.lengthColor = QXConfig.themeColor; self.maxLength = 120; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textViewDidChange:) name:UITextViewTextDidChangeNotification object:nil]; self.delegate = self;