提交
This commit is contained in:
@@ -1197,7 +1197,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.3;
|
MARKETING_VERSION = 1.0.1;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||||
@@ -1257,7 +1257,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.3;
|
MARKETING_VERSION = 1.0.1;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||||
|
|||||||
Binary file not shown.
@@ -46,36 +46,6 @@
|
|||||||
endingLineNumber = "359"
|
endingLineNumber = "359"
|
||||||
landmarkName = "-jumpAli"
|
landmarkName = "-jumpAli"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
<Locations>
|
|
||||||
<Location
|
|
||||||
uuid = "C73F04F2-20BD-4D62-8B18-01BA7EE12A2D - e87b12e3e69b8e00"
|
|
||||||
shouldBeEnabled = "Yes"
|
|
||||||
ignoreCount = "0"
|
|
||||||
continueAfterRunningActions = "No"
|
|
||||||
symbolName = "__32-[QXLoginViewController jumpAli]_block_invoke"
|
|
||||||
moduleName = "QXLive.debug.dylib"
|
|
||||||
usesParentBreakpointCondition = "Yes"
|
|
||||||
urlString = "file:///Users/qixing/Desktop/%E9%A1%B9%E7%9B%AE/featherVoice/QXLive/Login(%E7%99%BB%E5%BD%95)/Controlller/QXLoginViewController.m"
|
|
||||||
startingColumnNumber = "9223372036854775807"
|
|
||||||
endingColumnNumber = "9223372036854775807"
|
|
||||||
startingLineNumber = "359"
|
|
||||||
endingLineNumber = "359">
|
|
||||||
</Location>
|
|
||||||
<Location
|
|
||||||
uuid = "C73F04F2-20BD-4D62-8B18-01BA7EE12A2D - aab4c5447adb06f3"
|
|
||||||
shouldBeEnabled = "Yes"
|
|
||||||
ignoreCount = "0"
|
|
||||||
continueAfterRunningActions = "No"
|
|
||||||
symbolName = "__32-[QXLoginViewController jumpAli]_block_invoke_3"
|
|
||||||
moduleName = "QXLive.debug.dylib"
|
|
||||||
usesParentBreakpointCondition = "Yes"
|
|
||||||
urlString = "file:///Users/qixing/Desktop/%E9%A1%B9%E7%9B%AE/featherVoice/QXLive/Login(%E7%99%BB%E5%BD%95)/Controlller/QXLoginViewController.m"
|
|
||||||
startingColumnNumber = "9223372036854775807"
|
|
||||||
endingColumnNumber = "9223372036854775807"
|
|
||||||
startingLineNumber = "360"
|
|
||||||
endingLineNumber = "360">
|
|
||||||
</Location>
|
|
||||||
</Locations>
|
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
<BreakpointProxy
|
<BreakpointProxy
|
||||||
@@ -124,36 +94,6 @@
|
|||||||
endingLineNumber = "58"
|
endingLineNumber = "58"
|
||||||
landmarkName = "-didClickLoginWithModel:"
|
landmarkName = "-didClickLoginWithModel:"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
<Locations>
|
|
||||||
<Location
|
|
||||||
uuid = "DABF50BC-FBFE-42F2-AED7-0F7E95F9A5C8 - 43bb2581d823569"
|
|
||||||
shouldBeEnabled = "Yes"
|
|
||||||
ignoreCount = "0"
|
|
||||||
continueAfterRunningActions = "No"
|
|
||||||
symbolName = "-[QXAccountListViewController didClickLoginWithModel:]"
|
|
||||||
moduleName = "QXLive.debug.dylib"
|
|
||||||
usesParentBreakpointCondition = "Yes"
|
|
||||||
urlString = "file:///Users/qixing/Desktop/%E9%A1%B9%E7%9B%AE/featherVoice/QXLive/Login(%E7%99%BB%E5%BD%95)/Controlller/QXAccountListViewController.m"
|
|
||||||
startingColumnNumber = "9223372036854775807"
|
|
||||||
endingColumnNumber = "9223372036854775807"
|
|
||||||
startingLineNumber = "58"
|
|
||||||
endingLineNumber = "58">
|
|
||||||
</Location>
|
|
||||||
<Location
|
|
||||||
uuid = "DABF50BC-FBFE-42F2-AED7-0F7E95F9A5C8 - d2db89f45ea4abdb"
|
|
||||||
shouldBeEnabled = "Yes"
|
|
||||||
ignoreCount = "0"
|
|
||||||
continueAfterRunningActions = "No"
|
|
||||||
symbolName = "__54-[QXAccountListViewController didClickLoginWithModel:]_block_invoke"
|
|
||||||
moduleName = "QXLive.debug.dylib"
|
|
||||||
usesParentBreakpointCondition = "Yes"
|
|
||||||
urlString = "file:///Users/qixing/Desktop/%E9%A1%B9%E7%9B%AE/featherVoice/QXLive/Login(%E7%99%BB%E5%BD%95)/Controlller/QXAccountListViewController.m"
|
|
||||||
startingColumnNumber = "9223372036854775807"
|
|
||||||
endingColumnNumber = "9223372036854775807"
|
|
||||||
startingLineNumber = "59"
|
|
||||||
endingLineNumber = "59">
|
|
||||||
</Location>
|
|
||||||
</Locations>
|
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
<BreakpointProxy
|
<BreakpointProxy
|
||||||
@@ -303,16 +243,16 @@
|
|||||||
<BreakpointProxy
|
<BreakpointProxy
|
||||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||||
<BreakpointContent
|
<BreakpointContent
|
||||||
uuid = "3AAA00BB-F5DB-49C2-AABF-FB165D0AA955"
|
uuid = "DACB8B97-5630-4374-941A-C783964BCA68"
|
||||||
shouldBeEnabled = "Yes"
|
shouldBeEnabled = "Yes"
|
||||||
ignoreCount = "0"
|
ignoreCount = "0"
|
||||||
continueAfterRunningActions = "No"
|
continueAfterRunningActions = "No"
|
||||||
filePath = "QXLive/Mine(音域)/Controller/设置/QXSettingViewController.m"
|
filePath = "QXLive/Network/QXRequest.m"
|
||||||
startingColumnNumber = "9223372036854775807"
|
startingColumnNumber = "9223372036854775807"
|
||||||
endingColumnNumber = "9223372036854775807"
|
endingColumnNumber = "9223372036854775807"
|
||||||
startingLineNumber = "132"
|
startingLineNumber = "262"
|
||||||
endingLineNumber = "132"
|
endingLineNumber = "262"
|
||||||
landmarkName = "-tableView:didSelectRowAtIndexPath:"
|
landmarkName = "-requestWithUrl:parameters:type:cachePolicy:success:cache:failure:"
|
||||||
landmarkType = "7">
|
landmarkType = "7">
|
||||||
</BreakpointContent>
|
</BreakpointContent>
|
||||||
</BreakpointProxy>
|
</BreakpointProxy>
|
||||||
|
|||||||
@@ -184,6 +184,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
-(void)joinRoomWithRoomId:(NSString *)roomId isRejoin:(BOOL)isRejoin navagationController:(UINavigationController *)navagationController{
|
-(void)joinRoomWithRoomId:(NSString *)roomId isRejoin:(BOOL)isRejoin navagationController:(UINavigationController *)navagationController{
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
navagationController = (QXBaseNavigationController*)KEYWINDOW.rootViewController;
|
navagationController = (QXBaseNavigationController*)KEYWINDOW.rootViewController;
|
||||||
navagationController.interactivePopGestureRecognizer.enabled = NO;
|
navagationController.interactivePopGestureRecognizer.enabled = NO;
|
||||||
if (_miniView) {
|
if (_miniView) {
|
||||||
|
|||||||
@@ -93,6 +93,10 @@
|
|||||||
}
|
}
|
||||||
#pragma mark - action
|
#pragma mark - action
|
||||||
-(void)pulishAction{
|
-(void)pulishAction{
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXPublishViewController *vc = [[QXPublishViewController alloc] init];
|
QXPublishViewController *vc = [[QXPublishViewController alloc] init];
|
||||||
MJWeakSelf
|
MJWeakSelf
|
||||||
vc.publishFinishBlock = ^{
|
vc.publishFinishBlock = ^{
|
||||||
|
|||||||
@@ -58,6 +58,10 @@
|
|||||||
[self.view addSubview:self.appStoreView];
|
[self.view addSubview:self.appStoreView];
|
||||||
MJWeakSelf
|
MJWeakSelf
|
||||||
self.appStoreView.userBlock = ^(QXUserHomeModel * _Nonnull user) {
|
self.appStoreView.userBlock = ^(QXUserHomeModel * _Nonnull user) {
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (user == nil) {
|
if (user == nil) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -103,6 +103,10 @@
|
|||||||
return cell;
|
return cell;
|
||||||
}
|
}
|
||||||
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
|
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXDynamicModel *model = self.dataArray[indexPath.row];
|
QXDynamicModel *model = self.dataArray[indexPath.row];
|
||||||
QXDynamicDetailViewController *vc = [[QXDynamicDetailViewController alloc] init];
|
QXDynamicDetailViewController *vc = [[QXDynamicDetailViewController alloc] init];
|
||||||
vc.model = model;
|
vc.model = model;
|
||||||
@@ -120,6 +124,10 @@
|
|||||||
return cell;
|
return cell;
|
||||||
}
|
}
|
||||||
-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
|
-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXTopicModel *model = self.hotTopicArray[indexPath.row];
|
QXTopicModel *model = self.hotTopicArray[indexPath.row];
|
||||||
QXToppicDynamicViewController *vc = [[QXToppicDynamicViewController alloc] init];
|
QXToppicDynamicViewController *vc = [[QXToppicDynamicViewController alloc] init];
|
||||||
vc.model = model;
|
vc.model = model;
|
||||||
|
|||||||
@@ -231,6 +231,10 @@
|
|||||||
[browser show];
|
[browser show];
|
||||||
}
|
}
|
||||||
- (IBAction)onFocus:(id)sender {
|
- (IBAction)onFocus:(id)sender {
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (self.model.room_id.intValue > 0) {
|
if (self.model.room_id.intValue > 0) {
|
||||||
// 去房间
|
// 去房间
|
||||||
[[QXGlobal shareGlobal] joinRoomWithRoomId:self.model.room_id isRejoin:NO navagationController:self.navigationController];
|
[[QXGlobal shareGlobal] joinRoomWithRoomId:self.model.room_id isRejoin:NO navagationController:self.navigationController];
|
||||||
@@ -241,6 +245,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
- (IBAction)commentAction:(id)sender {
|
- (IBAction)commentAction:(id)sender {
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
switch (self.cellType) {
|
switch (self.cellType) {
|
||||||
case QXDynamicListCellDetail:
|
case QXDynamicListCellDetail:
|
||||||
|
|
||||||
@@ -264,6 +272,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)onZan:(UIButton*)sender {
|
- (IBAction)onZan:(UIButton*)sender {
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
BOOL isLike = !sender.selected;
|
BOOL isLike = !sender.selected;
|
||||||
MJWeakSelf
|
MJWeakSelf
|
||||||
[QXDynamicNetwork likeDynamicWithId:self.model.id isLike:isLike successBlock:^(NSDictionary * _Nonnull dict) {
|
[QXDynamicNetwork likeDynamicWithId:self.model.id isLike:isLike successBlock:^(NSDictionary * _Nonnull dict) {
|
||||||
@@ -280,6 +292,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)onHomepage:(id)sender {
|
- (IBAction)onHomepage:(id)sender {
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (self.cellType == QXDynamicListCellHomePage) {
|
if (self.cellType == QXDynamicListCellHomePage) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -289,6 +305,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)onMore:(id)sender {
|
- (IBAction)onMore:(id)sender {
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXShareView *shareView = [[QXShareView alloc] init];
|
QXShareView *shareView = [[QXShareView alloc] init];
|
||||||
shareView.shareType = QXShareViewTypeFind;
|
shareView.shareType = QXShareViewTypeFind;
|
||||||
shareView.delegate = self;
|
shareView.delegate = self;
|
||||||
@@ -296,6 +316,10 @@
|
|||||||
[shareView showInView:KEYWINDOW];
|
[shareView showInView:KEYWINDOW];
|
||||||
}
|
}
|
||||||
- (IBAction)likeViewAction:(id)sender {
|
- (IBAction)likeViewAction:(id)sender {
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXDynamicLikeListView *listView = [[QXDynamicLikeListView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
|
QXDynamicLikeListView *listView = [[QXDynamicLikeListView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
|
||||||
listView.Id = self.model.id;
|
listView.Id = self.model.id;
|
||||||
listView.num = [NSString localizedStringWithFormat:QXText(@"已有%@人点赞"),self.zanBtn.titleLabel.text];
|
listView.num = [NSString localizedStringWithFormat:QXText(@"已有%@人点赞"),self.zanBtn.titleLabel.text];
|
||||||
@@ -346,6 +370,10 @@
|
|||||||
// al.tapDismiss = YES;
|
// al.tapDismiss = YES;
|
||||||
// al.popType = PopViewTypeBottomToUpActionSheet;
|
// al.popType = PopViewTypeBottomToUpActionSheet;
|
||||||
// self.sendView.vc = self.viewController;
|
// self.sendView.vc = self.viewController;
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
self.sendView.dynamicId = self.model.id;
|
self.sendView.dynamicId = self.model.id;
|
||||||
MJWeakSelf
|
MJWeakSelf
|
||||||
self.sendView.sendSuccessBlock = ^(NSString * _Nonnull dynamicId) {
|
self.sendView.sendSuccessBlock = ^(NSString * _Nonnull dynamicId) {
|
||||||
|
|||||||
@@ -288,6 +288,10 @@
|
|||||||
|
|
||||||
#pragma mark - SDCycleScrollViewDelegate
|
#pragma mark - SDCycleScrollViewDelegate
|
||||||
-(void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index{
|
-(void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index{
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXBanner *banner = self.bannerArry[index];
|
QXBanner *banner = self.bannerArry[index];
|
||||||
if ([banner.type isEqualToString:@"2"]) {
|
if ([banner.type isEqualToString:@"2"]) {
|
||||||
QXBaseWebViewController *webVc = [[QXBaseWebViewController alloc] init];
|
QXBaseWebViewController *webVc = [[QXBaseWebViewController alloc] init];
|
||||||
@@ -304,14 +308,26 @@
|
|||||||
|
|
||||||
|
|
||||||
-(void)gotoRoom{
|
-(void)gotoRoom{
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXMyRoomViewController *vc = [[QXMyRoomViewController alloc] init];
|
QXMyRoomViewController *vc = [[QXMyRoomViewController alloc] init];
|
||||||
[self.navigationController pushViewController:vc animated:YES];
|
[self.navigationController pushViewController:vc animated:YES];
|
||||||
}
|
}
|
||||||
-(void)gotoSearchVC{
|
-(void)gotoSearchVC{
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXSearchViewController *vc = [[QXSearchViewController alloc] init];
|
QXSearchViewController *vc = [[QXSearchViewController alloc] init];
|
||||||
[self.navigationController pushViewController:vc animated:YES];
|
[self.navigationController pushViewController:vc animated:YES];
|
||||||
}
|
}
|
||||||
-(void)gotoRankVC{
|
-(void)gotoRankVC{
|
||||||
|
if (!QXGlobal.shareGlobal.isLogin) {
|
||||||
|
[[QXGlobal shareGlobal] logOut];
|
||||||
|
return;
|
||||||
|
}
|
||||||
QXRankHomeVC *vc = [[QXRankHomeVC alloc] init];
|
QXRankHomeVC *vc = [[QXRankHomeVC alloc] init];
|
||||||
[self.navigationController pushViewController:vc animated:YES];
|
[self.navigationController pushViewController:vc animated:YES];
|
||||||
}
|
}
|
||||||
@@ -385,7 +401,7 @@
|
|||||||
-(SDCycleScrollView *)bannerScrollView{
|
-(SDCycleScrollView *)bannerScrollView{
|
||||||
if (!_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, SCREEN_WIDTH-32, ScaleWidth(95)) delegate:self placeholderImage:nil];
|
||||||
// _bannerScrollView.backgroundColor = [UIColor redColor];
|
_bannerScrollView.backgroundColor = [UIColor clearColor];
|
||||||
_bannerScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
|
_bannerScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill;
|
||||||
[_bannerScrollView addRoundedCornersWithRadius:8] ;
|
[_bannerScrollView addRoundedCornersWithRadius:8] ;
|
||||||
_bannerScrollView.delegate = self;
|
_bannerScrollView.delegate = self;
|
||||||
|
|||||||
Reference in New Issue
Block a user