Commit df583735 by 路少雄

h5bug

parent 34c4dbb7
...@@ -253,5 +253,37 @@ ...@@ -253,5 +253,37 @@
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "542E4238-3B5E-4B7E-A75E-07C96F5A221D"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
endingLineNumber = "109"
landmarkName = "-setUrl:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8857F1C6-D9ED-49C4-A9C7-B25BAB5BD8C2"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DJMHomeTY/Page/DeviceListPage/Controller/DXBannerVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "95"
endingLineNumber = "95"
landmarkName = "-requestData"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#import "XHCustomTabBarController.h" #import "XHCustomTabBarController.h"
#import "XHUINavigationController.h" #import "XHUINavigationController.h"
#import "XHTabBar.h" #import "XHTabBar.h"
#import "DXBannerVC.h"
@interface XHCustomTabBarController ()<UITabBarControllerDelegate,XHTabBarDelegate> @interface XHCustomTabBarController ()<UITabBarControllerDelegate,XHTabBarDelegate>
@property (nonatomic, weak) UIImageView *lineView; @property (nonatomic, weak) UIImageView *lineView;
@end @end
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) { if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = NO; self.navigationController.interactivePopGestureRecognizer.enabled = NO;
} }
// self.delegate = self;
XHTabBar *tabBar = [[XHTabBar alloc] init]; XHTabBar *tabBar = [[XHTabBar alloc] init];
tabBar.tabBarDelegate = self; tabBar.tabBarDelegate = self;
[self setValue:tabBar forKeyPath:@"tabBar"]; [self setValue:tabBar forKeyPath:@"tabBar"];
...@@ -275,4 +275,20 @@ ...@@ -275,4 +275,20 @@
[self presentViewController:alercConteoller animated:YES completion:nil]; [self presentViewController:alercConteoller animated:YES completion:nil];
} }
} }
- (void)tabBar:(UITabBar *)tabBar didSelectItem:(UITabBarItem *)item
{
// NSLog(@"%@%@",tabBar,item);
// XHUINavigationController *bannerNav = self.viewControllers[1];
//
// DXBannerVC *banner = bannerNav.viewControllers[0];
// banner.url = XHGetDataManager.giftLink;
// banner.hidesBottomBarWhenPushed = YES;
// [weakSelf.tabBarController setSelectedIndex:1];
}
@end @end
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#import "DXBannerVC.h" #import "DXBannerVC.h"
#import "DXHotElectricVC.h" #import "DXHotElectricVC.h"
#import "DXAddBannerVC.h" #import "DXAddBannerVC.h"
#import "XHUINavigationController.h"
static NSString *dxmachineCell = @"DXDeviceListCell"; static NSString *dxmachineCell = @"DXDeviceListCell";
@interface DXDeviceListVC ()<UITableViewDelegate,UITableViewDataSource,XHCountDownButtonDelegate,DXDeviceListCellDelegate> @interface DXDeviceListVC ()<UITableViewDelegate,UITableViewDataSource,XHCountDownButtonDelegate,DXDeviceListCellDelegate>
...@@ -119,9 +120,12 @@ static NSString *dxmachineCell = @"DXDeviceListCell"; ...@@ -119,9 +120,12 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
// [weakSelf.navigationController pushViewController:banner animated:YES]; // [weakSelf.navigationController pushViewController:banner animated:YES];
if ([weakSelf.linkArray[index] containsString:@"is_tab_true"]) { if ([weakSelf.linkArray[index] containsString:@"is_tab_true"]) {
DXBannerVC *banner = [DXBannerVC new];
XHUINavigationController *bannerNav = weakSelf.tabBarController.viewControllers[1];
DXBannerVC *banner = bannerNav.viewControllers[0];
banner.url = weakSelf.linkArray[index]; banner.url = weakSelf.linkArray[index];
banner.hidesBottomBarWhenPushed = YES; // banner.hidesBottomBarWhenPushed = YES;
[weakSelf.tabBarController setSelectedIndex:1]; [weakSelf.tabBarController setSelectedIndex:1];
}else{ }else{
DXAddBannerVC *banner = [DXAddBannerVC new]; DXAddBannerVC *banner = [DXAddBannerVC new];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment