diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 6b32545..709c9ad 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -1197,7 +1197,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1257,7 +1257,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; 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 448a8c0..49ddddd 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 c18bedf..2247d38 100644 --- a/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/QXLive.xcworkspace/xcuserdata/qixing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -46,36 +46,6 @@ endingLineNumber = "359" landmarkName = "-jumpAli" landmarkType = "7"> - - - - - - - - - - - - diff --git a/QXLive/Base/QXGlobal.m b/QXLive/Base/QXGlobal.m index 369f6de..d81e1aa 100644 --- a/QXLive/Base/QXGlobal.m +++ b/QXLive/Base/QXGlobal.m @@ -184,6 +184,10 @@ } -(void)joinRoomWithRoomId:(NSString *)roomId isRejoin:(BOOL)isRejoin navagationController:(UINavigationController *)navagationController{ + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } navagationController = (QXBaseNavigationController*)KEYWINDOW.rootViewController; navagationController.interactivePopGestureRecognizer.enabled = NO; if (_miniView) { diff --git a/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m b/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m index d4957ea..39b6873 100644 --- a/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m +++ b/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m @@ -93,6 +93,10 @@ } #pragma mark - action -(void)pulishAction{ + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXPublishViewController *vc = [[QXPublishViewController alloc] init]; MJWeakSelf vc.publishFinishBlock = ^{ diff --git a/QXLive/Dynamic(语圈)/Controller/QXExpansionViewController.m b/QXLive/Dynamic(语圈)/Controller/QXExpansionViewController.m index b2cbf67..94c8a31 100644 --- a/QXLive/Dynamic(语圈)/Controller/QXExpansionViewController.m +++ b/QXLive/Dynamic(语圈)/Controller/QXExpansionViewController.m @@ -58,6 +58,10 @@ [self.view addSubview:self.appStoreView]; MJWeakSelf self.appStoreView.userBlock = ^(QXUserHomeModel * _Nonnull user) { + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } if (user == nil) { return; } diff --git a/QXLive/Dynamic(语圈)/Controller/QXFindViewController.m b/QXLive/Dynamic(语圈)/Controller/QXFindViewController.m index cbdf773..26bc7e3 100644 --- a/QXLive/Dynamic(语圈)/Controller/QXFindViewController.m +++ b/QXLive/Dynamic(语圈)/Controller/QXFindViewController.m @@ -103,6 +103,10 @@ return cell; } -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXDynamicModel *model = self.dataArray[indexPath.row]; QXDynamicDetailViewController *vc = [[QXDynamicDetailViewController alloc] init]; vc.model = model; @@ -120,6 +124,10 @@ return cell; } -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXTopicModel *model = self.hotTopicArray[indexPath.row]; QXToppicDynamicViewController *vc = [[QXToppicDynamicViewController alloc] init]; vc.model = model; diff --git a/QXLive/Dynamic(语圈)/View/QXDynamicListCell.m b/QXLive/Dynamic(语圈)/View/QXDynamicListCell.m index eb57f44..9e6677e 100755 --- a/QXLive/Dynamic(语圈)/View/QXDynamicListCell.m +++ b/QXLive/Dynamic(语圈)/View/QXDynamicListCell.m @@ -231,6 +231,10 @@ [browser show]; } - (IBAction)onFocus:(id)sender { + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } if (self.model.room_id.intValue > 0) { // 去房间 [[QXGlobal shareGlobal] joinRoomWithRoomId:self.model.room_id isRejoin:NO navagationController:self.navigationController]; @@ -241,6 +245,10 @@ } } - (IBAction)commentAction:(id)sender { + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } switch (self.cellType) { case QXDynamicListCellDetail: @@ -264,6 +272,10 @@ } - (IBAction)onZan:(UIButton*)sender { + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } BOOL isLike = !sender.selected; MJWeakSelf [QXDynamicNetwork likeDynamicWithId:self.model.id isLike:isLike successBlock:^(NSDictionary * _Nonnull dict) { @@ -280,6 +292,10 @@ } - (IBAction)onHomepage:(id)sender { + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } if (self.cellType == QXDynamicListCellHomePage) { return; } @@ -289,6 +305,10 @@ } - (IBAction)onMore:(id)sender { + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXShareView *shareView = [[QXShareView alloc] init]; shareView.shareType = QXShareViewTypeFind; shareView.delegate = self; @@ -296,6 +316,10 @@ [shareView showInView:KEYWINDOW]; } - (IBAction)likeViewAction:(id)sender { + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXDynamicLikeListView *listView = [[QXDynamicLikeListView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)]; listView.Id = self.model.id; listView.num = [NSString localizedStringWithFormat:QXText(@"已有%@人点赞"),self.zanBtn.titleLabel.text]; @@ -346,6 +370,10 @@ // al.tapDismiss = YES; // al.popType = PopViewTypeBottomToUpActionSheet; // self.sendView.vc = self.viewController; + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } self.sendView.dynamicId = self.model.id; MJWeakSelf self.sendView.sendSuccessBlock = ^(NSString * _Nonnull dynamicId) { diff --git a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m index 4732439..5ed62ee 100644 --- a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m +++ b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m @@ -288,6 +288,10 @@ #pragma mark - SDCycleScrollViewDelegate -(void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index{ + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXBanner *banner = self.bannerArry[index]; if ([banner.type isEqualToString:@"2"]) { QXBaseWebViewController *webVc = [[QXBaseWebViewController alloc] init]; @@ -304,14 +308,26 @@ -(void)gotoRoom{ + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXMyRoomViewController *vc = [[QXMyRoomViewController alloc] init]; [self.navigationController pushViewController:vc animated:YES]; } -(void)gotoSearchVC{ + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXSearchViewController *vc = [[QXSearchViewController alloc] init]; [self.navigationController pushViewController:vc animated:YES]; } -(void)gotoRankVC{ + if (!QXGlobal.shareGlobal.isLogin) { + [[QXGlobal shareGlobal] logOut]; + return; + } QXRankHomeVC *vc = [[QXRankHomeVC alloc] init]; [self.navigationController pushViewController:vc animated:YES]; } @@ -385,7 +401,7 @@ -(SDCycleScrollView *)bannerScrollView{ if (!_bannerScrollView) { _bannerScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectMake(16, self.cycleScrollView.bottom, SCREEN_WIDTH-32, ScaleWidth(95)) delegate:self placeholderImage:nil]; -// _bannerScrollView.backgroundColor = [UIColor redColor]; + _bannerScrollView.backgroundColor = [UIColor clearColor]; _bannerScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; [_bannerScrollView addRoundedCornersWithRadius:8] ; _bannerScrollView.delegate = self; diff --git a/README.md b/README.md index 38fa8b8..3640e9d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ -# featherVoice - +#featherVoice