diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 4de5c6f..4952701 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -786,7 +786,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.0; - PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi; + PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -848,7 +848,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.0; - PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi; + PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1067,7 +1067,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi.QXLiveScreen; + PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.QXLiveScreen; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -1093,7 +1093,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi.QXLiveScreen; + PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.QXLiveScreen; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -1119,7 +1119,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test.QXLiveScreen; + PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.test.QXLiveScreen; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -1145,7 +1145,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test.QXLiveScreen; + PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.test.QXLiveScreen; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -1202,7 +1202,7 @@ "$(SDKROOT)/usr/lib/swift", ); MARKETING_VERSION = 1.0.0; - PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test; + PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.test; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1266,7 +1266,7 @@ "$(SDKROOT)/usr/lib/swift", ); MARKETING_VERSION = 1.0.0; - PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive.test; + PRODUCT_BUNDLE_IDENTIFIER = com.jdf.myyuliao.test; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; diff --git a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/UserInterfaceState.xcuserstate index ddb2ff3..b4be982 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 b839bcc..db4713c 100644 --- a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -272,5 +272,37 @@ landmarkType = "7"> + + + + + + + + diff --git a/QXLive/Base/QXAppStartViewController.m b/QXLive/Base/QXAppStartViewController.m index ad782a8..01b892f 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:@"app_start_midi1"];; + self.bgImaegView.image = [UIImage imageNamed:@"app_start_myyuyin"];; self.bgImaegView.contentMode = UIViewContentModeScaleAspectFill; [self.view addSubview:self.bgImaegView]; // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginSuccess) name:noticeUserLogin object:nil]; diff --git a/QXLive/Base/QXGlobal.m b/QXLive/Base/QXGlobal.m index 68f0850..05aa153 100644 --- a/QXLive/Base/QXGlobal.m +++ b/QXLive/Base/QXGlobal.m @@ -199,7 +199,6 @@ navagationController = (QXBaseNavigationController*)KEYWINDOW.rootViewController; // navagationController.interactivePopGestureRecognizer.enabled = NO; if (_miniView) { - [[QXGiftPlayerManager shareManager] startPlay]; [_miniView removeFromSuperview]; _miniView = nil; } @@ -332,7 +331,6 @@ self.miniView.roomId = self.roomId; self.miniView.roomCoverImage = roomCover; [self.miniView show]; - [[QXGiftPlayerManager shareManager] stopPlay]; } -(QXMiniRoomView *)miniView{ diff --git a/QXLive/Config/QXConfig.m b/QXLive/Config/QXConfig.m index f08091f..423e435 100644 --- a/QXLive/Config/QXConfig.m +++ b/QXLive/Config/QXConfig.m @@ -22,7 +22,7 @@ config.backgroundImage = @"app_bg"; config.placehoulderTextColor = RGB16(0x9b9b9b); /// appstore - config.themeColor = RGB16(0x6C49E4); + config.themeColor = RGB16(0xFC7285); config.btnTextColor = RGB16(0xffffff); // config.themeColor = RGB16(0xFC7285); diff --git a/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m b/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m index 39b6873..7743852 100644 --- a/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m +++ b/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m @@ -40,7 +40,7 @@ self.categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(14, kSafeAreaTop, 100, 44)]; self.categoryView.delegate = self; // self.categoryView.titles = @[QXText(@"发现"),QXText(@"扩列")]; - self.categoryView.titles = @[QXText(@"扩列"),QXText(@"发现")]; + self.categoryView.titles = @[QXText(@"发现")]; self.categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#333333"]; self.categoryView.titleColor = [UIColor colorWithHexString:@"#666666"]; self.categoryView.cellWidth = 50; @@ -68,28 +68,28 @@ } -(NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView{ - return 2; + return 1; } -(id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index{ -// if (index == 0) { -// QXFindViewController *vc = [[QXFindViewController alloc] init]; -// self.findVC = vc; -// return vc; -// }else{ -// QXExpansionViewController *vc = [[QXExpansionViewController alloc] init]; -// return vc; -// } if (index == 0) { - QXExpansionViewController *vc = [[QXExpansionViewController alloc] init]; - return vc; - }else{ QXFindViewController *vc = [[QXFindViewController alloc] init]; self.findVC = vc; return vc; + }else{ + QXExpansionViewController *vc = [[QXExpansionViewController alloc] init]; + return vc; } +// if (index == 0) { +// QXExpansionViewController *vc = [[QXExpansionViewController alloc] init]; +// return vc; +// }else{ +// QXFindViewController *vc = [[QXFindViewController alloc] init]; +// self.findVC = vc; +// return vc; +// } } -(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{ - self.publishBtn.hidden = !(index==1); +// self.publishBtn.hidden = !(index==1); } #pragma mark - action -(void)pulishAction{ @@ -111,7 +111,7 @@ [_publishBtn setImage:[UIImage imageNamed:@"publish_icon"] forState:UIControlStateNormal]; [_publishBtn setImage:[UIImage imageNamed:@"publish_icon"] forState:UIControlStateHighlighted]; [_publishBtn addTarget:self action:@selector(pulishAction) forControlEvents:UIControlEventTouchUpInside]; - _publishBtn.hidden = YES; +// _publishBtn.hidden = YES; } return _publishBtn; } diff --git a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m index d45c04c..e44ab6e 100644 --- a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m +++ b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m @@ -75,7 +75,7 @@ if ([QXConfig.backgroundImage hasPrefix:@"http"] || [QXConfig.backgroundImage hasPrefix:@"https"]) { [self updateBgImage:QXConfig.backgroundImage]; }else{ - [self updateBgImage:@"app_home_bg"]; + [self updateBgImage:@"app_bg"]; } UIImageView *logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mi_di"]]; [self.view addSubview:logoImageView]; @@ -91,8 +91,8 @@ [self.view addSubview:self.roomBtn]; [self.roomBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(54); - make.height.mas_equalTo(26); + make.width.mas_equalTo(30); + make.height.mas_equalTo(30); make.centerY.equalTo(logoImageView); make.right.equalTo(self.view).offset(-10); }]; diff --git a/QXLive/Info.plist b/QXLive/Info.plist index 180193e..4f0ff2c 100644 --- a/QXLive/Info.plist +++ b/QXLive/Info.plist @@ -4,7 +4,7 @@ BGTaskSchedulerPermittedIdentifiers - com.xscm.midi.task + com.jdf.myyuliao.task CFBundleURLTypes diff --git a/QXLive/Login(登录)/Controlller/QXLoginViewController.m b/QXLive/Login(登录)/Controlller/QXLoginViewController.m index 66fcd2f..3de5f23 100644 --- a/QXLive/Login(登录)/Controlller/QXLoginViewController.m +++ b/QXLive/Login(登录)/Controlller/QXLoginViewController.m @@ -248,8 +248,8 @@ model.preferredStatusBarStyle = UIStatusBarStyleDarkContent; model.logoImage = [UIImage imageNamed:@"login_logo"]; model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) { - frame.origin = CGPointMake((SCREEN_WIDTH - 88) * .5, 150+ kSafeAreaTop); - frame.size = CGSizeMake(88, 88); + frame.origin = CGPointMake((SCREEN_WIDTH - 170) * .5, 75+ kSafeAreaTop); + frame.size = CGSizeMake(170, 170); return frame; }; model.sloganText = [[NSAttributedString alloc] initWithString:@"本机号码" attributes:@{NSForegroundColorAttributeName : RGB16(0x666666),NSFontAttributeName : [UIFont systemFontOfSize:12]}]; diff --git a/QXLive/Login(登录)/View/QXLoginBottomView.m b/QXLive/Login(登录)/View/QXLoginBottomView.m index a41e8de..fcf5ec4 100644 --- a/QXLive/Login(登录)/View/QXLoginBottomView.m +++ b/QXLive/Login(登录)/View/QXLoginBottomView.m @@ -107,12 +107,12 @@ NSString *str = [NSString stringWithFormat:@"%@%@%@%@",QXText(@"我已阅读并同意"),QXText(@"《用户使用协议》"),QXText(@"和"),QXText(@"《隐私政策》")]; NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:str]; MJWeakSelf - [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《用户使用协议》")] color:RGB16(0xFF8ACC) backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《用户使用协议》")] color:QXConfig.themeColor backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickAgreementLoginWithUrl:type:)]) { [weakSelf.delegate didClickAgreementLoginWithUrl:@"111" type:1]; } }]; - [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《隐私政策》")] color:RGB16(0xFF8ACC) backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + [attr yy_setTextHighlightRange:[str rangeOfString:QXText(@"《隐私政策》")] color:QXConfig.themeColor backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(didClickAgreementLoginWithUrl:type:)]) { [weakSelf.delegate didClickAgreementLoginWithUrl:@"111" type:2]; } diff --git a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m index 2cf3cf8..e4d0c30 100644 --- a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m +++ b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m @@ -8,6 +8,7 @@ #import "QXGuildViewController.h" #import #import "QXUserHomePageViewController.h" +#import "QXRealNameViewController.h" static void *WKWebBrowserContext = &WKWebBrowserContext; @@ -119,6 +120,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; return; } [[QXGlobal shareGlobal] joinRoomWithRoomId:room_id isRejoin:NO navagationController:self.navigationController]; + }else if ([dict[@"action"] isEqualToString:@"enterAuthent"]) { + QXRealNameViewController *vc = [[QXRealNameViewController alloc] init]; + [self.navigationController pushViewController:vc animated:YES]; } diff --git a/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt.png b/QXLive/Other/Assets.xcassets/AppIcon.appiconset/iPadApp_76pt.png index f530f1b..9ff2631 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 d12e093..e6be1b4 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 36aa8ea..79463a4 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 dfff1bd..9f553b6 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 e5be181..615aef6 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 11862c7..0f10ed5 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 908fb6a..becb330 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 dfff1bd..9f553b6 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 d190fc9..7175d80 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 86411c5..7f96842 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 11c3eb2..6b40701 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 dfff1bd..9f553b6 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 63dfa06..dee6e55 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 908fb6a..becb330 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 ec008de..635e11c 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 d190fc9..7175d80 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 86411c5..7f96842 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 c7c23b9..33167c2 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 8be6582..221aaad 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" : "背景2@2x.png", + "filename" : "首页@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/app_bg.imageset/背景2@2x.png b/QXLive/Other/Assets.xcassets/app_bg.imageset/背景2@2x.png deleted file mode 100644 index 3d34e8b..0000000 Binary files a/QXLive/Other/Assets.xcassets/app_bg.imageset/背景2@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/app_bg.imageset/首页@2x.png b/QXLive/Other/Assets.xcassets/app_bg.imageset/首页@2x.png new file mode 100644 index 0000000..072a08b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_bg.imageset/首页@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json deleted file mode 100644 index ecbb49a..0000000 --- a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "app_home_bg@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png b/QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png deleted file mode 100644 index 5deca85..0000000 Binary files a/QXLive/Other/Assets.xcassets/app_home_bg.imageset/app_home_bg@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Contents.json b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Contents.json index 6bfdd3f..cf07bc1 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" : "排行榜@2x.png", + "filename" : "Group 27@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "排行榜@3x.png", + "filename" : "Group 27@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 27@2x.png b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 27@2x.png new file mode 100644 index 0000000..b5e71b6 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 27@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 27@3x.png b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 27@3x.png new file mode 100644 index 0000000..4e08058 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/Group 27@3x.png 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 deleted file mode 100644 index f2c9561..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@2x.png and /dev/null 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 deleted file mode 100644 index 6d18f6a..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_ranking.imageset/排行榜@3x.png and /dev/null 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 748c407..95ddaef 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" : "编组 4@2x.png", + "filename" : "Group 26@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "编组 4@3x.png", + "filename" : "Group 26@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_room.imageset/Group 26@2x.png b/QXLive/Other/Assets.xcassets/home/home_room.imageset/Group 26@2x.png new file mode 100644 index 0000000..eb7c129 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_room.imageset/Group 26@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_room.imageset/Group 26@3x.png b/QXLive/Other/Assets.xcassets/home/home_room.imageset/Group 26@3x.png new file mode 100644 index 0000000..f200ce7 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_room.imageset/Group 26@3x.png 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 deleted file mode 100644 index e2452db..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@2x.png and /dev/null 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 deleted file mode 100644 index cf9dbfb..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_room.imageset/编组 4@3x.png and /dev/null 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 15e4379..575adc4 100644 --- a/QXLive/Other/Assets.xcassets/home/home_search.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/home/home_search.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "搜索@2x.png", + "filename" : "Frame 1@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "搜索@3x.png", + "filename" : "Frame 1@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/home/home_search.imageset/Frame 1@2x.png b/QXLive/Other/Assets.xcassets/home/home_search.imageset/Frame 1@2x.png new file mode 100644 index 0000000..2ce191b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_search.imageset/Frame 1@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/home/home_search.imageset/Frame 1@3x.png b/QXLive/Other/Assets.xcassets/home/home_search.imageset/Frame 1@3x.png new file mode 100644 index 0000000..9447a67 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/home/home_search.imageset/Frame 1@3x.png 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 deleted file mode 100644 index aa329ed..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@2x.png and /dev/null 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 deleted file mode 100644 index 4e7db5b..0000000 Binary files a/QXLive/Other/Assets.xcassets/home/home_search.imageset/搜索@3x.png and /dev/null 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 88244db..b3ec00a 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" : "协议已勾选@2x.png", + "filename" : "Group 6883@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "协议已勾选@3x.png", + "filename" : "Group 6883@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 new file mode 100644 index 0000000..9f22f0a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Group 6883@2x.png 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 new file mode 100644 index 0000000..be55d23 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/Group 6883@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@2x.png b/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@2x.png deleted file mode 100644 index 00d80c2..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@2x.png and /dev/null 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 deleted file mode 100644 index bbbef18..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_agreement_sel.imageset/协议已勾选@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/00@2x.png b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/00@2x.png new file mode 100644 index 0000000..134e772 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/00@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json index 74e9be7..8832e99 100644 --- a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "iPadProApp_83.5pt@2x.png", + "filename" : "00@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/iPadProApp_83.5pt@2x.png b/QXLive/Other/Assets.xcassets/login/login_logo.imageset/iPadProApp_83.5pt@2x.png deleted file mode 100644 index e5be181..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/login_logo.imageset/iPadProApp_83.5pt@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Contents.json b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Contents.json index f3f3de2..0a920f4 100644 --- a/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "mi_di@2x.png", + "filename" : "Group 7743@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "mi_di@3x.png", + "filename" : "Group 7743@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Group 7743@2x.png b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Group 7743@2x.png new file mode 100644 index 0000000..f0f2bc0 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Group 7743@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Group 7743@3x.png b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Group 7743@3x.png new file mode 100644 index 0000000..42a85c1 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/login/mi_di.imageset/Group 7743@3x.png differ 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 deleted file mode 100644 index b0376ad..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/mi_di.imageset/mi_di@2x.png and /dev/null 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 deleted file mode 100644 index 109de8f..0000000 Binary files a/QXLive/Other/Assets.xcassets/login/mi_di.imageset/mi_di@3x.png and /dev/null 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 df0b050..5c4d3b1 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" : "动态未选中@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "动态未选中@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Frame@2x.png new file mode 100644 index 0000000..45ce487 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Frame@3x.png new file mode 100644 index 0000000..67d992d Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/Frame@3x.png 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 deleted file mode 100644 index 34654a1..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/动态未选中@2x.png and /dev/null 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 deleted file mode 100644 index f61fee3..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_nor.imageset/动态未选中@3x.png and /dev/null 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 4184327..5c4d3b1 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" : "动态已选中@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "动态已选中@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Frame@2x.png new file mode 100644 index 0000000..a37bf18 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Frame@3x.png new file mode 100644 index 0000000..3336f47 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/Frame@3x.png 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 deleted file mode 100644 index 5fd97e0..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/动态已选中@2x.png and /dev/null 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 deleted file mode 100644 index a5d5abc..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_find_sel.imageset/动态已选中@3x.png and /dev/null 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 5fbd4eb..5c4d3b1 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" : "首页未选中@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "首页未选中@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Frame@2x.png new file mode 100644 index 0000000..0222aef Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Frame@3x.png new file mode 100644 index 0000000..5d905e5 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/Frame@3x.png 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 deleted file mode 100644 index b7a2b49..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/首页未选中@2x.png and /dev/null 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 deleted file mode 100644 index ec0697b..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_nor.imageset/首页未选中@3x.png and /dev/null 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 8df779c..5c4d3b1 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" : "首页已选中@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "首页已选中@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Frame@2x.png new file mode 100644 index 0000000..3ff9f74 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Frame@3x.png new file mode 100644 index 0000000..acfe1db Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/Frame@3x.png 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 deleted file mode 100644 index c81f6b6..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/首页已选中@2x.png and /dev/null 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 deleted file mode 100644 index 6b0ecec..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_home_sel.imageset/首页已选中@3x.png and /dev/null 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 00fb9f6..5c4d3b1 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" : "我的未选中@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "我的未选中@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Frame@2x.png new file mode 100644 index 0000000..e4363ae Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Frame@3x.png new file mode 100644 index 0000000..12698e2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/Frame@3x.png 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 deleted file mode 100644 index a2e972f..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/我的未选中@2x.png and /dev/null 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 deleted file mode 100644 index fbd9072..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_nor.imageset/我的未选中@3x.png and /dev/null 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 ff086d6..5c4d3b1 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" : "我的已选中@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "我的已选中@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Frame@2x.png new file mode 100644 index 0000000..ffe7c01 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Frame@3x.png new file mode 100644 index 0000000..d9f243e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/Frame@3x.png 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 deleted file mode 100644 index b547049..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/我的已选中@2x.png and /dev/null 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 deleted file mode 100644 index 8daa2ed..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_me_sel.imageset/我的已选中@3x.png and /dev/null 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 a3265cb..5c4d3b1 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" : "消息未选中@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "消息未选中@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Frame@2x.png new file mode 100644 index 0000000..7b42ca2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Frame@3x.png new file mode 100644 index 0000000..d3f7733 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/Frame@3x.png 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 deleted file mode 100644 index 4677144..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/消息未选中@2x.png and /dev/null 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 deleted file mode 100644 index cd47f91..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_nor.imageset/消息未选中@3x.png and /dev/null 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 739b16e..5c4d3b1 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" : "消息已选中@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "消息已选中@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Frame@2x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Frame@2x.png new file mode 100644 index 0000000..fd43d09 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Frame@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Frame@3x.png b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Frame@3x.png new file mode 100644 index 0000000..bb088ac Binary files /dev/null and b/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/Frame@3x.png 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 deleted file mode 100644 index 1989504..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/消息已选中@2x.png and /dev/null 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 deleted file mode 100644 index ce357a2..0000000 Binary files a/QXLive/Other/Assets.xcassets/tabbar/qx_tabbar_message_sel.imageset/消息已选中@3x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/Contents.json b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/Contents.json index 416a255..4de5b9f 100644 --- a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "iPhoneApp_60pt@2x.png", + "filename" : "iPhoneApp_60pt@3x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@2x.png b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@2x.png deleted file mode 100644 index 86411c5..0000000 Binary files a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@3x.png b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@3x.png new file mode 100644 index 0000000..6b40701 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/user_header_placehoulder.imageset/iPhoneApp_60pt@3x.png differ diff --git a/QXLive/Other/Base.lproj/LaunchScreen.storyboard b/QXLive/Other/Base.lproj/LaunchScreen.storyboard index a3a683a..3466fe2 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/NoitceAndKey.h b/QXLive/Other/NoitceAndKey.h index f3bd848..ce1105e 100644 --- a/QXLive/Other/NoitceAndKey.h +++ b/QXLive/Other/NoitceAndKey.h @@ -66,7 +66,7 @@ static NSInteger const AppPushId = 46163; static NSString *const AgoraAuthId = @"a3f0f0c78307434fa1c697c3429fbdcf"; //一键登录AuthSDKInfo -static NSString *const AuthSDKKey = @"Qyj6q/o52PnGW8NJE48dN4ha+0KWDVyuF05Xj9HRV85u8YBs4xIkelP44/5xEv3+cMVs5aDf5/1ESuDp6rWq3tcbDoaUSaNya8S31LDrNfajmXBRucTnIpfp02T2NWjzQmKrhQVJUwH2UWp3p63fxfxE7AzA38qKtqjXKPWt+pqeeMO6lBzB0jrZv+aGPj4IsEdVw0lAW4yO0QPqKORWJNHQgEbB4sWl17Ryby4UzYzHc4gN6kAJh74ickyuKp3j"; +static NSString *const AuthSDKKey = @"d2THp+rY5v5iPoFJfm1DDZWnISeZEm3YA0ZSAQXvIqhN1mnzmMX+jij9yANzQUbGjFR7phy8Ea3ciO78estkkMSqqfOlFOiJ+nfjqMR3UlGTD85NyF595Xes6XHbUssE9NOlAHM3D5iCUcOyOuW/8aoeoNLtusv3MHKS/LVcHPJw0V5OD9ojvRTKOhrlo3m3p8EsC29iuwq7eUe8Fqvr0vn2+nxhlH7KSFVG1SGV3fOlFSBnT9zz9sT+yUy+ED0K"; #endif /// 声网 @@ -79,9 +79,9 @@ static NSString *const kUserLoginData = @"LoginData"; //阿里云文件上传 -static NSString *const OSS_BUCKET_NAME = @"midi01"; -static NSString *const OSSAccessKeyId = @"LTAI5tKgrfcFQxH46ZwWYgFW"; -static NSString *const OSSAccessKeySecret = @"ZOjTqAJmUL563EKFKySrUwAHtx4hKt"; +static NSString *const OSS_BUCKET_NAME = @"myyuliao"; +static NSString *const OSSAccessKeyId = @"LTAI5tPBEux6EFkknyNbcDGK"; +static NSString *const OSSAccessKeySecret = @"3pPqhBsF6y6O3q4euKg7MUOvKK7CYZ"; static NSString *const OSSEndPoint = @"oss-cn-beijing.aliyuncs.com"; diff --git a/QXLive/Other/QXApi.h b/QXLive/Other/QXApi.h index 0639ed8..f4adbda 100644 --- a/QXLive/Other/QXApi.h +++ b/QXLive/Other/QXApi.h @@ -19,8 +19,8 @@ static NSString* ServerUrl = @"https://tmd.xscmmidi.site/"; static NSString* H5ServerUrl = @"https://tmdh.xscmmidi.site/"; #else -static NSString* ServerUrl = @"https://md.xscmmidi.site/"; -static NSString* H5ServerUrl = @"https://md.xscmmidi.site/h5/"; +static NSString* ServerUrl = @"http://my.qixing2.top/"; +static NSString* H5ServerUrl = @"http://myh5.qixing2.top"; #endif #pragma mark - 引导页 /// 引导页 diff --git a/QXLive/Other/app_start_midi1.png b/QXLive/Other/app_start_midi1.png deleted file mode 100644 index 3dc0187..0000000 Binary files a/QXLive/Other/app_start_midi1.png and /dev/null differ diff --git a/QXLive/Other/app_start_myyuyin.png b/QXLive/Other/app_start_myyuyin.png new file mode 100644 index 0000000..a6641b1 Binary files /dev/null and b/QXLive/Other/app_start_myyuyin.png differ diff --git a/QXLive/Tabbar/QXTabbarController.m b/QXLive/Tabbar/QXTabbarController.m index 1337bad..7718e8e 100644 --- a/QXLive/Tabbar/QXTabbarController.m +++ b/QXLive/Tabbar/QXTabbarController.m @@ -177,7 +177,7 @@ // } QXTabbarConfig *config = [QXTabbarConfig shareInstance]; config.imageOffset = -5; - QXTabBar *customTabBar = [[QXTabBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, TabbarContentHeight) centerCustom:NO config:config]; + QXTabBar *customTabBar = [[QXTabBar alloc] initWithFrame:CGRectMake(15, 0, SCREEN_WIDTH-30, 50) centerCustom:NO config:config]; customTabBar.backgroundColor = [UIColor whiteColor]; customTabBar.layer.shadowColor = [UIColor grayColor].CGColor; customTabBar.layer.shadowOpacity = 0.5; @@ -185,8 +185,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/活动/天空之境/QXSkyPraizeRuleView.m b/QXLive/活动/天空之境/QXSkyPraizeRuleView.m index d6a1522..184bd6f 100644 --- a/QXLive/活动/天空之境/QXSkyPraizeRuleView.m +++ b/QXLive/活动/天空之境/QXSkyPraizeRuleView.m @@ -98,9 +98,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; //开启手势触摸 默认设置就是NO。在ios8系统中会导致手势问题，程序崩溃 _contentWebView.allowsBackForwardNavigationGestures = YES; } - _contentWebView = [[WKWebView alloc] initWithFrame:CGRectMake(25, self.ruleImageView.bottom, self.width-16*2, self.bgView.height-self.ruleImageView.bottom) configuration:configuration]; - _contentWebView.backgroundColor = [UIColor clearColor]; - [_contentWebView addRoundedCornersWithRadius:16]; + _contentWebView = [[WKWebView alloc] initWithFrame:CGRectMake(16, self.ruleImageView.bottom+12, self.width-16*2, self.bgView.height-self.ruleImageView.bottom-12) configuration:configuration]; + _contentWebView.backgroundColor = RGB16A(0x000000, 0.5); + [_contentWebView addRoundedCornersWithRadius:6]; _contentWebView.opaque = NO; //适应你设定的尺寸 [_contentWebView sizeToFit]; diff --git a/QXLive/活动/岁月之城/QXAgePraizeRuleView.m b/QXLive/活动/岁月之城/QXAgePraizeRuleView.m index 15d8970..7bbe7b6 100644 --- a/QXLive/活动/岁月之城/QXAgePraizeRuleView.m +++ b/QXLive/活动/岁月之城/QXAgePraizeRuleView.m @@ -47,7 +47,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; self.ruleImageView.frame = CGRectMake((SCREEN_WIDTH-ScaleWidth(164))/2, 0, ScaleWidth(164), ScaleWidth(90)); [self.bgView addSubview:self.ruleImageView]; - [self addSubview:self.contentWebView]; + [self.bgView addSubview:self.contentWebView]; @@ -98,9 +98,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; //开启手势触摸 默认设置就是NO。在ios8系统中会导致手势问题，程序崩溃 _contentWebView.allowsBackForwardNavigationGestures = YES; } - _contentWebView = [[WKWebView alloc] initWithFrame:CGRectMake(25, self.ruleImageView.bottom, self.width-16*2, self.bgView.height-self.ruleImageView.bottom) configuration:configuration]; - _contentWebView.backgroundColor = [UIColor clearColor]; - [_contentWebView addRoundedCornersWithRadius:16]; + _contentWebView = [[WKWebView alloc] initWithFrame:CGRectMake(16, self.ruleImageView.bottom+12, self.width-16*2, self.bgView.height-self.ruleImageView.bottom-12) configuration:configuration]; + _contentWebView.backgroundColor = RGB16A(0x000000, 0.5); + [_contentWebView addRoundedCornersWithRadius:6]; _contentWebView.opaque = NO; //适应你设定的尺寸 [_contentWebView sizeToFit]; diff --git a/QXLive/活动/巡乐会/QXMeetActivityRuleView.m b/QXLive/活动/巡乐会/QXMeetActivityRuleView.m index 3f5d0d8..9f6077d 100644 --- a/QXLive/活动/巡乐会/QXMeetActivityRuleView.m +++ b/QXLive/活动/巡乐会/QXMeetActivityRuleView.m @@ -98,9 +98,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; //开启手势触摸 默认设置就是NO。在ios8系统中会导致手势问题，程序崩溃 _contentWebView.allowsBackForwardNavigationGestures = YES; } - _contentWebView = [[WKWebView alloc] initWithFrame:CGRectMake(25, self.ruleImageView.bottom, self.width-16*2, self.bgView.height-self.ruleImageView.bottom) configuration:configuration]; - _contentWebView.backgroundColor = [UIColor clearColor]; - [_contentWebView addRoundedCornersWithRadius:16]; + _contentWebView = [[WKWebView alloc] initWithFrame:CGRectMake(16, self.ruleImageView.bottom+12, self.width-16*2, self.bgView.height-self.ruleImageView.bottom-12) configuration:configuration]; + _contentWebView.backgroundColor = RGB16A(0x000000, 0.5); + [_contentWebView addRoundedCornersWithRadius:6]; _contentWebView.opaque = NO; //适应你设定的尺寸 [_contentWebView sizeToFit]; diff --git a/QXLive/活动/时空之巅/QXTimePraizeRuleView.m b/QXLive/活动/时空之巅/QXTimePraizeRuleView.m index d6d1bcf..b374ae5 100644 --- a/QXLive/活动/时空之巅/QXTimePraizeRuleView.m +++ b/QXLive/活动/时空之巅/QXTimePraizeRuleView.m @@ -98,9 +98,9 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; //开启手势触摸 默认设置就是NO。在ios8系统中会导致手势问题，程序崩溃 _contentWebView.allowsBackForwardNavigationGestures = YES; } - _contentWebView = [[WKWebView alloc] initWithFrame:CGRectMake(25, self.ruleImageView.bottom, self.width-16*2, self.bgView.height-self.ruleImageView.bottom) configuration:configuration]; - _contentWebView.backgroundColor = [UIColor clearColor]; - [_contentWebView addRoundedCornersWithRadius:16]; + _contentWebView = [[WKWebView alloc] initWithFrame:CGRectMake(16, self.ruleImageView.bottom+12, self.width-16*2, self.bgView.height-self.ruleImageView.bottom-12) configuration:configuration]; + _contentWebView.backgroundColor = RGB16A(0x000000, 0.5); + [_contentWebView addRoundedCornersWithRadius:6]; _contentWebView.opaque = NO; //适应你设定的尺寸 [_contentWebView sizeToFit]; diff --git a/TUIKit/TUIChat/UI_Classic/Input/TUIInputBar.m b/TUIKit/TUIChat/UI_Classic/Input/TUIInputBar.m index 8bf5876..99fde1c 100644 --- a/TUIKit/TUIChat/UI_Classic/Input/TUIInputBar.m +++ b/TUIKit/TUIChat/UI_Classic/Input/TUIInputBar.m @@ -358,7 +358,10 @@ NSString *title = [NSString stringWithFormat:@"充值不足%@元，您无法发送消息",canChatMoney]; UIAlertController *al = [UIAlertController alertControllerWithTitle:title message:@"" preferredStyle:(UIAlertControllerStyleAlert)]; [al addAction:[UIAlertAction actionWithTitle:@"去充值" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) { - [na pushViewController:[[NSClassFromString(@"QXRechargeViewcController") alloc] init] animated:YES]; + UIViewController *vc = [[NSClassFromString(@"QXRechargeViewcController") alloc] init]; + UINavigationController *naV = [[UINavigationController alloc] initWithRootViewController:vc]; + naV.modalPresentationStyle = UIModalPresentationFullScreen; + [na presentViewController:naV animated:YES completion:nil]; }]]; [al addAction:[UIAlertAction actionWithTitle:@"取消" style:(UIAlertActionStyleCancel) handler:^(UIAlertAction * _Nonnull action) {