Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DrWater
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
路少雄
DrWater
Commits
df583735
Commit
df583735
authored
Jun 15, 2024
by
路少雄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h5bug
parent
34c4dbb7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
4 deletions
+56
-4
DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+32
-0
DJMHomeTY/Global/Base/Controller/XHCustomTabBarController.m
+18
-2
DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m
+6
-2
No files found.
DJMHomeTY.xcworkspace/xcuserdata/lushaoxiong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @
df583735
...
...
@@ -253,5 +253,37 @@
</Locations>
</BreakpointContent>
</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>
</Bucket>
DJMHomeTY/Global/Base/Controller/XHCustomTabBarController.m
View file @
df583735
...
...
@@ -9,7 +9,7 @@
#import "XHCustomTabBarController.h"
#import "XHUINavigationController.h"
#import "XHTabBar.h"
#import "DXBannerVC.h"
@interface
XHCustomTabBarController
()
<
UITabBarControllerDelegate
,
XHTabBarDelegate
>
@property
(
nonatomic
,
weak
)
UIImageView
*
lineView
;
@end
...
...
@@ -22,7 +22,7 @@
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
NO
;
}
// self.delegate = self;
XHTabBar
*
tabBar
=
[[
XHTabBar
alloc
]
init
];
tabBar
.
tabBarDelegate
=
self
;
[
self
setValue
:
tabBar
forKeyPath
:
@"tabBar"
];
...
...
@@ -275,4 +275,20 @@
[
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
DJMHomeTY/Page/DeviceListPage/Controller/DXDeviceListVC.m
View file @
df583735
...
...
@@ -14,6 +14,7 @@
#import "DXBannerVC.h"
#import "DXHotElectricVC.h"
#import "DXAddBannerVC.h"
#import "XHUINavigationController.h"
static
NSString
*
dxmachineCell
=
@"DXDeviceListCell"
;
@interface
DXDeviceListVC
()
<
UITableViewDelegate
,
UITableViewDataSource
,
XHCountDownButtonDelegate
,
DXDeviceListCellDelegate
>
...
...
@@ -119,9 +120,12 @@ static NSString *dxmachineCell = @"DXDeviceListCell";
// [weakSelf.navigationController pushViewController:banner animated:YES];
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
.
hidesBottomBarWhenPushed
=
YES
;
//
banner.hidesBottomBarWhenPushed = YES;
[
weakSelf
.
tabBarController
setSelectedIndex
:
1
];
}
else
{
DXAddBannerVC
*
banner
=
[
DXAddBannerVC
new
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment