no message

guoruipeng
1 parent 53833bb1
Showing 30 changed files with 17 additions and 12 deletions
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/backWhite.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_backWhite.imageset/Contents.json
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/backWhite.imageset/backWhite@2x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_backWhite.imageset/backWhite@2x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/backWhite.imageset/backWhite@3x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_backWhite.imageset/backWhite@3x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/pyq_fengxiang.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_pyq_fengxiang.imageset/Contents.json
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/pyq_fengxiang.imageset/pyq_fengxiang@2x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_pyq_fengxiang.imageset/pyq_fengxiang@2x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/pyq_fengxiang.imageset/pyq_fengxiang@3x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_pyq_fengxiang.imageset/pyq_fengxiang@3x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/userPosition.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_userPosition.imageset/Contents.json
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/userPosition.imageset/userPosition.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_userPosition.imageset/userPosition.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_chose.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_chose.imageset/Contents.json
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_chose.imageset/where_chose@2x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_chose.imageset/where_chose@2x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_chose.imageset/where_chose@3x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_chose.imageset/where_chose@3x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_no_select.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_no_select.imageset/Contents.json
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_point_b.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_point_b.imageset/Contents.json
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_point_b.imageset/where_point_b@2x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_point_b.imageset/where_point_b@2x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_point_b.imageset/where_point_b@3x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_point_b.imageset/where_point_b@3x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_position.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_position.imageset/Contents.json
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_route.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_route.imageset/Contents.json
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_route.imageset/where_route@2x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_route.imageset/where_route@2x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_route.imageset/where_route@3x.png → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_route.imageset/where_route@3x.png
CNLiveMapModule/Assets/CNLiveMapModule.xcassets/where_select.imageset/Contents.json → CNLiveMapModule/Assets/CNLiveMapModule.xcassets/map_module_where_select.imageset/Contents.json
@@ -105,7 +105,8 @@ BMKRouteSearchDelegate
     //返回按钮
     UIButton *backBtn = [[UIButton alloc] init];
     backBtn.backgroundColor = [[UIColor lightGrayColor] colorWithAlphaComponent:0.8];
-    [backBtn setImage:[UIImage imageNamed:@"backWhite"] forState:UIControlStateNormal];
+    UIImage *image = [self getImageName:@"map_module_backWhite" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+    [backBtn setImage:image forState:UIControlStateNormal];
     [backBtn addTarget:self action:@selector(backController) forControlEvents:UIControlEventTouchUpInside];
     [self.mapView addSubview:backBtn];
     [backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -119,7 +120,8 @@ BMKRouteSearchDelegate
     UIButton *sendBtn = [[UIButton alloc] init];
     sendBtn.backgroundColor = [[UIColor lightGrayColor] colorWithAlphaComponent:0.8];
     [sendBtn addTarget:self action:@selector(selectToOperation) forControlEvents:UIControlEventTouchUpInside];
-    [sendBtn setImage:[UIImage imageNamed:@"pyq_fengxiang"] forState:UIControlStateNormal];
+    UIImage *image1 = [self getImageName:@"map_module_pyq_fengxiang" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+    [sendBtn setImage:image1 forState:UIControlStateNormal];
     [self.mapView addSubview:sendBtn];
     [sendBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(self.mapView.mas_right).offset(-15);
@@ -486,7 +488,8 @@ BMKRouteSearchDelegate
         if (annotationView == nil) {
             annotationView = [[BMKPinAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:pointReuseIndentifier];
         }
-        annotationView.image = [UIImage imageNamed:@"where_point_b"];
+        UIImage *image1 = [self getImageName:@"map_module_where_point_b" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        annotationView.image = image1;
         annotationView.pinColor = BMKPinAnnotationColorRed;
         //        annotationView.canShowCallout= YES;      //设置气泡可以弹出，默认为NO
         //        annotationView.animatesDrop=YES;         //设置标注动画显示，默认为NO
@@ -575,7 +578,8 @@ BMKRouteSearchDelegate
 -(UIButton *)showListBtn{
     if (!_showListBtn) {
         _showListBtn = [[UIButton alloc] init];
-        [_showListBtn setImage:[UIImage imageNamed:@"where_route"] forState:UIControlStateNormal];
+        UIImage *image = [self getImageName:@"map_module_where_route" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        [_showListBtn setImage:image forState:UIControlStateNormal];
         [_showListBtn addTarget:self action:@selector(showListSelectBtn) forControlEvents:UIControlEventTouchUpInside];
     }
     return _showListBtn;
@@ -598,7 +602,8 @@ BMKRouteSearchDelegate
 //        //定位图标名称，需要将该图片放到 mapapi.bundle/images 目录下
 //        //        param.locationViewImgName = @"icon_nav_bus";
 //        //用户自定义定位图标，V4.2.1以后支持
-        param.locationViewImage = [UIImage imageNamed:@"userPosition"];
+        UIImage *image = [self getImageName:@"map_module_userPosition" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        param.locationViewImage = image;
 //        //根据配置参数更新定位图层样式
 //        //设置显示精度圈，默认YES
 //        param.isAccuracyCircleShow = NO;
@@ -611,7 +616,8 @@ BMKRouteSearchDelegate
 -(UIButton *)resetBtn{
     if (!_resetBtn) {
         _resetBtn = [[UIButton alloc] init];
-        [_resetBtn setImage:[UIImage imageNamed:@"where_select"] forState:UIControlStateNormal];
+        UIImage *image = [self getImageName:@"map_module_where_select" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        [_resetBtn setImage:image forState:UIControlStateNormal];
         [_resetBtn addTarget:self action:@selector(clickRestBtn) forControlEvents:UIControlEventTouchUpInside];
     }
     return _resetBtn;
@@ -466,7 +466,7 @@ UISearchBarDelegate
             annotationView = [[BMKAnnotationView alloc] initWithAnnotation:annotation
                                                            reuseIdentifier:reuseIndetifier];
         }
-        UIImage *image = [self getImageName:@"where_point_b" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        UIImage *image = [self getImageName:@"map_module_where_point_b" bundleName:@"CNLiveMapModule" targetClass:[self class]];
  
         annotationView.image = image;
         return annotationView;
@@ -558,7 +558,7 @@ UISearchBarDelegate
         //定位图标名称，需要将该图片放到 mapapi.bundle/images 目录下
         //        param.locationViewImgName = @"icon_nav_bus";
         //用户自定义定位图标，V4.2.1以后支持
-        UIImage *image = [self getImageName:@"where_position" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        UIImage *image = [self getImageName:@"map_module_where_position" bundleName:@"CNLiveMapModule" targetClass:[self class]];
         param.locationViewImage = image;
         //根据配置参数更新定位图层样式
         //设置显示精度圈，默认YES
@@ -581,8 +581,8 @@ UISearchBarDelegate
 -(UIButton *)repositionBtn{
     if (!_repositionBtn) {
         _repositionBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        UIImage *image1 = [self getImageName:@"where_select" bundleName:@"CNLiveMapModule" targetClass:[self class]];
-        UIImage *image2 = [self getImageName:@"where_no_select" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        UIImage *image1 = [self getImageName:@"map_module_where_select" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        UIImage *image2 = [self getImageName:@"map_module_where_no_select" bundleName:@"CNLiveMapModule" targetClass:[self class]];
  
         [_repositionBtn setImage:image1 forState:UIControlStateNormal];
         [_repositionBtn setImage:image2 forState:UIControlStateSelected];
@@ -24,7 +24,6 @@
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <CNLiveCustomUI/CNLiveRefreshHeader.h>
 #import <CNLiveServices/CNLiveServices.h>
-#import <UIMapKit/UIMapKit.h>
 // Include any system framework and library headers here that should be included in all compilation units.
 // You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
  
@@ -107,7 +107,7 @@
 -(UIImageView *)choseIMG{
     if (_choseIMG == nil) {
         _choseIMG = [[UIImageView alloc] init];
-        UIImage *image = [self getImageName:@"where_chose" bundleName:@"CNLiveMapModule" targetClass:[self class]];
+        UIImage *image = [self getImageName:@"map_module_where_chose" bundleName:@"CNLiveMapModule" targetClass:[self class]];
         _choseIMG.image = image;
         _choseIMG.hidden = YES;
     }