Commit 7aa8dd224bca75765a7e435b63b6e1c47ff3b358
1 parent
9e9ded23
no message
Showing
12 changed files
with
4 additions
and
3 deletions
CNLiveCustomControl.podspec
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | |
| 9 | 9 | Pod::Spec.new do |s| |
| 10 | 10 | s.name = 'CNLiveCustomControl' |
| 11 | - s.version = '0.0.1' | |
| 11 | + s.version = '0.0.2' | |
| 12 | 12 | s.summary = 'CNLiveCustomControl' |
| 13 | 13 | |
| 14 | 14 | # This description is used to generate tags and improve search results. |
| ... | ... | @@ -41,7 +41,8 @@ TODO: 网家家-自定义控件. |
| 41 | 41 | s.subspec 'NavigationBar' do |ss| |
| 42 | 42 | ss.source_files = 'CNLiveCustomControl/Classes/NavigationBar/*' |
| 43 | 43 | ss.resource_bundles = { |
| 44 | - 'CNLiveCustomControl' => ['CNLiveCustomControl/Assets/NavigationBar/NavigationBar.xcassets'] | |
| 44 | +# 'CNLiveCustomControl' => ['CNLiveCustomControl/Assets/NavigationBar/NavigationBar.xcassets'] | |
| 45 | + 'CNLiveCustomControl' => ['CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle'] | |
| 45 | 46 | } |
| 46 | 47 | ss.dependency 'CNLiveTripartiteManagement/QMUIKit' |
| 47 | 48 | # 分类 | ... | ... |
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_back_black_b@2x.png
0 → 100644
1.49 KB
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_back_black_b@3x.png
0 → 100644
1.79 KB
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_back_white_b@2x.png
0 → 100644
2.03 KB
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_back_white_b@3x.png
0 → 100644
2.28 KB
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_black_close@2x.png
0 → 100644
2.92 KB
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_black_close@3x.png
0 → 100644
4.14 KB
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_black_more@2x.png
0 → 100644
238 Bytes
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_black_more@3x.png
0 → 100644
434 Bytes
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_white_more@2x.png
0 → 100644
448 Bytes
CNLiveCustomControl/Assets/NavigationBar/NavigationBar.bundle/cnlive_white_more@3x.png
0 → 100644
771 Bytes
CNLiveCustomControl/Classes/NavigationBar/CNLiveNavigationBar.m
| ... | ... | @@ -131,7 +131,7 @@ static const NSInteger margin = 15; |
| 131 | 131 | _left= [UIButton buttonWithType:UIButtonTypeCustom]; |
| 132 | 132 | _left.adjustsImageWhenHighlighted = NO; |
| 133 | 133 | _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight); |
| 134 | - UIImage *image = [self getImageWithImageName:@"cnlive_back_black_b" bundleName:@"CNLiveCustomControl" targetClass:[self class]]; | |
| 134 | + UIImage *image = [self getImageWithImageName:@"NavigationBar.bundle/cnlive_back_black_b" bundleName:@"CNLiveCustomControl" targetClass:[self class]]; | |
| 135 | 135 | [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal]; |
| 136 | 136 | _left.titleLabel.font = [UIFont systemFontOfSize:15]; |
| 137 | 137 | [_left setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; | ... | ... |