DSIOSTeam / DSToolsModuleF · Commits

Commit 466006678139d3642ee88682a95bbaa32636e767

Authored by 毕珂
1 parent 4d37fec3

移入 DSMap

Inline Side-by-side
Showing 28 changed files with 203 additions and 28 deletions
DSToolsModuleF.podspec
  View file @4660066
1 Pod::Spec.new do |s| 1 Pod::Spec.new do |s|
2 2
3 s.name = "DSToolsModuleF" 3 s.name = "DSToolsModuleF"
4 - s.version = "0.0.23" 4 + s.version = "0.0.24"
5 s.summary = "DSToolsModuleF" 5 s.summary = "DSToolsModuleF"
6 s.homepage = "http://bj.gitlab.cnlive.com/DSIOSTeam" 6 s.homepage = "http://bj.gitlab.cnlive.com/DSIOSTeam"
7 s.authors = { "DSIOSTeam" => "694092596@qq.com" } 7 s.authors = { "DSIOSTeam" => "694092596@qq.com" }
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_centerPinb@2x.png 0 → 100644
View file @4660066

1.08 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_centerPinb@3x.png 0 → 100644
View file @4660066

2.57 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_location@2x.png 0 → 100644
View file @4660066

2.43 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_location@3x.png 0 → 100644
View file @4660066

4.01 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_no_select@2x.png 0 → 100644
View file @4660066

934 Bytes
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_no_select@3x.png 0 → 100644
View file @4660066

1.33 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_search@2x.png 0 → 100644
View file @4660066

793 Bytes
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_search@3x.png 0 → 100644
View file @4660066

2.02 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_select_repast@2x.png 0 → 100644
View file @4660066

1.05 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_select_repast@3x.png 0 → 100644
View file @4660066

1.58 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_select_shop@2x.png 0 → 100644
View file @4660066

962 Bytes
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_select_shop@3x.png 0 → 100644
View file @4660066

1.43 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_userP_repast@2x.png 0 → 100644
View file @4660066

1.33 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_userP_repast@3x.png 0 → 100644
View file @4660066

3.26 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_userP_shop@2x.png 0 → 100644
View file @4660066

1.48 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSMap.bundle/DS_map_userP_shop@3x.png 0 → 100644
View file @4660066

2.62 KB
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSToolsModule
View file @4660066
No preview for this file type
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSMapSearchModel.h 0 → 100644
  View file @4660066
  1 +//
  2 +// DSMapSearchModel.h
  3 +// DSCnliveShopSDK
  4 +//
  5 +// Created by zhaolin on 2019/2/18.
  6 +//
  7 +
  8 +#import <Foundation/Foundation.h>
  9 +
  10 +NS_ASSUME_NONNULL_BEGIN
  11 +
  12 +@interface DSMapSearchModel : NSObject
  13 +
  14 +/**
  15 + POI Id
  16 + */
  17 +@property (nonatomic,copy) NSString * id;
  18 +/**
  19 + 名字
  20 + */
  21 +@property (nonatomic,copy) NSString * name;
  22 +/**
  23 + 地址
  24 + */
  25 +@property (nonatomic,copy) NSString * address;
  26 +/**
  27 + 城市名字
  28 + */
  29 +@property (nonatomic,copy) NSString * cityname;
  30 +/**
  31 + 经纬度 (经度,纬度)
  32 + */
  33 +@property (nonatomic,copy) NSString * location;
  34 +/**
  35 + 经度
  36 + */
  37 +@property (nonatomic,assign) double longitude;
  38 +/**
  39 + 纬度
  40 + */
  41 +@property (nonatomic,assign) double latitude;
  42 +
  43 +@end
  44 +
  45 +NS_ASSUME_NONNULL_END
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSMapSearchViewController.h 0 → 100644
  View file @4660066
  1 +//
  2 +// DSMapSearchViewController.h
  3 +// DSCnliveShopSDK
  4 +//
  5 +// Created by zhaolin on 2019/2/18.
  6 +//
  7 +
  8 +#import <DSBaseModule/DSBaseModule.h>
  9 +#import <CoreLocation/CoreLocation.h>
  10 +#import "DSMapSearchModel.h"
  11 +
  12 +NS_ASSUME_NONNULL_BEGIN
  13 +
  14 +@interface DSMapSearchViewController : DSBaseViewController
  15 +
  16 +/// 定位
  17 +@property (nonatomic,strong) CLLocation * location;
  18 +
  19 +#pragma mark - 回调
  20 +
  21 +/// 选中回调
  22 +@property (nonatomic,copy) void (^selectAddressCallBack)(DSMapSearchModel * model);
  23 +
  24 +@end
  25 +
  26 +NS_ASSUME_NONNULL_END
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSMapView.h 0 → 100644
  View file @4660066
  1 +//
  2 +// DSMapView.h
  3 +// DSCnliveShopSDK
  4 +//
  5 +// Created by zhaolin on 2019/7/27.
  6 +// Copyright © 2019 BIKE. All rights reserved.
  7 +//
  8 +
  9 +#import <MapKit/MapKit.h>
  10 +
  11 +NS_ASSUME_NONNULL_BEGIN
  12 +
  13 +@interface DSMapView : MKMapView
  14 +
  15 +/// 点击回调
  16 +@property (nonatomic,copy) void (^touchSelfCallBack)(void);
  17 +
  18 +@end
  19 +
  20 +NS_ASSUME_NONNULL_END
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSMapViewController.h 0 → 100644
  View file @4660066
  1 +//
  2 +// DSMapViewController.h
  3 +// DSCnliveShopSDK
  4 +//
  5 +// Created by zhaolin on 2019/2/12.
  6 +//
  7 +
  8 +#import <DSBaseModule/DSBaseModule.h>
  9 +#import <CoreLocation/CoreLocation.h>
  10 +#import "DSMapSearchModel.h"
  11 +
  12 +typedef NS_ENUM(NSUInteger, DSMapStyle) {
  13 + DSMapStyleRepastAddress = 0, //餐厅地址
  14 + DSMapStyleShopAddress, //电商地址
  15 +};
  16 +
  17 +NS_ASSUME_NONNULL_BEGIN
  18 +
  19 +@interface DSMapViewController : DSBaseViewController
  20 +
  21 +#pragma mark - 地图样式
  22 +
  23 +/// 地图样式
  24 +@property (nonatomic,assign) DSMapStyle mapStyle;
  25 +
  26 +#pragma mark - 定位地址
  27 +
  28 +/// 定位地址
  29 +@property (nonatomic,strong) CLLocation * location;
  30 +
  31 +#pragma mark - 回调
  32 +
  33 +/// 选取回调
  34 +@property (nonatomic,copy) void (^selectAddressCallBack)(UIImage * mapImage, DSMapSearchModel * model);
  35 +
  36 +@end
  37 +
  38 +NS_ASSUME_NONNULL_END
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSSelectUploadImageView.h
  View file @4660066
@@ -17,17 +17,17 @@ @@ -17,17 +17,17 @@
17 #import <UIKit/UIKit.h> 17 #import <UIKit/UIKit.h>
18 #import "DSSelectUploadImageViewEnum.h" 18 #import "DSSelectUploadImageViewEnum.h"
19 19
20 -@protocol DSSelectUploadImageViewDelegate <NSObject>  
21 -  
22 -@required  
23 -  
24 -/// 跳转播放器  
25 -/// @param playURL 播放URL  
26 -/// @param coverImage 封面图  
27 -/// @param coverImageUrl 封面图url  
28 --(void)skipPlayerVCWithPlayURL:(nonnull NSURL*)playURL coverImage:(nullable UIImage*)coverImage coverImageUrl:(nullable NSString*)coverImageUrl;  
29 -  
30 -@end 20 +//@protocol DSSelectUploadImageViewDelegate <NSObject>
  21 +//
  22 +//@required
  23 +//
  24 +///// 跳转播放器
  25 +///// @param playURL 播放URL
  26 +///// @param coverImage 封面图
  27 +///// @param coverImageUrl 封面图url
  28 +//-(void)skipPlayerVCWithPlayURL:(nonnull NSURL*)playURL coverImage:(nullable UIImage*)coverImage coverImageUrl:(nullable NSString*)coverImageUrl;
  29 +//
  30 +//@end
31 31
32 NS_ASSUME_NONNULL_BEGIN 32 NS_ASSUME_NONNULL_BEGIN
33 33
@@ -40,8 +40,8 @@ NS_ASSUME_NONNULL_BEGIN @@ -40,8 +40,8 @@ NS_ASSUME_NONNULL_BEGIN
40 40
41 #pragma mark - 属性 41 #pragma mark - 属性
42 42
43 -/// 代理  
44 -@property (nonatomic,weak) id<DSSelectUploadImageViewDelegate> delegate; 43 +///// 代理
  44 +//@property (nonatomic,weak) id<DSSelectUploadImageViewDelegate> delegate;
45 /** 45 /**
46 显示类型 46 显示类型
47 */ 47 */
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSToolsModule-umbrella.h
  View file @4660066
@@ -39,6 +39,11 @@ @@ -39,6 +39,11 @@
39 #import "DSFileManager.h" 39 #import "DSFileManager.h"
40 #import "DSGradientView.h" 40 #import "DSGradientView.h"
41 #import "DSLocationManager.h" 41 #import "DSLocationManager.h"
  42 +#import "DSMapSearchModel.h"
  43 +#import "DSMapSearchViewController.h"
  44 +#import "DSMapView.h"
  45 +#import "DSMapViewController.h"
  46 +#import "UIImage+DSMap.h"
42 #import "DSNetworkDisposeModel.h" 47 #import "DSNetworkDisposeModel.h"
43 #import "DSNetworkRequest.h" 48 #import "DSNetworkRequest.h"
44 #import "DSQiNiuUploadManager.h" 49 #import "DSQiNiuUploadManager.h"
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSToolsModule.h
  View file @4660066
@@ -10,18 +10,35 @@ @@ -10,18 +10,35 @@
10 10
11 #import <DSBaseModule/DSBaseModule.h> 11 #import <DSBaseModule/DSBaseModule.h>
12 12
  13 +#import "DSToolsModuleManager.h"
  14 +#import "DSToolsModuleProtocol.h"
  15 +
13 #import "BKCycleScrollView.h" 16 #import "BKCycleScrollView.h"
  17 +
14 #import "BKPageControlView.h" 18 #import "BKPageControlView.h"
  19 +
15 #import "BKPickerView.h" 20 #import "BKPickerView.h"
  21 +
16 #import "BKTimer.h" 22 #import "BKTimer.h"
  23 +
17 #import "DSCollectionViewFluidLayout.h" 24 #import "DSCollectionViewFluidLayout.h"
  25 +
18 #import "DSGradientView.h" 26 #import "DSGradientView.h"
19 -#import "DSLocationManager.h" 27 +
20 #import "DSNetworkRequest.h" 28 #import "DSNetworkRequest.h"
  29 +
21 #import "DSTextView.h" 30 #import "DSTextView.h"
  31 +
22 #import "DSFileManager.h" 32 #import "DSFileManager.h"
  33 +
23 #import "DSQiNiuUploadManager.h" 34 #import "DSQiNiuUploadManager.h"
24 #import "DSSelectUploadImageView.h" 35 #import "DSSelectUploadImageView.h"
  36 +
25 #import "DSSwitchView.h" 37 #import "DSSwitchView.h"
26 38
  39 +#import "DSLocationManager.h"
  40 +
  41 +#import "DSMapViewController.h"
  42 +#import "DSMapSearchViewController.h"
  43 +
27 #endif /* DSToolsModule_h */ 44 #endif /* DSToolsModule_h */
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSToolsModuleProtocol.h
  View file @4660066
@@ -5,25 +5,17 @@ @@ -5,25 +5,17 @@
5 // Created by 毕珂 on 2020/4/21. 5 // Created by 毕珂 on 2020/4/21.
6 // 6 //
7 7
  8 +#import "DSQiNiuUploadManager.h"
  9 +#import "DSMapSearchModel.h"
  10 +
8 #ifndef DSToolsModuleProtocol_h 11 #ifndef DSToolsModuleProtocol_h
9 #define DSToolsModuleProtocol_h 12 #define DSToolsModuleProtocol_h
10 13
11 -@protocol DSToolsModuleDelegate <NSObject> 14 +@protocol DSToolsModuleDelegate <NSObject, DSQiNiuUploadManagerDelegate>
12 15
13 @required 16 @required
14 17
15 -#pragma mark - DSQiNiuUploadManagerDelegate  
16 -  
17 -/// 获取七牛token  
18 -/// @param completion 完成回调  
19 --(void)requestQiNiuTokenCompletion:(nullable void (^)(NSString * _Nullable token, NSString * _Nullable errorMessage))completion;  
20 -  
21 -/// 删除云中图片/视频  
22 -/// @param imageUrl 图片/视频url  
23 -/// @param completion 完成回调  
24 --(void)requestQiNiuDeleteImageUrl:(nonnull NSString*)imageUrl completion:(nullable void (^)(NSString * _Nullable errorMessage))completion;  
25 -  
26 -#pragma mark - DSSelectUploadImageViewDelegate 18 +#pragma mark - 跳转播放器
27 19
28 /// 跳转播放器 20 /// 跳转播放器
29 /// @param playURL 播放URL 21 /// @param playURL 播放URL
@@ -31,6 +23,16 @@ @@ -31,6 +23,16 @@
31 /// @param coverImageUrl 封面图url 23 /// @param coverImageUrl 封面图url
32 -(void)skipPlayerVCWithPlayURL:(nonnull NSURL*)playURL coverImage:(nullable UIImage*)coverImage coverImageUrl:(nullable NSString*)coverImageUrl; 24 -(void)skipPlayerVCWithPlayURL:(nonnull NSURL*)playURL coverImage:(nullable UIImage*)coverImage coverImageUrl:(nullable NSString*)coverImageUrl;
33 25
  26 +#pragma mark - 地图poi请求
  27 +
  28 +/// 地图poi检索
  29 +/// @param longitude 经度
  30 +/// @param latitude 纬度
  31 +/// @param page 页数
  32 +/// @param keywords 检索词(可以不传)
  33 +/// @param result 结果
  34 +-(void)requestGetGaoDePOIWithLongitude:(double)longitude latitude:(double)latitude page:(NSUInteger)page keywords:(nullable NSString *)keywords result:(nullable void (^)(NSArray<DSMapSearchModel *> * dataArr, NSString * errorMessage))result;
  35 +
34 @end 36 @end
35 37
36 #endif /* DSToolsModuleProtocol_h */ 38 #endif /* DSToolsModuleProtocol_h */
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/UIImage+DSMap.h 0 → 100644
  View file @4660066
  1 +//
  2 +// UIImage+DSMap.h
  3 +// DSToolsModule
  4 +//
  5 +// Created by 毕珂 on 2020/4/22.
  6 +//
  7 +
  8 +#import <UIKit/UIKit.h>
  9 +
  10 +NS_ASSUME_NONNULL_BEGIN
  11 +
  12 +@interface UIImage (DSMap)
  13 +
  14 +#pragma mark - 获取图片
  15 +
  16 +/// 获取DSMap图片
  17 +/// @param imageName 图片名
  18 ++(UIImage*)imageWithDSMapImageName:(NSString*)imageName;
  19 +
  20 +@end
  21 +
  22 +NS_ASSUME_NONNULL_END
DSToolsModuleF/Frameworks/DSToolsModule.framework/Info.plist
View file @4660066
No preview for this file type