移入 DSMap

毕珂
1 parent 4d37fec3
Showing 28 changed files with 203 additions and 28 deletions
DSToolsModuleF.podspec
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_centerPinb@2x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_centerPinb@3x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_location@2x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_location@3x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_no_select@2x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_no_select@3x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_search@2x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_search@3x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_select_repast@2x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_select_repast@3x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_select_shop@2x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_select_shop@3x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_userP_repast@2x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_userP_repast@3x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_userP_shop@2x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_userP_shop@3x.png
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSToolsModule
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSMapSearchModel.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSMapSearchViewController.h
 Pod::Spec.new do |s|
  
   s.name                   = "DSToolsModuleF"
-  s.version                = "0.0.23"
+  s.version                = "0.0.24"
   s.summary                = "DSToolsModuleF"
   s.homepage               = "http://bj.gitlab.cnlive.com/DSIOSTeam"
   s.authors                = { "DSIOSTeam" => "694092596@qq.com" }
+//
+//  DSMapSearchModel.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/2/18.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSMapSearchModel : NSObject
+
+/**
+ POI Id
+ */
+@property (nonatomic,copy) NSString * id;
+/**
+ 名字
+ */
+@property (nonatomic,copy) NSString * name;
+/**
+ 地址
+ */
+@property (nonatomic,copy) NSString * address;
+/**
+ 城市名字
+ */
+@property (nonatomic,copy) NSString * cityname;
+/**
+ 经纬度 (经度,纬度)
+ */
+@property (nonatomic,copy) NSString * location;
+/**
+ 经度
+ */
+@property (nonatomic,assign) double longitude;
+/**
+ 纬度
+ */
+@property (nonatomic,assign) double latitude;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSMapSearchViewController.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/2/18.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+#import <CoreLocation/CoreLocation.h>
+#import "DSMapSearchModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSMapSearchViewController : DSBaseViewController
+
+/// 定位
+@property (nonatomic,strong) CLLocation * location;
+
+#pragma mark - 回调
+
+/// 选中回调
+@property (nonatomic,copy) void (^selectAddressCallBack)(DSMapSearchModel * model);
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSMapView.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/7/27.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import <MapKit/MapKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSMapView : MKMapView
+
+/// 点击回调
+@property (nonatomic,copy) void (^touchSelfCallBack)(void);
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSMapViewController.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/2/12.
+//
+
+#import <DSBaseModule/DSBaseModule.h>
+#import <CoreLocation/CoreLocation.h>
+#import "DSMapSearchModel.h"
+
+typedef NS_ENUM(NSUInteger, DSMapStyle) {
+    DSMapStyleRepastAddress = 0,           //餐厅地址
+    DSMapStyleShopAddress,                 //电商地址
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSMapViewController : DSBaseViewController
+
+#pragma mark - 地图样式
+
+/// 地图样式
+@property (nonatomic,assign) DSMapStyle mapStyle;
+
+#pragma mark - 定位地址
+
+/// 定位地址
+@property (nonatomic,strong) CLLocation * location;
+
+#pragma mark - 回调
+
+/// 选取回调
+@property (nonatomic,copy) void (^selectAddressCallBack)(UIImage * mapImage, DSMapSearchModel * model);
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -17,17 +17,17 @@
 #import <UIKit/UIKit.h>
 #import "DSSelectUploadImageViewEnum.h"
  
-@protocol DSSelectUploadImageViewDelegate <NSObject>
-
-@required
-
-/// 跳转播放器
-/// @param playURL 播放URL
-/// @param coverImage 封面图
-/// @param coverImageUrl 封面图url
--(void)skipPlayerVCWithPlayURL:(nonnull NSURL*)playURL coverImage:(nullable UIImage*)coverImage coverImageUrl:(nullable NSString*)coverImageUrl;
-
-@end
+//@protocol DSSelectUploadImageViewDelegate <NSObject>
+//
+//@required
+//
+///// 跳转播放器
+///// @param playURL 播放URL
+///// @param coverImage 封面图
+///// @param coverImageUrl 封面图url
+//-(void)skipPlayerVCWithPlayURL:(nonnull NSURL*)playURL coverImage:(nullable UIImage*)coverImage coverImageUrl:(nullable NSString*)coverImageUrl;
+//
+//@end
  
 NS_ASSUME_NONNULL_BEGIN
  
@@ -40,8 +40,8 @@ NS_ASSUME_NONNULL_BEGIN
  
 #pragma mark - 属性
  
-/// 代理
-@property (nonatomic,weak) id<DSSelectUploadImageViewDelegate> delegate;
+///// 代理
+//@property (nonatomic,weak) id<DSSelectUploadImageViewDelegate> delegate;
 /**
  显示类型
  */
@@ -39,6 +39,11 @@
 #import "DSFileManager.h"
 #import "DSGradientView.h"
 #import "DSLocationManager.h"
+#import "DSMapSearchModel.h"
+#import "DSMapSearchViewController.h"
+#import "DSMapView.h"
+#import "DSMapViewController.h"
+#import "UIImage+DSMap.h"
 #import "DSNetworkDisposeModel.h"
 #import "DSNetworkRequest.h"
 #import "DSQiNiuUploadManager.h"
@@ -10,18 +10,35 @@
  
 #import <DSBaseModule/DSBaseModule.h>
  
+#import "DSToolsModuleManager.h"
+#import "DSToolsModuleProtocol.h"
+
 #import "BKCycleScrollView.h"
+
 #import "BKPageControlView.h"
+
 #import "BKPickerView.h"
+
 #import "BKTimer.h"
+
 #import "DSCollectionViewFluidLayout.h"
+
 #import "DSGradientView.h"
-#import "DSLocationManager.h"
+
 #import "DSNetworkRequest.h"
+
 #import "DSTextView.h"
+
 #import "DSFileManager.h"
+
 #import "DSQiNiuUploadManager.h"
 #import "DSSelectUploadImageView.h"
+
 #import "DSSwitchView.h"
  
+#import "DSLocationManager.h"
+
+#import "DSMapViewController.h"
+#import "DSMapSearchViewController.h"
+
 #endif /* DSToolsModule_h */
@@ -5,25 +5,17 @@
 //  Created by 毕珂 on 2020/4/21.
 //
  
+#import "DSQiNiuUploadManager.h"
+#import "DSMapSearchModel.h"
+
 #ifndef DSToolsModuleProtocol_h
 #define DSToolsModuleProtocol_h
  
-@protocol DSToolsModuleDelegate <NSObject>
+@protocol DSToolsModuleDelegate <NSObject, DSQiNiuUploadManagerDelegate>
  
 @required
  
-#pragma mark - DSQiNiuUploadManagerDelegate
-
-/// 获取七牛token
-/// @param completion 完成回调
--(void)requestQiNiuTokenCompletion:(nullable void (^)(NSString * _Nullable token, NSString * _Nullable errorMessage))completion;
-
-/// 删除云中图片/视频
-/// @param imageUrl 图片/视频url
-/// @param completion 完成回调
--(void)requestQiNiuDeleteImageUrl:(nonnull NSString*)imageUrl completion:(nullable void (^)(NSString * _Nullable errorMessage))completion;
-
-#pragma mark - DSSelectUploadImageViewDelegate
+#pragma mark - 跳转播放器
  
 /// 跳转播放器
 /// @param playURL 播放URL
@@ -31,6 +23,16 @@
 /// @param coverImageUrl 封面图url
 -(void)skipPlayerVCWithPlayURL:(nonnull NSURL*)playURL coverImage:(nullable UIImage*)coverImage coverImageUrl:(nullable NSString*)coverImageUrl;
  
+#pragma mark - 地图poi请求
+
+/// 地图poi检索
+/// @param longitude 经度
+/// @param latitude 纬度
+/// @param page 页数
+/// @param keywords 检索词(可以不传)
+/// @param result 结果
+-(void)requestGetGaoDePOIWithLongitude:(double)longitude latitude:(double)latitude page:(NSUInteger)page keywords:(nullable NSString *)keywords result:(nullable void (^)(NSArray<DSMapSearchModel *> * dataArr, NSString * errorMessage))result;
+
 @end
  
 #endif /* DSToolsModuleProtocol_h */
+//
+//  UIImage+DSMap.h
+//  DSToolsModule
+//
+//  Created by 毕珂 on 2020/4/22.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UIImage (DSMap)
+
+#pragma mark - 获取图片
+
+/// 获取DSMap图片
+/// @param imageName 图片名
++(UIImage*)imageWithDSMapImageName:(NSString*)imageName;
+
+@end
+
+NS_ASSUME_NONNULL_END