Commit c9c80a3e240ac77ddd640d99037ee5f4677b417b
1 parent
54f376a4
no message
Showing
2 changed files
with
25 additions
and
3 deletions
CNLiveQrCodeModule.podspec
| @@ -30,12 +30,34 @@ TODO: 网家家-二维码模块. | @@ -30,12 +30,34 @@ TODO: 网家家-二维码模块. | ||
| 30 | 30 | ||
| 31 | s.ios.deployment_target = '9.0' | 31 | s.ios.deployment_target = '9.0' |
| 32 | 32 | ||
| 33 | - s.source_files = 'CNLiveQrCodeModule/Classes/**/*' | 33 | +# s.source_files = 'CNLiveQrCodeModule/Classes/**/*' |
| 34 | 34 | ||
| 35 | s.resource_bundles = { | 35 | s.resource_bundles = { |
| 36 | 'CNLiveQrCodeModule' => ['CNLiveQrCodeModule/Assets/CNLiveQrCodeModule.xcassets'] | 36 | 'CNLiveQrCodeModule' => ['CNLiveQrCodeModule/Assets/CNLiveQrCodeModule.xcassets'] |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | + # Module | ||
| 40 | + s.subspec 'Module' do |ss| | ||
| 41 | + ss.source_files = 'CNLiveQrCodeModule/Classes/Module/*.{h,m}' | ||
| 42 | + ss.dependency 'CNLiveQrCodeModule/Controller' | ||
| 43 | + end | ||
| 44 | + | ||
| 45 | + # Controller | ||
| 46 | + s.subspec 'Controller' do |ss| | ||
| 47 | + ss.source_files = 'CNLiveQrCodeModule/Classes/Controller/*.{h,m}' | ||
| 48 | + ss.dependency 'CNLiveQrCodeModule/View' | ||
| 49 | + end | ||
| 50 | + | ||
| 51 | + # View | ||
| 52 | + s.subspec 'View' do |ss| | ||
| 53 | + ss.source_files = 'CNLiveQrCodeModule/Classes/View/*.{h,m}' | ||
| 54 | + end | ||
| 55 | + | ||
| 56 | + # Model | ||
| 57 | + s.subspec 'Model' do |ss| | ||
| 58 | + ss.source_files = 'CNLiveQrCodeModule/Classes/Model/*.{h,m}' | ||
| 59 | + end | ||
| 60 | + | ||
| 39 | # s.resource_bundles = { | 61 | # s.resource_bundles = { |
| 40 | # 'CNLiveQrCodeModule' => ['CNLiveQrCodeModule/Assets/*.png'] | 62 | # 'CNLiveQrCodeModule' => ['CNLiveQrCodeModule/Assets/*.png'] |
| 41 | # } | 63 | # } |
CNLiveQrCodeModule/Classes/View/CNLiveQrCodeNavigationBar.m
| @@ -56,7 +56,7 @@ static const NSInteger margin = 15; | @@ -56,7 +56,7 @@ static const NSInteger margin = 15; | ||
| 56 | 56 | ||
| 57 | - (UIButton *)left { | 57 | - (UIButton *)left { |
| 58 | if (!_left) { | 58 | if (!_left) { |
| 59 | - _left= [UIButton buttonWithType:UIButtonTypeSystem]; | 59 | + _left= [UIButton buttonWithType:UIButtonTypeCustom]; |
| 60 | _left.adjustsImageWhenHighlighted = NO; | 60 | _left.adjustsImageWhenHighlighted = NO; |
| 61 | _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight); | 61 | _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight); |
| 62 | UIImage *image = [self xw_getImageName:@"mine_back_white_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveQrCodeNavigationBar class]]; | 62 | UIImage *image = [self xw_getImageName:@"mine_back_white_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveQrCodeNavigationBar class]]; |
| @@ -79,7 +79,7 @@ static const NSInteger margin = 15; | @@ -79,7 +79,7 @@ static const NSInteger margin = 15; | ||
| 79 | 79 | ||
| 80 | - (UIButton *)right { | 80 | - (UIButton *)right { |
| 81 | if (!_right) { | 81 | if (!_right) { |
| 82 | - _right = [UIButton buttonWithType:UIButtonTypeSystem]; | 82 | + _right = [UIButton buttonWithType:UIButtonTypeCustom]; |
| 83 | _right.frame = CGRectMake(SCREEN_WIDTH-50-margin, StatusBarHeight, 50, NavigationBarHeight); | 83 | _right.frame = CGRectMake(SCREEN_WIDTH-50-margin, StatusBarHeight, 50, NavigationBarHeight); |
| 84 | [_right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentRight]; | 84 | [_right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentRight]; |
| 85 | _right.adjustsImageWhenHighlighted = NO; | 85 | _right.adjustsImageWhenHighlighted = NO; |