中华联合和监控不在缩小图标

This commit is contained in:
ddisfriend
2024-09-10 16:58:27 +08:00
parent 68c4d51355
commit ac19826ef2
232 changed files with 8063 additions and 7876 deletions

View File

@@ -27,19 +27,19 @@ style_16_s_21_1678776309.data
style_17_s_21_1655347084.data
style_18_s_21_1678776921.data
style_19_s_21_1678776357.data
style_1_d_21_1680092748.data
style_1_s_21_1680092748.data
style_1_sh_21_1680057953.data
style_1_sh_l_21_1680057953.data
style_1_sh_m_21_1680057953.data
style_1_sl_21_1680092748.data
style_1_d_21_1716369317.data
style_1_s_21_1716369317.data
style_1_sh_21_1684757273.data
style_1_sh_l_21_1684757273.data
style_1_sh_m_21_1684757273.data
style_1_sl_21_1716369317.data
style_29_s_21_1679988739.data
style_2_d_21_1680589176.data
style_2_s_21_1680589176.data
style_2_sh_21_1680057953.data
style_2_sh_l_21_1680057953.data
style_2_sh_m_21_1680057953.data
style_2_sl_21_1680589176.data
style_2_d_21_1685432206.data
style_2_s_21_1685432206.data
style_2_sh_21_1684757273.data
style_2_sh_l_21_1684757273.data
style_2_sh_m_21_1684757273.data
style_2_sl_21_1685432206.data
style_35_s_21_1681131121.data
style_35_sh_21_1680057953.data
style_35_sl_21_1681131121.data
@@ -49,9 +49,9 @@ style_36_sl_21_1678777060.data
style_38_s_21_1678777083.data
style_39_s_21_1678777105.data
style_3_s_21_1678710524.data
style_4_s_21_1678776087.data
style_4_s_21_1685348571.data
style_50_s_21_1675145929.data
style_5_s_21_1678776244.data
style_5_s_21_1685348588.data
style_6_s_21_1678776860.data
style_8_s_21_1678776272.data
style_100_s_21_1670999202.data

View File

@@ -126,6 +126,9 @@ NS_ASSUME_NONNULL_BEGIN
///默认为10, 范围为[ 5, 15 ], 单位秒. 表示有连续的10s, 定位信号质量都比较差, 就会触发手机卫星定位信号弱的回调. 值越小, 就越容易触发. since 6.6.0
@property (nonatomic, assign) NSUInteger gpsWeakDetecedInterval __attribute__((deprecated("已废弃since 7.8.0")));
///设置是否显示红绿灯倒计时。since 10.0.700
- (void)setIsOpenTrafficLight:(NSString *)key;
#pragma mark - Calculate Route
// 以下算路方法需要高德坐标(GCJ02)

View File

@@ -12,7 +12,7 @@
#ifndef AMapNaviVersion_h
#define AMapNaviVersion_h
#define AMapNaviVersionNumber 10000600
#define AMapNaviVersionNumber 10000800
#define AMapNaviFoundationVersionMinRequired 10802
#define AMapNavi3DMapVersionMinRequired 90000

View File

@@ -12,7 +12,7 @@
#ifndef MAMapVersion_h
#define MAMapVersion_h
#define MAMapVersionNumber 10000600
#define MAMapVersionNumber 10000800
#define MAMapMinRequiredFoundationVersion 10802
// 依赖库版本检测

View File

@@ -20,6 +20,7 @@
#import "MAMapCustomStyleOptions.h"
#import <AMapFoundationKit/AMapServices.h>
#import "MABaseEngineOverlay.h"
#import "MAPoiFilter.h"
///地图类型
typedef NS_ENUM(NSInteger, MAMapType)
@@ -805,6 +806,23 @@ extern NSString * const kMAMapLayerCameraDegreeKey;
- (void)addEngineOverlay:(MABaseEngineOverlay *)overlay;
@end
@interface MAMapView (PoiFilter)
/**
* @brief 添加poi避让框
* @param poiFilter
*/
- (void)addPoiFilter:(MAPoiFilter *)poiFilter;
/**
* @brief 移除poi避让框
* @param keyName 名称
*/
- (void)removePoiFilter:(NSString *)keyName;
/**
* @brief 清除poi避让框
*/
- (void)clearPoiFilter;
@end
#pragma mark - MAMapViewDelegate
@protocol MAMapViewDelegate <NSObject>

View File

@@ -35,4 +35,6 @@
///虚线类型, since 5.5.0
@property (nonatomic, assign) MALineDashType lineDashType;
///是否抽稀默认为YESsince 10.0.8000
@property (nonatomic, assign) BOOL reducePoint;
@end

View File

@@ -0,0 +1,29 @@
//
// MAPoiFilter.h
// MAMapKit
//
// Created by linshiqing on 2024/6/18.
// Copyright © 2024 Amap. All rights reserved.
//
#import <Foundation/Foundation.h>
@class MAMapView;
NS_ASSUME_NONNULL_BEGIN
typedef NS_OPTIONS(NSUInteger, MAPoiFilterType) {
MAPoiFilterTypePoi = 0x00000001, //!< 避让POI
MAPoiFilterTypeRoadName = 0x00000002, //!< 避让底图路名
MAPoiFilterTypeRoadShield = 0x00000004, //!< 避让路牌
MAPoiFilterTypeLabel3rd = 0x00000008, //!< 避让第三方label
MAPoiFilterTypeAll = 0xFFFFFFFF //!< 避让所有
};
@interface MAPoiFilter : NSObject
@property (nonatomic, assign) MAPoiFilterType filterType; //!< 避让类型
// 请将CLLocationCoordinate2D类型使用[NSValue valueWithMACoordinate:]包装下
@property (nonatomic, copy) NSArray<NSValue *> *position; //!< 四边形避让框坐标
@property (nonatomic, copy) NSString *keyName; //!< 避让框名称
+ (instancetype)poiFilter:(MAMapView *)mapView filterType:(MAPoiFilterType)filterType keyName:(NSString *)keyName center:(CLLocationCoordinate2D)center width:(CGFloat)width height:(CGFloat)height;
@end
NS_ASSUME_NONNULL_END

View File

@@ -136,23 +136,23 @@ typedef NS_ENUM(NSInteger, MAMapRouteHighLightType) {
@property (nonatomic, assign) uint32_t roadClass; //!< 道路等级 4B
@end
@interface MAMapPoint2I : NSObject
@property (nonatomic, assign) int32_t x;
@property (nonatomic, assign) int32_t y;
@interface MAMapPoint2F : NSObject
@property (nonatomic, assign) CGFloat x;
@property (nonatomic, assign) CGFloat y;
@end
@interface MAMapPoint3I : MAMapPoint2I
@property (nonatomic, assign) int32_t z;
@interface MAMapPoint3F : MAMapPoint2F
@property (nonatomic, assign) CGFloat z;
@end
@interface MAMapRouteOverlayData : NSObject
@property (nonatomic, assign) uint32_t checkFlag;
@property (nonatomic, assign) uint32_t routeType;
@property (nonatomic, copy) NSArray<MAMapPoint2I *> *point2DArray;
@property (nonatomic, copy) NSArray<MAMapPoint2F *> *point2DArray;
@property (nonatomic, copy) NSArray<MAMapRouteOverlayTrafficState *> *trafficStateArray;
@property (nonatomic, copy) NSArray<MAMapRouteOverlayRoadName *> *roadNameArray;
@property (nonatomic, copy) NSArray<NSNumber *> *point2DFlagArray;
@property (nonatomic, copy) NSArray<MAMapPoint3I *> *point3DArray;
@property (nonatomic, copy) NSArray<MAMapPoint3F *> *point3DArray;
@property (nonatomic, copy) NSArray<NSNumber *> *point3DFlagArray;
@property (nonatomic, copy) NSArray<MAMapRouteOverlayColorIndex *> *colorIndexArray;
@end

View File

@@ -1,3 +1,3 @@
10.0.600+3dmap.145e9ead.1210
10.0.600+3dcom.145e9ead.1210
10.0.600+navi.9e599e8.1210
10.0.800+3dmap.289bb2fe.1210
10.0.800+3dcom.289bb2fe.1210
10.0.800+navi.1641873.1210