diff --git a/android/app/libs/AMap3DMap_7.9.1_AMapSearch_7.9.0_AMapLocation_5.3.1_20210414.jar b/android/app/libs/AMap3DMap_7.9.1_AMapSearch_7.9.0_AMapLocation_5.3.1_20210414.jar deleted file mode 100644 index ff12f755..00000000 Binary files a/android/app/libs/AMap3DMap_7.9.1_AMapSearch_7.9.0_AMapLocation_5.3.1_20210414.jar and /dev/null differ diff --git a/android/app/libs/amap-libs-release.aar b/android/app/libs/amap-libs-release.aar new file mode 100644 index 00000000..b14b8e37 Binary files /dev/null and b/android/app/libs/amap-libs-release.aar differ diff --git a/android/app/libs/geolocation-amap-release.aar b/android/app/libs/geolocation-amap-release.aar new file mode 100644 index 00000000..a8dd2f1e Binary files /dev/null and b/android/app/libs/geolocation-amap-release.aar differ diff --git a/android/app/libs/map-amap-release.aar b/android/app/libs/map-amap-release.aar new file mode 100644 index 00000000..9864a85f Binary files /dev/null and b/android/app/libs/map-amap-release.aar differ diff --git a/android/app/libs/weex_amap-release.aar b/android/app/libs/weex_amap-release.aar new file mode 100644 index 00000000..e84f9033 Binary files /dev/null and b/android/app/libs/weex_amap-release.aar differ diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a6b0bd28..2f03763c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/android/app/src/main/assets/data/dcloud_control.xml b/android/app/src/main/assets/data/dcloud_control.xml index 468997c4..cad88735 100644 --- a/android/app/src/main/assets/data/dcloud_control.xml +++ b/android/app/src/main/assets/data/dcloud_control.xml @@ -1,4 +1,4 @@ - + diff --git a/android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt b/android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt index d1021fbc..dbf6f7f3 100644 --- a/android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt +++ b/android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt @@ -49,6 +49,18 @@ class MinPlugin: FlutterPlugin, MethodCallHandler { DCUniMPSDK.getInstance().initialize(context, config) { result.success(it) } + DCUniMPSDK.getInstance().setDefMenuButtonClickCallBack { p0, p1 -> + Logger.e("p0: $p0 p1:$p1"); + when (p1) { + "tc" -> { + Logger.e("用户点击了退出"); + DCUniMPSDK.getInstance().closeCurrentApp() + } + } + } + DCUniMPSDK.getInstance().setUniMPOnCloseCallBack { + Logger.e("用户点击了退出 it: $it") + } } } else if (call.method == "isInitialize") { result.success(DCUniMPSDK.getInstance().isInitialize) @@ -68,8 +80,9 @@ class MinPlugin: FlutterPlugin, MethodCallHandler { result.success(DCUniMPSDK.getInstance().currentPageUrl) } else if (call.method == "startMin") { try { - var appid = call.argument("appid"); - var hashMap = call.argument>("json"); + var appid = call.argument("appid") + var hashMap = call.argument>("json") + Logger.e("startMin_json: ${JSONObject(hashMap as Map<*, *>)}") DCUniMPSDK.getInstance().startApp(context, appid, JSONObject(hashMap as Map<*, *>)) } catch (e: Exception) { e.printStackTrace() diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 56be5563..2d06abcf 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -41,11 +41,21 @@ 6EE8F36E269581E300237A5E /* QuickLook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F36D269581E300237A5E /* QuickLook.framework */; }; 6EE8F370269581EC00237A5E /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F36F269581EC00237A5E /* CoreTelephony.framework */; }; 6EE8F372269581F100237A5E /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F371269581F100237A5E /* AssetsLibrary.framework */; }; - 6EE8F374269581F600237A5E /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F373269581F600237A5E /* CoreLocation.framework */; }; 6EE8F376269581FB00237A5E /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F375269581FB00237A5E /* AddressBook.framework */; }; 6EE8F3782695820600237A5E /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F3772695820600237A5E /* libiconv.tbd */; }; 6EE8F37F269582C200237A5E /* UniappPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EE8F37E269582C200237A5E /* UniappPlugin.m */; }; 899C4C3C26A5179900B44087 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 899C4C3E26A5179900B44087 /* InfoPlist.strings */; }; + 89AEFA3926A67F8400DD2817 /* libDCUniAmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA3826A67F8400DD2817 /* libDCUniAmap.a */; }; + 89AEFA3B26A67F9C00DD2817 /* libDCUniMap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA3A26A67F9C00DD2817 /* libDCUniMap.a */; }; + 89AEFA3D26A67FB100DD2817 /* DCUniVideoPublic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA3C26A67FB100DD2817 /* DCUniVideoPublic.framework */; }; + 89AEFA3F26A67FBD00DD2817 /* AMapSearchKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA3E26A67FBD00DD2817 /* AMapSearchKit.framework */; }; + 89AEFA4126A67FF100DD2817 /* MAMapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA4026A67FF100DD2817 /* MAMapKit.framework */; }; + 89AEFA4526A6802000DD2817 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA4426A6802000DD2817 /* MapKit.framework */; }; + 89AEFA8426A684D800DD2817 /* userPosition@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 89AEFA8226A684D700DD2817 /* userPosition@2x.png */; }; + 89AEFA8F26A699DE00DD2817 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA8E26A699DE00DD2817 /* libz.tbd */; }; + 89AEFA9126A69A2200DD2817 /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA9026A69A2200DD2817 /* ExternalAccessory.framework */; }; + 89AEFA9326A69A3600DD2817 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA9226A69A3600DD2817 /* Security.framework */; }; + 89AEFA9526A69A4800DD2817 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89AEFA9426A69A4800DD2817 /* SystemConfiguration.framework */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -75,7 +85,7 @@ 6EE8F2E62695815A00237A5E /* __uniappes6.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = __uniappes6.js; sourceTree = ""; }; 6EE8F2E72695815A00237A5E /* uni-jsframework.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "uni-jsframework.js"; sourceTree = ""; }; 6EE8F2E82695815A00237A5E /* PandoraApi.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = PandoraApi.bundle; sourceTree = ""; }; - 6EE8F2E92695815A00237A5E /* unincomponents.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = unincomponents.ttf; sourceTree = ""; }; + 6EE8F2E92695815A00237A5E /* unincomponents.ttf */ = {isa = PBXFileReference; lastKnownFileType = text; path = unincomponents.ttf; sourceTree = ""; }; 6EE8F2EA2695815A00237A5E /* weex-polyfill.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "weex-polyfill.js"; sourceTree = ""; }; 6EE8F2EB2695815A00237A5E /* weexUniJs.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = weexUniJs.js; sourceTree = ""; }; 6EE8F2ED2695815C00237A5E /* DCUniMPSDKEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCUniMPSDKEngine.h; sourceTree = ""; }; @@ -195,6 +205,22 @@ 899C4C3D26A5179900B44087 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 899C4C3F26A5179F00B44087 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; 899C4C4026A517A000B44087 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = ""; }; + 89AEFA3826A67F8400DD2817 /* libDCUniAmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libDCUniAmap.a; sourceTree = ""; }; + 89AEFA3A26A67F9C00DD2817 /* libDCUniMap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libDCUniMap.a; sourceTree = ""; }; + 89AEFA3C26A67FB100DD2817 /* DCUniVideoPublic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = DCUniVideoPublic.framework; sourceTree = ""; }; + 89AEFA3E26A67FBD00DD2817 /* AMapSearchKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AMapSearchKit.framework; sourceTree = ""; }; + 89AEFA4026A67FF100DD2817 /* MAMapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MAMapKit.framework; sourceTree = ""; }; + 89AEFA4226A6800800DD2817 /* AMapFoundationKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AMapFoundationKit.framework; sourceTree = ""; }; + 89AEFA4426A6802000DD2817 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; + 89AEFA8226A684D700DD2817 /* userPosition@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "userPosition@2x.png"; sourceTree = ""; }; + 89AEFA8826A6996300DD2817 /* libAMapLocationPlugin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libAMapLocationPlugin.a; sourceTree = ""; }; + 89AEFA8A26A6997E00DD2817 /* liblibGeolocation.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = liblibGeolocation.a; sourceTree = ""; }; + 89AEFA8C26A699A000DD2817 /* AMapLocationKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AMapLocationKit.framework; sourceTree = ""; }; + 89AEFA8E26A699DE00DD2817 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 89AEFA9026A69A2200DD2817 /* ExternalAccessory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExternalAccessory.framework; path = System/Library/Frameworks/ExternalAccessory.framework; sourceTree = SDKROOT; }; + 89AEFA9226A69A3600DD2817 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 89AEFA9426A69A4800DD2817 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + 89AEFA9626A69D8E00DD2817 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -212,18 +238,26 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 89AEFA9526A69A4800DD2817 /* SystemConfiguration.framework in Frameworks */, + 6EE8F370269581EC00237A5E /* CoreTelephony.framework in Frameworks */, + 89AEFA9326A69A3600DD2817 /* Security.framework in Frameworks */, + 6EE8F362269581AF00237A5E /* GLKit.framework in Frameworks */, + 89AEFA9126A69A2200DD2817 /* ExternalAccessory.framework in Frameworks */, + 89AEFA8F26A699DE00DD2817 /* libz.tbd in Frameworks */, + 6EE8F36C269581D500237A5E /* libc++.tbd in Frameworks */, + 89AEFA4526A6802000DD2817 /* MapKit.framework in Frameworks */, + 89AEFA3D26A67FB100DD2817 /* DCUniVideoPublic.framework in Frameworks */, 6EE8F3782695820600237A5E /* libiconv.tbd in Frameworks */, 6EE8F376269581FB00237A5E /* AddressBook.framework in Frameworks */, - 6EE8F374269581F600237A5E /* CoreLocation.framework in Frameworks */, 6EE8F372269581F100237A5E /* AssetsLibrary.framework in Frameworks */, - 6EE8F370269581EC00237A5E /* CoreTelephony.framework in Frameworks */, + 89AEFA3B26A67F9C00DD2817 /* libDCUniMap.a in Frameworks */, 6EE8F36E269581E300237A5E /* QuickLook.framework in Frameworks */, - 6EE8F36C269581D500237A5E /* libc++.tbd in Frameworks */, + 89AEFA4126A67FF100DD2817 /* MAMapKit.framework in Frameworks */, 6EE8F36A269581CC00237A5E /* CoreGraphics.framework in Frameworks */, 6EE8F368269581C300237A5E /* QuartzCore.framework in Frameworks */, + 89AEFA3926A67F8400DD2817 /* libDCUniAmap.a in Frameworks */, 6EE8F366269581BC00237A5E /* CoreText.framework in Frameworks */, 6EE8F364269581B600237A5E /* OpenGLES.framework in Frameworks */, - 6EE8F362269581AF00237A5E /* GLKit.framework in Frameworks */, 6EE8F35F269581A300237A5E /* AVFoundation.framework in Frameworks */, 6EE8F360269581A300237A5E /* AVKit.framework in Frameworks */, 6EE8F35B2695819500237A5E /* MediaPlayer.framework in Frameworks */, @@ -231,6 +265,7 @@ 6EE8F3582695818800237A5E /* JavaScriptCore.framework in Frameworks */, 6EE8F3542695816000237A5E /* liblibNavigator.a in Frameworks */, 6EE8F3502695816000237A5E /* liblibUI.a in Frameworks */, + 89AEFA3F26A67FBD00DD2817 /* AMapSearchKit.framework in Frameworks */, C9444B3318AB7FB815E97950 /* libPods-Runner.a in Frameworks */, 6EE8F3522695816000237A5E /* liblibStorage.a in Frameworks */, 6EE8F34C2695816000237A5E /* liblibIO.a in Frameworks */, @@ -251,6 +286,12 @@ 4ACDDAD1B437E297D1948602 /* Frameworks */ = { isa = PBXGroup; children = ( + 89AEFA9626A69D8E00DD2817 /* Foundation.framework */, + 89AEFA9426A69A4800DD2817 /* SystemConfiguration.framework */, + 89AEFA9226A69A3600DD2817 /* Security.framework */, + 89AEFA9026A69A2200DD2817 /* ExternalAccessory.framework */, + 89AEFA8E26A699DE00DD2817 /* libz.tbd */, + 89AEFA4426A6802000DD2817 /* MapKit.framework */, 6EE8F3772695820600237A5E /* libiconv.tbd */, 6EE8F375269581FB00237A5E /* AddressBook.framework */, 6EE8F373269581F600237A5E /* CoreLocation.framework */, @@ -305,6 +346,7 @@ 6EE8F2E52695815A00237A5E /* Resources */ = { isa = PBXGroup; children = ( + 89AEFA8226A684D700DD2817 /* userPosition@2x.png */, 6EE8F2E62695815A00237A5E /* __uniappes6.js */, 6EE8F2E72695815A00237A5E /* uni-jsframework.js */, 6EE8F2E82695815A00237A5E /* PandoraApi.bundle */, @@ -407,6 +449,15 @@ 6EE8F3382695816000237A5E /* Libs */ = { isa = PBXGroup; children = ( + 89AEFA8C26A699A000DD2817 /* AMapLocationKit.framework */, + 89AEFA8A26A6997E00DD2817 /* liblibGeolocation.a */, + 89AEFA8826A6996300DD2817 /* libAMapLocationPlugin.a */, + 89AEFA4226A6800800DD2817 /* AMapFoundationKit.framework */, + 89AEFA4026A67FF100DD2817 /* MAMapKit.framework */, + 89AEFA3E26A67FBD00DD2817 /* AMapSearchKit.framework */, + 89AEFA3C26A67FB100DD2817 /* DCUniVideoPublic.framework */, + 89AEFA3A26A67F9C00DD2817 /* libDCUniMap.a */, + 89AEFA3826A67F8400DD2817 /* libDCUniAmap.a */, 6EE8F3392695816000237A5E /* libSDWebImage.a */, 6EE8F33A2695816000237A5E /* liblibIO.a */, 6EE8F33B2695816000237A5E /* liblibWeex.a */, @@ -554,6 +605,7 @@ 6EE8F3482695816000237A5E /* unincomponents.ttf in Resources */, 6EE8F34A2695816000237A5E /* weexUniJs.js in Resources */, 6EE8F3492695816000237A5E /* weex-polyfill.js in Resources */, + 89AEFA8426A684D800DD2817 /* userPosition@2x.png in Resources */, 899C4C3C26A5179900B44087 /* InfoPlist.strings in Resources */, 6EE8F3462695816000237A5E /* uni-jsframework.js in Resources */, ); diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 12e1a854..8d7965e9 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -2,6 +2,10 @@ + amap + + appkey + feaae7986201b571cace1b83728be5bb CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/AMapFoundationKit b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/AMapFoundationKit new file mode 100644 index 00000000..78e139f1 Binary files /dev/null and b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/AMapFoundationKit differ diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationConst.h b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationConst.h new file mode 100644 index 00000000..8bd86abf --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationConst.h @@ -0,0 +1,48 @@ +// +// AMapFoundationConst.h +// AMapFoundationKit +// +// Created by JL on 2019/7/22. +// Copyright © 2019 Amap.com. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +typedef NSInteger AMapFoundationNSErrorCode; + +//ErrorDomain:文件不存在 错误码:-555555 +extern NSErrorDomain const AMapFoundationNSErrorFileDonotExist; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorFileDonotExistCode; + +//ErrorDomain:文件路径不合法 错误码:-555556 +extern NSErrorDomain const AMapFoundationNSErrorFilePathInvaild; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorFilePathInvaildCode; + +//ErrorDomain:指定类型的日志文件不存在 错误码:-555557 +extern NSErrorDomain const AMapFoundationNSErrorTypeLogDonotExist; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorTypeLogDonotExistCode; + +//ErrorDomain:待上传的数据为空(可能是组装/压缩时出错) 错误码:-555558 +extern NSErrorDomain const AMapFoundationNSErrorUploadDataIsEmpty; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorUploadDataIsEmptyCode; + +//ErrorDomain:参数错误 错误码:-444444 +extern NSErrorDomain const AMapFoundationNSErrorParametersInvalid; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorParametersInvalidCode; + + +extern NSErrorDomain const AMapFoundationNSErrorCloudConfigDisable; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorCloudConfigDisableCode; + +extern NSErrorDomain const AMapFoundationNSErrorNetworkUnusable; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorNetworkUnusableCode; + +extern NSErrorDomain const AMapFoundationNSErrorCurrentworkIsRunning; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorCurrentworkIsRunningCode; + +extern NSErrorDomain const AMapFoundationNSErrorCurrentUploadSizeHaveExcess; +extern AMapFoundationNSErrorCode const AMapFoundationNSErrorCurrentUploadSizeHaveExcessCode; + +NS_ASSUME_NONNULL_END diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationKit.h b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationKit.h new file mode 100644 index 00000000..258e115f --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationKit.h @@ -0,0 +1,16 @@ +// +// AMapFoundationKit.h +// AMapFoundationKit +// +// Created by xiaoming han on 15/10/28. +// Copyright © 2015年 Amap. All rights reserved. +// + +#import +#import +#import +#import +#import +#import + +#import diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationVersion.h b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationVersion.h new file mode 100644 index 00000000..665e6af2 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapFoundationVersion.h @@ -0,0 +1,19 @@ +// +// AMapFoundationVersion.h +// AMapFoundation +// +// Created by xiaoming han on 15/10/26. +// Copyright © 2015年 Amap. All rights reserved. +// + +#import + +#ifndef AMapFoundationVersion_h +#define AMapFoundationVersion_h + +#define AMapFoundationVersionNumber 10604 + +FOUNDATION_EXTERN NSString * const AMapFoundationVersion; +FOUNDATION_EXTERN NSString * const AMapFoundationName; + +#endif /* AMapFoundationVersion_h */ diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapServices.h b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapServices.h new file mode 100644 index 00000000..1cfe6385 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapServices.h @@ -0,0 +1,39 @@ +// +// AMapSearchServices.h +// AMapSearchKit +// +// Created by xiaoming han on 15/6/18. +// Copyright (c) 2015年 xiaoming han. All rights reserved. +// + +#import + + +/** + * 是否为海外用户...海外用户,SDK内部会屏蔽一些操作 默认为NO. + * @warning AMapServices初始化之前,设置才能生效 + */ +extern BOOL _amapLocationOverseas; + +///高德SDK服务类 +@interface AMapServices : NSObject + +/** + * @brief 获取单例 + */ ++ (AMapServices *)sharedServices; + + +///APIkey。设置key，需要在高德官网控制台绑定对应的bundleid。 +@property (nonatomic, copy) NSString *apiKey; + +///是否开启HTTPS，从1.3.3版本开始默认为YES。 +@property (nonatomic, assign) BOOL enableHTTPS; + +///是否启用崩溃日志上传。默认为YES, 只有在真机上设置有效。\n开启崩溃日志上传有助于我们更好的了解SDK的状况，可以帮助我们持续优化和改进SDK。需要注意的是，SDK内部是通过设置NSUncaughtExceptionHandler来捕获异常的，如果您的APP中使用了其他收集崩溃日志的SDK，或者自己有设置NSUncaughtExceptionHandler的话，请保证 AMapServices 的初始化是在其他设置NSUncaughtExceptionHandler操作之后进行的，我们的handler会再处理完异常后调用前一次设置的handler，保证之前设置的handler会被执行。 +@property (nonatomic, assign) BOOL crashReportEnabled __attribute__((deprecated("从v1.5.7开始废弃，调用无任何作用"))); + +///设备标识，取自idfv。用于排查问题时提供。 +@property (nonatomic, readonly) NSString *identifier; + +@end diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearch.h b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearch.h new file mode 100644 index 00000000..9379f4f8 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearch.h @@ -0,0 +1,41 @@ +// +// AMapURLSearch.h +// AMapFoundation +// +// Created by xiaoming han on 15/10/28. +// Copyright © 2015年 Amap. All rights reserved. +// + +#import +#import "AMapURLSearchConfig.h" + +///调起高德地图URL进行搜索，若是调起失败，可使用`+ (void)getLatestAMapApp;`方法获取最新版高德地图app. +@interface AMapURLSearch : NSObject + +/** + * @brief 打开高德地图AppStore页面 + */ ++ (void)getLatestAMapApp; + +/** + * @brief 调起高德地图app驾车导航. + * @param config 配置参数. + * @return 是否成功.若为YES则成功调起，若为NO则无法调起. + */ ++ (BOOL)openAMapNavigation:(AMapNaviConfig *)config; + +/** + * @brief 调起高德地图app进行路径规划. + * @param config 配置参数. + * @return 是否成功. + */ ++ (BOOL)openAMapRouteSearch:(AMapRouteConfig *)config; + +/** + * @brief 调起高德地图app进行POI搜索. + * @param config 配置参数. + * @return 是否成功. + */ ++ (BOOL)openAMapPOISearch:(AMapPOIConfig *)config; + +@end diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearchConfig.h b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearchConfig.h new file mode 100644 index 00000000..666b492e --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearchConfig.h @@ -0,0 +1,79 @@ +// +// MAMapURLSearchConfig.h +// MAMapKitNew +// +// Created by xiaoming han on 15/5/25. +// Copyright (c) 2015年 xiaoming han. All rights reserved. +// + +#import +#import +#import "AMapURLSearchType.h" + +///导航配置信息 +@interface AMapNaviConfig : NSObject + +///应用返回的Scheme +@property (nonatomic, copy) NSString *appScheme; + +///应用名称 +@property (nonatomic, copy) NSString *appName; + +///终点 +@property (nonatomic, assign) CLLocationCoordinate2D destination; + +///导航策略 +@property (nonatomic, assign) AMapDrivingStrategy strategy; + +@end + +#pragma mark - + +///路径搜索配置信息 +@interface AMapRouteConfig : NSObject + +///应用返回的Scheme +@property (nonatomic, copy) NSString *appScheme; + +///应用名称 +@property (nonatomic, copy) NSString *appName; + +///起点坐标 +@property (nonatomic, assign) CLLocationCoordinate2D startCoordinate; + +///终点坐标 +@property (nonatomic, assign) CLLocationCoordinate2D destinationCoordinate; + +///驾车策略 +@property (nonatomic, assign) AMapDrivingStrategy drivingStrategy; + +///公交策略 +@property (nonatomic, assign) AMapTransitStrategy transitStrategy; + +///路径规划类型 +@property (nonatomic, assign) AMapRouteSearchType routeType; + +@end + +#pragma mark - + +///POI搜索配置信息 +@interface AMapPOIConfig : NSObject + +///应用返回的Scheme +@property (nonatomic, copy) NSString *appScheme; + +///应用名称 +@property (nonatomic, copy) NSString *appName; + +///搜索关键字 +@property (nonatomic, copy) NSString *keywords; + +///左上角坐标 +@property (nonatomic, assign) CLLocationCoordinate2D leftTopCoordinate; + +///右下角坐标 +@property (nonatomic, assign) CLLocationCoordinate2D rightBottomCoordinate; + +@end + diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearchType.h b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearchType.h new file mode 100644 index 00000000..424d9059 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapURLSearchType.h @@ -0,0 +1,44 @@ +// +// MAMapURLSearchType.h +// MAMapKitNew +// +// Created by xiaoming han on 15/5/25. +// Copyright (c) 2015年 xiaoming han. All rights reserved. +// + +///驾车策略 +typedef NS_ENUM(NSInteger, AMapDrivingStrategy) +{ + AMapDrivingStrategyFastest = 0, ///<速度最快 + AMapDrivingStrategyMinFare = 1, ///<避免收费 + AMapDrivingStrategyShortest = 2, ///<距离最短 + + AMapDrivingStrategyNoHighways = 3, ///<不走高速 + AMapDrivingStrategyAvoidCongestion = 4, ///<躲避拥堵 + + AMapDrivingStrategyAvoidHighwaysAndFare = 5, ///<不走高速且避免收费 + AMapDrivingStrategyAvoidHighwaysAndCongestion = 6, ///<不走高速且躲避拥堵 + AMapDrivingStrategyAvoidFareAndCongestion = 7, ///<躲避收费和拥堵 + AMapDrivingStrategyAvoidHighwaysAndFareAndCongestion = 8 ///<不走高速躲避收费和拥堵 +}; + +///公交策略 +typedef NS_ENUM(NSInteger, AMapTransitStrategy) +{ + AMapTransitStrategyFastest = 0,///<最快捷 + AMapTransitStrategyMinFare = 1,///<最经济 + AMapTransitStrategyMinTransfer = 2,///<最少换乘 + AMapTransitStrategyMinWalk = 3,///<最少步行 + AMapTransitStrategyMostComfortable = 4,///<最舒适 + AMapTransitStrategyAvoidSubway = 5,///<不乘地铁 +}; + +///路径规划类型 +typedef NS_ENUM(NSInteger, AMapRouteSearchType) +{ + AMapRouteSearchTypeDriving = 0, ///<驾车 + AMapRouteSearchTypeTransit = 1, ///<公交 + AMapRouteSearchTypeWalking = 2, ///<步行 +}; + + diff --git a/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapUtility.h b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapUtility.h new file mode 100644 index 00000000..6cb26929 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapFoundationKit.framework/Headers/AMapUtility.h @@ -0,0 +1,50 @@ +// +// AMapUtility.h +// AMapFoundation +// +// Created by xiaoming han on 15/10/27. +// Copyright © 2015年 Amap. All rights reserved. +// + +#import +#import + +//工具方法 + +/** + * @brief 如果字符串为nil则返回空字符串 + */ +FOUNDATION_STATIC_INLINE NSString * AMapEmptyStringIfNil(NSString *s) +{ + return s ? s : @""; +} + +///坐标类型枚举 +typedef NS_ENUM(NSInteger, AMapCoordinateType) +{ + AMapCoordinateTypeAMap = -1, /// +#import "AMapGeoFenceRegionObj.h" + +// 以下类涉及的坐标需要使用高德坐标系坐标(GCJ02) + +@protocol AMapGeoFenceManagerDelegate; + +///地理围栏监听状态类型 +typedef NS_OPTIONS(NSUInteger, AMapGeoFenceActiveAction) +{ + AMapGeoFenceActiveActionNone = 0, ///< 不进行监听 + AMapGeoFenceActiveActionInside = 1 << 0, ///< 在范围内 + AMapGeoFenceActiveActionOutside = 1 << 1, ///< 在范围外 + AMapGeoFenceActiveActionStayed = 1 << 2, ///< 停留(在范围内超过10分钟) +}; + +///地理围栏任务状态类型 +typedef NS_OPTIONS(NSUInteger, AMapGeoFenceRegionActiveStatus) +{ + AMapGeoFenceRegionActiveUNMonitor = 0, ///< 未注册 + AMapGeoFenceRegionActiveMonitoring = 1 << 0, ///< 正在监控 + AMapGeoFenceRegionActivePaused = 1 << 1, ///< 暂停监控 +}; + +///地理围栏管理类（since 2.3.0） +@interface AMapGeoFenceManager : NSObject + + +///实现了 AMapGeoFenceManagerDelegate 协议的类指针。 +@property (nonatomic, weak) id delegate; + + +///需要进行通知的行为，默认为AMapGeoFenceActiveActionInside。 +@property (nonatomic, assign) AMapGeoFenceActiveAction activeAction; + + +///指定定位是否会被系统自动暂停。默认为NO。 +@property (nonatomic, assign) BOOL pausesLocationUpdatesAutomatically; + + +///是否允许后台定位。默认为NO。只在iOS 9.0及之后起作用。设置为YES的时候必须保证 Background Modes 中的 Location updates 处于选中状态，否则会抛出异常。 +@property (nonatomic, assign) BOOL allowsBackgroundLocationUpdates; + +///检测是否存在虚拟定位风险，默认为NO，即不检测。 \n如果设置为YES，检测到风险后，会通过amapGeoFenceManager:didGeoFencesStatusChangedForRegion:customID:error: 的error给出风险提示，error的格式为error.domain==AMapGeoFenceErrorDomain; error.code==AMapGeoFenceErroFailureLocating; +@property (nonatomic, assign) BOOL detectRiskOfFakeLocation; + + +/** + * @brief 添加一个圆形围栏 + * @param center 围栏的中心点经纬度坐标 + * @param radius 围栏的半径，单位：米，要求大于0 + * @param customID 用户自定义ID，可选，SDK原值返回 + */ +- (void)addCircleRegionForMonitoringWithCenter:(CLLocationCoordinate2D)center radius:(CLLocationDistance)radius customID:(NSString *)customID; + + +/** + * @brief 根据经纬度坐标数据添加一个闭合的多边形围栏，点与点之间按顺序尾部相连, 第一个点与最后一个点相连 + * @param coordinates 经纬度坐标点数据,coordinates对应的内存会拷贝,调用者负责该内存的释放 + * @param count 经纬度坐标点的个数，不可小于3个 + * @param customID 用户自定义ID，可选，SDK原值返回 + */ +- (void)addPolygonRegionForMonitoringWithCoordinates:(CLLocationCoordinate2D *)coordinates count:(NSInteger)count customID:(NSString *)customID; + + +/** + * @brief 根据要查询的关键字，类型，城市等信息，添加一个或者多个POI地理围栏 + * @param keyword 要查询的关键字，多个关键字用“|”分割，必填，keyword和type两者至少必选其一 + * @param type 要查询的POI类型，多个类型用“|”分割，必填，keyword和type两者至少必选其一，具体分类编码和规则详见： http://lbs.amap.com/api/webservice/guide/api/search/#text + * @param city 要查询的城市 + * @param size 要查询的数据的条数，(0,25]，传入<=0的值为10，传入大于25的值为25，默认10 + * @param customID 用户自定义ID，可选，SDK原值返回 + */ +- (void)addKeywordPOIRegionForMonitoringWithKeyword:(NSString *)keyword POIType:(NSString *)type city:(NSString *)city size:(NSInteger)size customID:(NSString *)customID; + + +/** + * @brief 根据要查询的点的经纬度，搜索半径等信息，添加一个或者多个POI围栏 + * @param locationPoint 点的经纬度坐标，必填 + * @param aroundRadius 查询半径，单位：米，(0,50000]，超出范围取3000，默认3000 + * @param keyword 要查询的关键字，多个关键字用“|”分割，可选 + * @param type 要查询的POI类型，多个类型用“|”分割，可选 + * @param size 要查询的数据的条数，(0,25]，传入<=0的值为10，传入大于25的值为25，默认10 + * @param customID 用户自定义ID，可选，SDK原值返回 + */ +- (void)addAroundPOIRegionForMonitoringWithLocationPoint:(CLLocationCoordinate2D)locationPoint aroundRadius:(NSInteger)aroundRadius keyword:(NSString *)keyword POIType:(NSString *)type size:(NSInteger)size customID:(NSString *)customID; + + +/** + * @brief 根据要查询的行政区域关键字，添加一个或者多个行政区域围栏 + * @param districtName 行政区域关键字，必填，只支持单个关键词语：行政区名称、citycode、adcode，规则详见： http://lbs.amap.com/api/webservice/guide/api/district/#district + * @param customID 用户自定义ID，可选，SDK原值返回 + */ +- (void)addDistrictRegionForMonitoringWithDistrictName:(NSString *)districtName customID:(NSString *)customID; + +/** + * @brief 获取指定围栏的运行状态 + * @param region 要获取运行状态的围栏 + * @return 返回指定围栏的运行状态 + */ +- (AMapGeoFenceRegionActiveStatus)statusWithGeoFenceRegion:(AMapGeoFenceRegion *)region; + +/** + * @brief 根据customID获得所有已经注册的围栏，如果customID传nil，则返回全部已注册围栏 + * @param customID 用户执行添加围栏函数时传入的customID + * @return 获得的围栏构成的数组，如果没有结果，返回nil + */ +- (NSArray *)geoFenceRegionsWithCustomID:(NSString *)customID; + +/** + * @brief 根据customID获得所有正在监控的围栏，如果customID传nil，则返回全部正在监控的围栏 + * @param customID 用户执行添加围栏函数时传入的customID + * @return 获得的围栏构成的数组，如果没有结果，返回nil + */ +- (NSArray *)monitoringGeoFenceRegionsWithCustomID:(NSString *)customID; + +/** + * @brief 根据customID获得所有已经暂停的围栏，如果customID传nil，则返回全部已经暂停的围栏 + * @param customID 用户执行添加围栏函数时传入的customID + * @return 获得的围栏构成的数组，如果没有结果，返回nil + */ +- (NSArray *)pausedGeoFenceRegionsWithCustomID:(NSString *)customID; + + +/** + * @brief 暂停指定customID的围栏 + * @param customID 用户执行添加围栏函数时传入的customID + * @return 返回被暂停围栏的数组，如果没有围栏被暂停，返回nil + */ +- (NSArray *)pauseGeoFenceRegionsWithCustomID:(NSString *)customID; + + +/** + * @brief 暂停指定围栏 + * @param region 要暂停监控的围栏 + * @return 返回指定围栏是否被暂停，如果指定围栏没有注册，则返回NO + */ +- (BOOL)pauseTheGeoFenceRegion:(AMapGeoFenceRegion *)region; + +/** + * @brief 根据customID开始监控已经暂停的围栏 + * @param customID 用户执行添加围栏函数时传入的customID + * @return 返回开始监控的围栏构成的数组 + */ +- (NSArray *)startGeoFenceRegionsWithCustomID:(NSString *)customID; + +/** + * @brief 开始监控指定围栏 + * @param region 要开始监控的围栏 + * @return 返回指定围栏是否开始监控，如果指定围栏没有注册，则返回NO + */ +- (BOOL)startTheGeoFenceRegion:(AMapGeoFenceRegion *)region; + +/** + * @brief 移除指定围栏 + * @param region 要停止监控的围栏 + */ +- (void)removeTheGeoFenceRegion:(AMapGeoFenceRegion *)region; + +/** + * @brief 移除指定customID的围栏 + * @param customID 用户执行添加围栏函数时传入的customID + */ +- (void)removeGeoFenceRegionsWithCustomID:(NSString *)customID; + +/** + * @brief 移除所有围栏 + */ +- (void)removeAllGeoFenceRegions; + +@end + +///地理围栏代理协议（since 2.3.0）,该协议定义了获取地理围栏相关回调方法，包括添加、状态改变等。 +@protocol AMapGeoFenceManagerDelegate + +@required + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 + +/** + * @brief iOS14及以上版本使用地理围栏功能，需要在plist中配置NSLocationTemporaryUsageDescriptionDictionary字典描述，且添加自定义Key描述地理围栏的使用场景，此描述会在申请临时精确定位权限的弹窗中展示。该回调触发条件：拥有定位权限，但是没有获得精确定位权限的情况下，会触发该回调。此方法实现调用申请临时精确定位权限API即可： + * [manager requestTemporaryFullAccuracyAuthorizationWithPurposeKey:@"PurposeKey" completion:^(NSError *error){ + * if(completion){ + * completion(error); + * } + * }]; (必须调用,不然无法正常获取临时精确定位权限) + * @param manager 地理围栏管理类。 + * @param locationManager 需要申请临时精确定位权限的locationManager。 + * @param completion 临时精确定位权限API回调结果。直接返回系统error即可 + * @since 2.6.7 + */ +- (void)amapLocationManager:(AMapGeoFenceManager *)manager doRequireTemporaryFullAccuracyAuth:(CLLocationManager*)locationManager completion:(void(^)(NSError *error))completion; + +#endif + +@optional + +/** + * @brief 当plist配置NSLocationAlwaysUsageDescription或者NSLocationAlwaysAndWhenInUseUsageDescription，并且[CLLocationManager authorizationStatus] == kCLAuthorizationStatusNotDetermined，会调用代理的此方法。 + 此方法实现申请后台权限API即可：[locationManager requestAlwaysAuthorization](必须调用,不然无法正常获取定位权限) + * @param manager 地理围栏管理类。 + * @param locationManager 需要申请后台定位权限的locationManager。 + * @since 2.6.2 + */ +- (void)amapGeoFenceManager:(AMapGeoFenceManager *)manager doRequireLocationAuth:(CLLocationManager*)locationManager; + +/** + * @brief 添加地理围栏完成后的回调，成功与失败都会调用 + * @param manager 地理围栏管理类 + * @param regions 成功添加的一个或多个地理围栏构成的数组 + * @param customID 用户执行添加围栏函数时传入的customID + * @param error 添加失败的错误信息 + */ +- (void)amapGeoFenceManager:(AMapGeoFenceManager *)manager didAddRegionForMonitoringFinished:(NSArray *)regions customID:(NSString *)customID error:(NSError *)error; + + +/** + * @brief 地理围栏状态改变时回调，当围栏状态的值发生改变，定位失败都会调用 + * @param manager 地理围栏管理类 + * @param region 状态改变的地理围栏 + * @param customID 用户执行添加围栏函数时传入的customID + * @param error 错误信息，如定位相关的错误 + */ +- (void)amapGeoFenceManager:(AMapGeoFenceManager *)manager didGeoFencesStatusChangedForRegion:(AMapGeoFenceRegion *)region customID:(NSString *)customID error:(NSError *)error; + +@end diff --git a/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapGeoFenceRegionObj.h b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapGeoFenceRegionObj.h new file mode 100644 index 00000000..833fa9ca --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapGeoFenceRegionObj.h @@ -0,0 +1,120 @@ +// +// AMapGeoFenceRegionObj.h +// AMapLocationKit +// +// Created by hanxiaoming on 16/12/5. +// Copyright © 2016年 Amap. All rights reserved. +// + +#import "AMapLocationCommonObj.h" + + +///AMapGeoFence Region State +typedef NS_ENUM(NSInteger, AMapGeoFenceRegionStatus) +{ + AMapGeoFenceRegionStatusUnknown = 0, ///< 未知 + AMapGeoFenceRegionStatusInside = 1, ///< 在范围内 + AMapGeoFenceRegionStatusOutside = 2, ///< 在范围外 + AMapGeoFenceRegionStatusStayed = 3, ///< 停留(在范围内超过10分钟) +}; + +typedef NS_ENUM(NSInteger, AMapGeoFenceRegionType) +{ + AMapGeoFenceRegionTypeCircle = 0, /// 圆形地理围栏 + AMapGeoFenceRegionTypePolygon = 1, /// 多边形地理围栏 + AMapGeoFenceRegionTypePOI = 2, /// 兴趣点（POI）地理围栏 + AMapGeoFenceRegionTypeDistrict = 3, /// 行政区划地理围栏 +}; + +#pragma mark - AMapGeoFenceRegion + + +///地理围栏基类，不可直接使用。（since 2.3.0） +@interface AMapGeoFenceRegion : NSObject + + +///AMapGeoFenceRegion的唯一标识符 +@property (nonatomic, copy, readonly) NSString *identifier; + + +///用户自定义ID，可为nil。 +@property (nonatomic, copy, readonly) NSString *customID; + + +///坐标点和围栏的关系，比如用户的位置和围栏的关系 +@property (nonatomic, assign) AMapGeoFenceRegionStatus fenceStatus; + +///用户自定义ID，可为nil。 +@property (nonatomic, assign) AMapGeoFenceRegionType regionType; + +///缓存最近获取的定位信息，可能会存在延时，可为nil，会在获取定位时更新 +@property (nonatomic, copy) CLLocation *currentLocation; + +@end + + +#pragma mark - AMapLocationCircleRegion + + +///圆形地理围栏（since 2.3.0） +@interface AMapGeoFenceCircleRegion : AMapGeoFenceRegion + + +///中心点的经纬度坐标 +@property (nonatomic, readonly) CLLocationCoordinate2D center; + + +///半径，单位：米 +@property (nonatomic, readonly) CLLocationDistance radius; + +@end + + +#pragma mark -AMapGeoFencePolygonRegion + + +///多边形地理围栏（since 2.3.0） +@interface AMapGeoFencePolygonRegion : AMapGeoFenceRegion + + +///经纬度坐标点数据 +@property (nonatomic, readonly) CLLocationCoordinate2D *coordinates; + + +///经纬度坐标点的个数 +@property (nonatomic, readonly) NSInteger count; + + +@end + + +#pragma mark -AMapGeoFencePOIRegion + + +///兴趣点（POI）地理围栏（since 2.3.0） +@interface AMapGeoFencePOIRegion : AMapGeoFenceCircleRegion + + +///POI信息 +@property (nonatomic, strong, readonly) AMapLocationPOIItem *POIItem; + + +@end + + +#pragma mark -AMapGeoFenceDistrictRegion + + +///行政区划地理围栏（since 2.3.0） +@interface AMapGeoFenceDistrictRegion : AMapGeoFenceRegion + + +///行政区域信息 +@property (nonatomic, strong, readonly) AMapLocationDistrictItem *districtItem; + + +///行政区域轮廓坐标点，每个行政区可能有多个模块,每个模块的坐标点数组由AMapLocationPoint构成 +@property (nonatomic, copy, readonly) NSArray *> *polylinePoints; + + +@end diff --git a/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationCommonObj.h b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationCommonObj.h new file mode 100644 index 00000000..6b6ac44c --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationCommonObj.h @@ -0,0 +1,202 @@ +// +// AMapLocationCommonObj.h +// AMapLocationKit +// +// Created by AutoNavi on 15/10/22. +// Copyright © 2015年 Amap. All rights reserved. +// + +#import +#import +#import + + +///AMapLocation errorDomain +extern NSString * const AMapLocationErrorDomain; + +///AMapLocation errorCode +typedef NS_ENUM(NSInteger, AMapLocationErrorCode) +{ + AMapLocationErrorUnknown = 1, ///<未知错误 + AMapLocationErrorLocateFailed = 2, ///<定位错误 + AMapLocationErrorReGeocodeFailed = 3, ///<逆地理错误 + AMapLocationErrorTimeOut = 4, ///<超时 + AMapLocationErrorCanceled = 5, ///<取消 + AMapLocationErrorCannotFindHost = 6, ///<找不到主机 + AMapLocationErrorBadURL = 7, /// + +///格式化地址 +@property (nonatomic, copy) NSString *formattedAddress; + +///国家 +@property (nonatomic, copy) NSString *country; + +///省/直辖市 +@property (nonatomic, copy) NSString *province; + +///市 +@property (nonatomic, copy) NSString *city; + +///区 +@property (nonatomic, copy) NSString *district; + +///乡镇 +@property (nonatomic, copy) NSString *township __attribute__((deprecated("该字段从v2.2.0版本起不再返回数据,建议您使用AMapSearchKit的逆地理功能获取."))); + +///社区 +@property (nonatomic, copy) NSString *neighborhood __attribute__((deprecated("该字段从v2.2.0版本起不再返回数据,建议您使用AMapSearchKit的逆地理功能获取."))); + +///建筑 +@property (nonatomic, copy) NSString *building __attribute__((deprecated("该字段从v2.2.0版本起不再返回数据,建议您使用AMapSearchKit的逆地理功能获取."))); + +///城市编码 +@property (nonatomic, copy) NSString *citycode; + +///区域编码 +@property (nonatomic, copy) NSString *adcode; + +///街道名称 +@property (nonatomic, copy) NSString *street; + +///门牌号 +@property (nonatomic, copy) NSString *number; + +///兴趣点名称 +@property (nonatomic, copy) NSString *POIName; + +///所属兴趣点名称 +@property (nonatomic, copy) NSString *AOIName; + +@end + +#pragma mark - AMapLocationPoint + +///经纬度坐标点对象 +@interface AMapLocationPoint : NSObject + +///纬度 +@property (nonatomic, assign) CGFloat latitude; + +///经度 +@property (nonatomic, assign) CGFloat longitude; + +/** + * @brief AMapNaviPoint类对象的初始化函数 + * @param lat 纬度 + * @param lon 经度 + * @return AMapNaviPoint类对象id + */ ++ (AMapLocationPoint *)locationWithLatitude:(CGFloat)lat longitude:(CGFloat)lon; + +@end + +///POI信息 +@interface AMapLocationPOIItem : NSObject + +///id +@property (nonatomic, copy) NSString *pId; + +///名称 +@property (nonatomic, copy) NSString *name; + +///类型 +@property (nonatomic, copy) NSString *type; + +///类型编码 +@property (nonatomic, copy) NSString *typeCode; + +///地址信息 +@property (nonatomic, copy) NSString *address; + +///经纬度 +@property (nonatomic, strong) AMapLocationPoint *location; + +///电话号码 +@property (nonatomic, copy) NSString *tel; + +///省份 +@property (nonatomic, copy) NSString *province; + +///城市 +@property (nonatomic, copy) NSString *city; + +///区 +@property (nonatomic, copy) NSString *district; + +@end + +///行政区域信息 +@interface AMapLocationDistrictItem : NSObject + +///城市编码 +@property (nonatomic, copy) NSString *cityCode; + +///区域编码 +@property (nonatomic, copy) NSString *districtCode; + +///区名 +@property (nonatomic, copy) NSString *district; + +///行政区域轮廓坐标点，每个行政区可能有多个模块,每个模块的坐标点数组由AMapLocationPoint构成 +@property (nonatomic, copy) NSArray *> *polylinePoints; + +@end + +///AMapLocation CoordinateType +typedef NS_ENUM(NSUInteger, AMapLocationCoordinateType) +{ + AMapLocationCoordinateTypeBaidu = 0, /// + +#import +#import +#import + +#import +#import +#import diff --git a/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationManager.h b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationManager.h new file mode 100644 index 00000000..d0197817 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationManager.h @@ -0,0 +1,275 @@ +// +// AMapLocationManager.h +// AMapLocationKit +// +// Created by AutoNavi on 15/10/22. +// Copyright © 2015年 Amap. All rights reserved. +// + +#import +#import "AMapLocationCommonObj.h" +#import "AMapLocationRegionObj.h" + +/** + * @brief AMapLocatingCompletionBlock 单次定位返回Block + * @param location 定位信息 + * @param regeocode 逆地理信息 + * @param error 错误信息，参考 AMapLocationErrorCode + */ +typedef void (^AMapLocatingCompletionBlock)(CLLocation *location, AMapLocationReGeocode *regeocode, NSError *error); + +@protocol AMapLocationManagerDelegate; + +#pragma mark - AMapLocationManager + +///AMapLocationManager类。初始化之前请设置 AMapServices 中的apikey(例如：[AMapServices sharedServices].apiKey = @"您的key")，否则将无法正常使用服务. +@interface AMapLocationManager : NSObject + +///实现了 AMapLocationManagerDelegate 协议的类指针。 +@property (nonatomic, weak) id delegate; + +///设定定位的最小更新距离。单位米，默认为 kCLDistanceFilterNone，表示只要检测到设备位置发生变化就会更新位置信息。 +@property(nonatomic, assign) CLLocationDistance distanceFilter; + +///设定期望的定位精度。单位米，默认为 kCLLocationAccuracyBest。定位服务会尽可能去获取满足desiredAccuracy的定位结果，但不保证一定会得到满足期望的结果。 +///注意：设置为kCLLocationAccuracyBest或kCLLocationAccuracyBestForNavigation时，单次定位会在达到locationTimeout设定的时间后，将时间内获取到的最高精度的定位结果返回。 +///⚠️ 当iOS14及以上时，模糊定位权限下可能拿不到设置精度的经纬度 +@property(nonatomic, assign) CLLocationAccuracy desiredAccuracy; + +///指定定位是否会被系统自动暂停。默认为NO。 +@property(nonatomic, assign) BOOL pausesLocationUpdatesAutomatically; + +///是否允许后台定位。默认为NO。只在iOS 9.0及之后起作用。设置为YES的时候必须保证 Background Modes 中的 Location updates 处于选中状态，否则会抛出异常。由于iOS系统限制，需要在定位未开始之前或定位停止之后，修改该属性的值才会有效果。 +@property(nonatomic, assign) BOOL allowsBackgroundLocationUpdates; + +///指定单次定位超时时间,默认为10s。最小值是2s。注意单次定位请求前设置。注意: 单次定位超时时间从确定了定位权限(非kCLAuthorizationStatusNotDetermined状态)后开始计算。 +@property(nonatomic, assign) NSInteger locationTimeout; + +///指定单次定位逆地理超时时间,默认为5s。最小值是2s。注意单次定位请求前设置。 +@property(nonatomic, assign) NSInteger reGeocodeTimeout; + +///连续定位是否返回逆地理信息，默认NO。 +@property (nonatomic, assign) BOOL locatingWithReGeocode; + +///逆地址语言类型，默认是AMapLocationRegionLanguageDefault +@property (nonatomic, assign) AMapLocationReGeocodeLanguage reGeocodeLanguage; + +///获取被监控的region集合。 +@property (nonatomic, readonly, copy) NSSet *monitoredRegions; + +///检测是否存在虚拟定位风险，默认为NO，不检测。 \n注意:设置为YES时，单次定位通过 AMapLocatingCompletionBlock 的error给出虚拟定位风险提示；连续定位通过 amapLocationManager:didFailWithError: 方法的error给出虚拟定位风险提示。error格式为 error.domain==AMapLocationErrorDomain; error.code==AMapLocationErrorRiskOfFakeLocation; \n附带的error的详细信息参考 error.localizedDescription 中的描述以及 error.userInfo 中的信息(error.userInfo.AMapLocationRiskyLocateResult 表示有虚拟风险的定位结果; error.userInfo.AMapLocationAccessoryInfo 表示外接辅助设备信息)。 +@property (nonatomic, assign) BOOL detectRiskOfFakeLocation; + + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 + +/** + * @brief 设置预期定位精度权限模式，默认为CLAccuracyAuthorizationFullAccuracy精确模式。 + 注意：如果定位时未获得定位权限，则首先会调用申请定位权限API，实际定位精度权限取决于用户的权限设置，当前定位精度权限可通过currentAuthorization获取；如果定位时已获得定位模糊权限，该属性设置CLAccuracyAuthorizationFullAccuracy，则会触发回调amapLocationManager:doRequireTemporaryFullAccuracyAuth:completion:，需在该回调中实现调用申请临时精确定位权限API，如果用户选择拒绝，则可以在completion回调中设置ignoreAuthMatch控制是否要继续开启模糊定位；如果定位时已获得精确定位权限，则可通过desiredAccuracy参数设定期望的定位精度； + * @since 2.6.7 + */ +//@property (nonatomic, assign) CLAccuracyAuthorization desiredAccuracyMode API_AVAILABLE(ios(14.0)); + +/** + * @brief 设置定位数据回调精度模式，默认为AMapLocationAccuracyFullAndReduce。 + 注意：如果定位时未获得定位权限，则首先会调用申请定位权限API，实际定位精度权限取决于用户的权限设置。 + * ———————————————————————————————————————————————————————————————— + * | 设置选项 | doRequireTemporaryFullAccuracyAuth | 异常/定位数据回调 | + * | AMapLocationFullAndReduceAccuracy | 会触发申请临时精确定位回调 | 如果未获得精确定位权限，则依然开启定位，回调模糊定位 | + * | AMapLocationFullAccuracy | 会触发申请临时精确定位回调 | 如果未获得精确定位权限，则不开启定位，回调error | + * | AMapLocationReduceAccuracy | 不会触发申请临时精确定位回调 | 根据当前定位精度权限，回调定位数据 | + * ———————————————————————————————————————————————————————————————— + * 当设置AMapLocationFullAndReduceAccuracy时，定位数据回调可通过currentAuthorization判断当前是否是精确定位 + * @since 2.6.7 + */ +@property (nonatomic, assign) AMapLocationAccuracyMode locationAccuracyMode API_AVAILABLE(ios(14.0)); + +/** + * @brief 获取当前定位精度权限。注意：可能与setAccuracyAuthorizationMode设置不一致 + * @since 2.6.7 + */ +@property (nonatomic, readonly) CLAccuracyAuthorization currentAuthorization API_AVAILABLE(ios(14.0)); + +#endif + +/** + * @brief 设备是否支持方向识别 + * @return YES:设备支持方向识别 ; NO:设备不支持支持方向识别 + */ ++ (BOOL)headingAvailable; + +/** + * @brief 开始获取设备朝向，如果设备支持方向识别，则会通过代理回调方法 + */ +- (void)startUpdatingHeading; + +/** + * @brief 停止获取设备朝向 + */ +- (void)stopUpdatingHeading; + +/** + * @brief 停止设备朝向校准显示 + */ +- (void)dismissHeadingCalibrationDisplay; + +/** + * @brief 单次定位。如果当前正在连续定位，调用此方法将会失败，返回NO。\n该方法将会根据设定的 desiredAccuracy 去获取定位信息。如果获取的定位信息精确度低于 desiredAccuracy ，将会持续的等待定位信息，直到超时后通过completionBlock返回精度最高的定位信息。\n可以通过 stopUpdatingLocation 方法去取消正在进行的单次定位请求。 + * @param withReGeocode 是否带有逆地理信息(获取逆地理信息需要联网) + * @param completionBlock 单次定位完成后的Block + * @return 是否成功添加单次定位Request + */ +- (BOOL)requestLocationWithReGeocode:(BOOL)withReGeocode completionBlock:(AMapLocatingCompletionBlock)completionBlock; + +/** + * @brief 开始连续定位。调用此方法会cancel掉所有的单次定位请求。 + */ +- (void)startUpdatingLocation; + +/** + * @brief 停止连续定位。调用此方法会cancel掉所有的单次定位请求，可以用来取消单次定位。 + */ +- (void)stopUpdatingLocation; + +/** + * @brief 开始监控指定的region。如果已经存在相同identifier的region，则之前的region将会被移除。对 AMapLocationCircleRegion 类实例，将会优先监控radius小的region。 + * @param region 要被监控的范围 + */ +- (void)startMonitoringForRegion:(AMapLocationRegion *)region __attribute__((deprecated("请使用AMapGeoFenceManager"))); + +/** + * @brief 停止监控指定的region + * @param region 要停止监控的范围 + */ +- (void)stopMonitoringForRegion:(AMapLocationRegion *)region __attribute__((deprecated("请使用AMapGeoFenceManager"))); + +/** + * @brief 查询一个region的当前状态。查询结果通过amapLocationManager:didDetermineState:forRegion:回调返回 + * @param region 要查询的region + */ +- (void)requestStateForRegion:(AMapLocationRegion *)region __attribute__((deprecated("请使用AMapGeoFenceManager"))); + +@end + +#pragma mark - AMapLocationManagerDelegate + +///AMapLocationManagerDelegate 协议定义了发生错误时的错误回调方法，连续定位的回调方法等。 +@protocol AMapLocationManagerDelegate + +@optional + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 + +/** + * @brief 当plist配置NSLocationTemporaryUsageDescriptionDictionary且desiredAccuracyMode设置CLAccuracyAuthorizationFullAccuracy精确定位模式时，如果用户只授权模糊定位，会调用代理的此方法。此方法实现调用申请临时精确定位权限API即可： + * [manager requestTemporaryFullAccuracyAuthorizationWithPurposeKey:@"PurposeKey" completion:^(NSError *error){ + * if(completion){ + * completion(error); + * } + * }]; (必须调用,不然无法正常获取临时精确定位权限) + * @param manager 定位 AMapLocationManager 类。 + * @param locationManager 需要申请临时精确定位权限的locationManager。 + * @param completion 临时精确定位权限API回调结果，error: 直接返回系统error即可。 + * @since 2.6.7 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager doRequireTemporaryFullAccuracyAuth:(CLLocationManager*)locationManager completion:(void(^)(NSError *error))completion; + +#endif + +/** + * @brief 当plist配置NSLocationAlwaysUsageDescription或者NSLocationAlwaysAndWhenInUseUsageDescription，并且[CLLocationManager authorizationStatus] == kCLAuthorizationStatusNotDetermined，会调用代理的此方法。 + 此方法实现调用申请后台权限API即可：[locationManager requestAlwaysAuthorization] (必须调用,不然无法正常获取定位权限) + * @param manager 定位 AMapLocationManager 类。 + * @param locationManager 需要申请后台定位权限的locationManager。 + * @since 2.6.2 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager doRequireLocationAuth:(CLLocationManager*)locationManager; + +/** + * @brief 当定位发生错误时，会调用代理的此方法。 + * @param manager 定位 AMapLocationManager 类。 + * @param error 返回的错误，参考 CLError 。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didFailWithError:(NSError *)error; + +/** + * @brief 连续定位回调函数.注意：本方法已被废弃，如果实现了amapLocationManager:didUpdateLocation:reGeocode:方法，则本方法将不会回调。 + * @param manager 定位 AMapLocationManager 类。 + * @param location 定位结果。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didUpdateLocation:(CLLocation *)location; + +/** + * @brief 连续定位回调函数.注意：如果实现了本方法，则定位信息不会通过amapLocationManager:didUpdateLocation:方法回调。 + * @param manager 定位 AMapLocationManager 类。 + * @param location 定位结果。 + * @param reGeocode 逆地理信息。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didUpdateLocation:(CLLocation *)location reGeocode:(AMapLocationReGeocode *)reGeocode; + +/** + * @brief 定位权限状态改变时回调函数。注意：iOS13及之前版本回调 + * @param manager 定位 AMapLocationManager 类。 + * @param status 定位权限状态。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status; + +/** + * @brief 定位权限状态改变时回调函数。注意：iOS14及之后版本回调 + * @param manager 定位 AMapLocationManager 类。 + * @param locationManager 定位CLLocationManager类，可通过locationManager.authorizationStatus获取定位权限，通过locationManager.accuracyAuthorization获取定位精度权限 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager locationManagerDidChangeAuthorization:(CLLocationManager*)locationManager; + +/** + * @brief 是否显示设备朝向校准 + * @param manager 定位 AMapLocationManager 类。 + * @return 是否显示设备朝向校准 + */ +- (BOOL)amapLocationManagerShouldDisplayHeadingCalibration:(AMapLocationManager *)manager; + +/** + * @brief 设备方向改变时回调函数 + * @param manager 定位 AMapLocationManager 类。 + * @param newHeading 设备朝向。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didUpdateHeading:(CLHeading *)newHeading; + +/** + * @brief 开始监控region回调函数 + * @param manager 定位 AMapLocationManager 类。 + * @param region 开始监控的region。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didStartMonitoringForRegion:(AMapLocationRegion *)region __attribute__((deprecated("请使用AMapGeoFenceManager"))); + +/** + * @brief 进入region回调函数 + * @param manager 定位 AMapLocationManager 类。 + * @param region 进入的region。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didEnterRegion:(AMapLocationRegion *)region __attribute__((deprecated("请使用AMapGeoFenceManager"))); + +/** + * @brief 离开region回调函数 + * @param manager 定位 AMapLocationManager 类。 + * @param region 离开的region。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didExitRegion:(AMapLocationRegion *)region __attribute__((deprecated("请使用AMapGeoFenceManager"))); + +/** + * @brief 查询region状态回调函数 + * @param manager 定位 AMapLocationManager 类。 + * @param state 查询的region的状态。 + * @param region 查询的region。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager didDetermineState:(AMapLocationRegionState)state forRegion:(AMapLocationRegion *)region __attribute__((deprecated("请使用AMapGeoFenceManager"))); + +/** + * @brief 监控region失败回调函数 + * @param manager 定位 AMapLocationManager 类。 + * @param region 失败的region。 + * @param error 错误信息，参考 AMapLocationErrorCode 。 + */ +- (void)amapLocationManager:(AMapLocationManager *)manager monitoringDidFailForRegion:(AMapLocationRegion *)region withError:(NSError *)error __attribute__((deprecated("请使用AMapGeoFenceManager"))); + +@end diff --git a/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationRegionObj.h b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationRegionObj.h new file mode 100644 index 00000000..ed74aada --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationRegionObj.h @@ -0,0 +1,90 @@ +// +// AMapLocationRegionObj.h +// AMapLocationKit +// +// Created by AutoNavi on 15/11/27. +// Copyright © 2015年 Amap. All rights reserved. +// + +#import "AMapLocationCommonObj.h" + +// 以下类涉及的坐标需要使用高德坐标系坐标(GCJ02) + +#pragma mark - AMapLocationRegion + + +///AMapLocationRegion类，该类提供范围类的基本信息，并无具体实现，不要直接使用。 +@interface AMapLocationRegion : NSObject + +///AMapLocationRegion的identifier +@property (nonatomic, copy, readonly) NSString *identifier; + +///当进入region范围时是否通知，默认YES +@property (nonatomic, assign) BOOL notifyOnEntry; + +///当离开region范围时是否通知，默认YES +@property (nonatomic, assign) BOOL notifyOnExit; + +/** + * @brief 初始化方法 + * @param identifier 唯一标识符，必填，不可为nil + */ +- (instancetype)initWithIdentifier:(NSString *)identifier; + +/** + * @brief 坐标点是否在范围内 + * @param coordinate 要判断的坐标点 + * @return 是否在范围内 + */ +- (BOOL)containsCoordinate:(CLLocationCoordinate2D)coordinate; + +@end + +#pragma mark - AMapLocationCircleRegion + + +///AMapLocationCircleRegion类，定义一个圆形范围。 +@interface AMapLocationCircleRegion : AMapLocationRegion + +///中心点的经纬度坐标 +@property (nonatomic, readonly) CLLocationCoordinate2D center; + +///半径，单位：米 +@property (nonatomic, readonly) CLLocationDistance radius; + +/** + * @brief 根据中心点和半径生成圆形范围 + * @param center 中心点的经纬度坐标 + * @param radius 半径，单位：米 + * @param identifier 唯一标识符，必填，不可为nil + * @return AMapLocationCircleRegion类实例 + */ +- (instancetype)initWithCenter:(CLLocationCoordinate2D)center radius:(CLLocationDistance)radius identifier:(NSString *)identifier; + + +@end + +#pragma mark - AMapLocationPolygonRegion + + +///AMapLocationCircleRegion类，定义一个闭合多边形范围，点与点之间按顺序尾部相连, 第一个点与最后一个点相连。 +@interface AMapLocationPolygonRegion : AMapLocationRegion + +///经纬度坐标点数据 +@property (nonatomic, readonly) CLLocationCoordinate2D *coordinates; + +///经纬度坐标点的个数 +@property (nonatomic, readonly) NSInteger count; + +/** + * @brief 根据经纬度坐标数据生成闭合多边形范围 + * @param coordinates 经纬度坐标点数据,coordinates对应的内存会拷贝,调用者负责该内存的释放 + * @param count 经纬度坐标点的个数，不可小于3个 + * @param identifier 唯一标识符，必填，不可为nil + * @return AMapLocationCircleRegion类实例 + */ +- (instancetype)initWithCoordinates:(CLLocationCoordinate2D *)coordinates count:(NSInteger)count identifier:(NSString *)identifier; + + + +@end diff --git a/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationVersion.h b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationVersion.h new file mode 100644 index 00000000..651160ec --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Headers/AMapLocationVersion.h @@ -0,0 +1,26 @@ +// +// AMapLoctionVersion.h +// AMapLocationKit +// +// Created by AutoNavi on 16/1/22. +// Copyright © 2016年 Amap. All rights reserved. +// + +#import +#import + +#ifndef AMapLoctionVersion_h +#define AMapLoctionVersion_h + +#define AMapLocationVersionNumber 20607 +#define AMapLocationFoundationVersionMinRequired 10604 + +// 依赖库版本检测 +#if AMapFoundationVersionNumber < AMapLocationFoundationVersionMinRequired +#error "The AMapFoundationKit version is less than minimum required, please update! Any questions please to visit http://lbs.amap.com" +#endif + +FOUNDATION_EXTERN NSString * const AMapLocationVersion; +FOUNDATION_EXTERN NSString * const AMapLocationName; + +#endif /* AMapLoctionVersion_h */ diff --git a/ios/UniMPSDK/Libs/AMapLocationKit.framework/Modules/module.modulemap b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Modules/module.modulemap new file mode 100644 index 00000000..6a1a5869 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapLocationKit.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module AMapLocationKit { + umbrella header "AMapLocationKit.h" + + export * + module * { export * } +} diff --git a/ios/UniMPSDK/Libs/AMapLocationKit.framework/version.txt b/ios/UniMPSDK/Libs/AMapLocationKit.framework/version.txt new file mode 100644 index 00000000..c8e96ed9 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapLocationKit.framework/version.txt @@ -0,0 +1 @@ +2.6.7+loc.ec398d6 diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/AMapSearchKit b/ios/UniMPSDK/Libs/AMapSearchKit.framework/AMapSearchKit new file mode 100644 index 00000000..a8c53eeb Binary files /dev/null and b/ios/UniMPSDK/Libs/AMapSearchKit.framework/AMapSearchKit differ diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapCommonObj.h b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapCommonObj.h new file mode 100644 index 00000000..c272a191 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapCommonObj.h @@ -0,0 +1,864 @@ +// +// AMapCommonObj.h +// AMapSearchKit +// +// Created by xiaoming han on 15/7/22. +// Copyright (c) 2015年 Amap. All rights reserved. +// + +/* 该文件定义了搜索结果的基础数据类型。*/ + +#import +#import + +#pragma mark - AMapSearchObject + +///搜索SDK基础类, 通用数据结构和response支持copy和coding（since 4.4.1）。 +@interface AMapSearchObject : NSObject + +/** + * @brief 返回格式化的描述信息。通用数据结构和response类型有效。 + */ +- (NSString *)formattedDescription; + +@end + +#pragma mark - 通用数据结构 + +///经纬度, description中格式为 <经度,纬度> +@interface AMapGeoPoint : AMapSearchObject +///纬度（垂直方向） +@property (nonatomic, assign) CGFloat latitude; +///经度（水平方向） +@property (nonatomic, assign) CGFloat longitude; + +/** + * @brief 实例化一个AMapGeoPoint对象 + * @param lat 纬度 + * @param lon 经度 + */ ++ (AMapGeoPoint *)locationWithLatitude:(CGFloat)lat longitude:(CGFloat)lon; +@end + +///多边形, 当传入两个点的时候，当做矩形处理:左下-右上两个顶点；其他情况视为多边形，几个点即为几边型。 +@interface AMapGeoPolygon : AMapSearchObject +///坐标集, AMapGeoPoint 数组 +@property (nonatomic, strong) NSArray *points; + +/** + * @brief 实例化一个多边形对象 + * @param points 坐标集, AMapGeoPoint 数组 + */ ++ (AMapGeoPolygon *)polygonWithPoints:(NSArray *)points; +@end + +@class AMapDistrict; +///城市 +@interface AMapCity : AMapSearchObject +///城市名称 +@property (nonatomic, copy) NSString *city; +///城市编码 +@property (nonatomic, copy) NSString *citycode; +///城市区域编码 +@property (nonatomic, copy) NSString *adcode; +///此区域的建议结果数目, AMapSuggestion 中使用 +@property (nonatomic, assign) NSInteger num; +///途径区域 AMapDistrict 数组，AMepStep中使用，只有name和adcode。 +@property (nonatomic, strong) NSArray *districts; +@end + +///建议信息 +@interface AMapSuggestion : AMapSearchObject +///NSString 数组 +@property (nonatomic, strong) NSArray *keywords; +///AMapCity 数组 +@property (nonatomic, strong) NSArray *cities; +@end + +#pragma mark - 输入提示 + +///输入提示 +@interface AMapTip : AMapSearchObject +///poi的id +@property (nonatomic, copy) NSString *uid; +///名称 +@property (nonatomic, copy) NSString *name; +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///所属区域 +@property (nonatomic, copy) NSString *district; +///地址 +@property (nonatomic, copy) NSString *address; +///位置 +@property (nonatomic, copy) AMapGeoPoint *location; +///类型码, since 4.5.0. 对应描述可下载参考官网文档 http://a.amap.com/lbs/static/zip/AMap_API_Table.zip。 +@property (nonatomic, copy) NSString *typecode; +@end + +#pragma mark - POI + +///POI图片信息 +@interface AMapImage : AMapSearchObject +///标题 +@property (nonatomic, copy) NSString *title; +///url +@property (nonatomic, copy) NSString *url; +@end + +///POI扩展信息 +@interface AMapPOIExtension : AMapSearchObject +///评分 +@property (nonatomic, assign) CGFloat rating; +///人均消费 +@property (nonatomic, assign) CGFloat cost; +///营业时间 +@property (nonatomic, copy) NSString *openTime; +@end + +///POI室内地图信息 +@interface AMapIndoorData : AMapSearchObject +///楼层，为0时为POI本身 +@property (nonatomic, assign) NSInteger floor; +///楼层名称 +@property (nonatomic, copy) NSString *floorName; +///建筑物ID +@property (nonatomic, copy) NSString *pid; +@end + +///子POI +@interface AMapSubPOI : AMapSearchObject +///POI全局唯一ID +@property (nonatomic, copy) NSString *uid; +///名称 +@property (nonatomic, copy) NSString *name; +///名称简写 +@property (nonatomic, copy) NSString *sname; +///经纬度 +@property (nonatomic, copy) AMapGeoPoint *location; +///地址 +@property (nonatomic, copy) NSString *address; +///距中心点距离 +@property (nonatomic, assign) NSInteger distance; +///子POI类型 +@property (nonatomic, copy) NSString *subtype; +@end + +///沿途POI +@interface AMapRoutePOI : AMapSearchObject +///POI全局唯一ID +@property (nonatomic, copy) NSString *uid; +///名称 +@property (nonatomic, copy) NSString *name; +///经纬度 +@property (nonatomic, copy) AMapGeoPoint *location; +///用户起点经过途经点再到终点的距离，单位是米 +@property (nonatomic, assign) NSInteger distance; +///用户起点经过途经点再到终点的时间，单位为秒 +@property (nonatomic, assign) NSInteger duration; +@end + +///POI +@interface AMapPOI : AMapSearchObject +///POI全局唯一ID +@property (nonatomic, copy) NSString *uid; +///名称 +@property (nonatomic, copy) NSString *name; +///兴趣点类型 +@property (nonatomic, copy) NSString *type; +///类型编码 +@property (nonatomic, copy) NSString *typecode; +///经纬度 +@property (nonatomic, copy) AMapGeoPoint *location; +///地址 +@property (nonatomic, copy) NSString *address; +///电话 +@property (nonatomic, copy) NSString *tel; +///距中心点的距离，单位米。在周边搜索时有效 +@property (nonatomic, assign) NSInteger distance; +///停车场类型，地上、地下、路边 +@property (nonatomic, copy) NSString *parkingType; +///商铺id +@property (nonatomic, copy) NSString *shopID; + +///邮编 +@property (nonatomic, copy) NSString *postcode; +///网址 +@property (nonatomic, copy) NSString *website; +///电子邮件 +@property (nonatomic, copy) NSString *email; +///省 +@property (nonatomic, copy) NSString *province; +///省编码 +@property (nonatomic, copy) NSString *pcode; +///城市名称 +@property (nonatomic, copy) NSString *city; +///城市编码 +@property (nonatomic, copy) NSString *citycode; +///区域名称 +@property (nonatomic, copy) NSString *district; +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///地理格ID +@property (nonatomic, copy) NSString *gridcode; +///入口经纬度 +@property (nonatomic, copy) AMapGeoPoint *enterLocation; +///出口经纬度 +@property (nonatomic, copy) AMapGeoPoint *exitLocation; +///方向 +@property (nonatomic, copy) NSString *direction; +///是否有室内地图 +@property (nonatomic, assign) BOOL hasIndoorMap; +///所在商圈 +@property (nonatomic, copy) NSString *businessArea; +///室内信息 +@property (nonatomic, strong) AMapIndoorData *indoorData; +///子POI列表 +@property (nonatomic, strong) NSArray *subPOIs; +///图片列表 +@property (nonatomic, strong) NSArray *images; + +///扩展信息只有在ID查询时有效 +@property (nonatomic, strong) AMapPOIExtension *extensionInfo; +@end + +#pragma mark - 逆地理编码 && 地理编码 + +///兴趣区域 +@interface AMapAOI : AMapSearchObject +///AOI全局唯一ID +@property (nonatomic, copy) NSString *uid; +///名称 +@property (nonatomic, copy) NSString *name; +///所在区域编码 +@property (nonatomic, copy) NSString *adcode; +///中心点经纬度 +@property (nonatomic, copy) AMapGeoPoint *location; +///面积，单位平方米 +@property (nonatomic, assign) CGFloat area; +@end + +///道路 +@interface AMapRoad : AMapSearchObject +///道路ID +@property (nonatomic, copy) NSString *uid; +///道路名称 +@property (nonatomic, copy) NSString *name; +///距离（单位：米） +@property (nonatomic, assign) NSInteger distance; +///方向 +@property (nonatomic, copy) NSString *direction; +///坐标点 +@property (nonatomic, copy) AMapGeoPoint *location; +@end + +///道路交叉口 +@interface AMapRoadInter : AMapSearchObject +///距离（单位：米） +@property (nonatomic, assign) NSInteger distance; +///方向 +@property (nonatomic, copy) NSString *direction; +///经纬度 +@property (nonatomic, copy) AMapGeoPoint *location; +///第一条道路ID +@property (nonatomic, copy) NSString *firstId; +///第一条道路名称 +@property (nonatomic, copy) NSString *firstName; +///第二条道路ID +@property (nonatomic, copy) NSString *secondId; +///第二条道路名称 +@property (nonatomic, copy) NSString *secondName; +@end + +///门牌信息 +@interface AMapStreetNumber : AMapSearchObject +///街道名称 +@property (nonatomic, copy) NSString *street; +///门牌号 +@property (nonatomic, copy) NSString *number; +///坐标点 +@property (nonatomic, copy) AMapGeoPoint *location; +///距离（单位：米） +@property (nonatomic, assign) NSInteger distance; +///方向 +@property (nonatomic, copy) NSString *direction; +@end + +///商圈 +@interface AMapBusinessArea : AMapSearchObject +///名称 +@property (nonatomic, strong) NSString *name; +///中心坐标 +@property (nonatomic, copy) AMapGeoPoint *location; +@end + +///地址组成要素 +@interface AMapAddressComponent : AMapSearchObject +///国家（since 5.7.0） +@property (nonatomic, copy) NSString *country; +///国家简码（since 7.4.0）仅海外生效 +@property (nonatomic, copy) NSString *countryCode; +///省/直辖市 +@property (nonatomic, copy) NSString *province; +///市 +@property (nonatomic, copy) NSString *city; +///城市编码 +@property (nonatomic, copy) NSString *citycode; +///区 +@property (nonatomic, copy) NSString *district; +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///乡镇街道 +@property (nonatomic, copy) NSString *township; +///乡镇街道编码 +@property (nonatomic, copy) NSString *towncode; +///社区 +@property (nonatomic, copy) NSString *neighborhood; +///建筑 +@property (nonatomic, copy) NSString *building; +///门牌信息 +@property (nonatomic, strong) AMapStreetNumber *streetNumber; +///商圈列表 AMapBusinessArea 数组 +@property (nonatomic, strong) NSArray *businessAreas; +@end + +///逆地理编码 +@interface AMapReGeocode : AMapSearchObject +///格式化地址 +@property (nonatomic, copy) NSString *formattedAddress; +///地址组成要素 +@property (nonatomic, strong) AMapAddressComponent *addressComponent; + +///道路信息 AMapRoad 数组 +@property (nonatomic, strong) NSArray *roads; +///道路路口信息 AMapRoadInter 数组 +@property (nonatomic, strong) NSArray *roadinters; +///兴趣点信息 AMapPOI 数组 +@property (nonatomic, strong) NSArray *pois; +///兴趣区域信息 AMapAOI 数组 +@property (nonatomic, strong) NSArray *aois; +@end + +///地理编码 +@interface AMapGeocode : AMapSearchObject +///格式化地址 +@property (nonatomic, copy) NSString *formattedAddress; +///所在省/直辖市 +@property (nonatomic, copy) NSString *province; +///城市名 +@property (nonatomic, copy) NSString *city; +///城市编码 +@property (nonatomic, copy) NSString *citycode; +///区域名称 +@property (nonatomic, copy) NSString *district; +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///乡镇街道 +@property (nonatomic, copy) NSString *township; +///社区 +@property (nonatomic, copy) NSString *neighborhood; +///楼 +@property (nonatomic, copy) NSString *building; +///坐标点 +@property (nonatomic, copy) AMapGeoPoint *location; +///匹配的等级 +@property (nonatomic, copy) NSString *level; +///国家（since 7.4.0）仅海外生效 +@property (nonatomic, copy) NSString *country; +///国家简码（since 7.4.0）仅海外生效 +@property (nonatomic, copy) NSString *postcode; +@end + +#pragma mark - 公交查询 +@class AMapBusLine; + +///公交站 +@interface AMapBusStop : AMapSearchObject +///公交站点ID +@property (nonatomic, copy) NSString *uid; +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///公交站名 +@property (nonatomic, copy) NSString *name; +///城市编码 +@property (nonatomic, copy) NSString *citycode; +///经纬度坐标 +@property (nonatomic, copy) AMapGeoPoint *location; +///途径此站的公交路线 AMapBusLine 数组 +@property (nonatomic, strong) NSArray *buslines; +///查询公交线路时的第几站 +@property (nonatomic, copy) NSString *sequence; +@end + +///公交线路 +@interface AMapBusLine : AMapSearchObject +///公交线路ID +@property (nonatomic, copy) NSString *uid; +///公交类型 +@property (nonatomic, copy) NSString *type; +///公交线路名称 +@property (nonatomic, copy) NSString *name; +///坐标集合 +@property (nonatomic, copy) NSString *polyline; +///城市编码 +@property (nonatomic, copy) NSString *citycode; +///首发站 +@property (nonatomic, copy) NSString *startStop; +///终点站 +@property (nonatomic, copy) NSString *endStop; +///当查询公交站点时，返回的 AMapBusLine 中含有该字段 +@property (nonatomic, copy) AMapGeoPoint *location; + +///首班车时间 +@property (nonatomic, copy) NSString *startTime; +///末班车时间 +@property (nonatomic, copy) NSString *endTime; +///所属公交公司 +@property (nonatomic, copy) NSString *company; +///距离。在公交线路查询时，该值为此线路的全程距离，单位为千米; 在公交路径规划时，该值为乘坐此路公交车的行驶距离，单位为米 +@property (nonatomic, assign) CGFloat distance; +///起步价 +@property (nonatomic, assign) CGFloat basicPrice; +///全程票价 +@property (nonatomic, assign) CGFloat totalPrice; +///矩形区域左下、右上顶点坐标 +@property (nonatomic, copy) AMapGeoPolygon *bounds; +///本线路公交站 AMapBusStop 数组 +@property (nonatomic, strong) NSArray *busStops; + +///起程站 +@property (nonatomic, strong) AMapBusStop *departureStop; +///下车站 +@property (nonatomic, strong) AMapBusStop *arrivalStop; +///途径公交站 AMapBusStop 数组 +@property (nonatomic, strong) NSArray *viaBusStops; +///预计行驶时间（单位：秒） +@property (nonatomic, assign) NSInteger duration; +@end + +#pragma mark - 行政区划 +///行政区划 +@interface AMapDistrict : AMapSearchObject +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///城市编码 +@property (nonatomic, copy) NSString *citycode; +///行政区名称 +@property (nonatomic, copy) NSString *name; +///级别 +@property (nonatomic, copy) NSString *level; +///城市中心点 +@property (nonatomic, copy) AMapGeoPoint *center; +///下级行政区域数组 +@property (nonatomic, strong) NSArray *districts; +///行政区边界坐标点, NSString 数组 +@property (nonatomic, strong) NSArray *polylines; +@end + +#pragma mark - 路径规划 + +///实时路况信息 +@interface AMapTMC : AMapSearchObject +///长度（单位：米） +@property (nonatomic, assign) NSInteger distance; +///路况状态描述：0 未知，1 畅通，2 缓行，3 拥堵，4 严重拥堵 +@property (nonatomic, copy) NSString *status; +///此路段坐标点串 +@property (nonatomic, copy) NSString *polyline; +@end + +///路段基本信息 +@interface AMapStep : AMapSearchObject +///行走指示 +@property (nonatomic, copy) NSString *instruction; +///方向 +@property (nonatomic, copy) NSString *orientation; +///道路名称 +@property (nonatomic, copy) NSString *road; +///此路段长度（单位：米） +@property (nonatomic, assign) NSInteger distance; +///此路段预计耗时（单位：秒） +@property (nonatomic, assign) NSInteger duration; +///此路段坐标点串 +@property (nonatomic, copy) NSString *polyline; +///导航主要动作 +@property (nonatomic, copy) NSString *action; +///导航辅助动作 +@property (nonatomic, copy) NSString *assistantAction; +///此段收费（单位：元） +@property (nonatomic, assign) CGFloat tolls; +///收费路段长度（单位：米） +@property (nonatomic, assign) NSInteger tollDistance; +///主要收费路段 +@property (nonatomic, copy) NSString *tollRoad; + +///途径城市 AMapCity 数组，只有驾车路径规划时有效 +@property (nonatomic, strong) NSArray *cities; +///路况信息数组，只有驾车路径规划时有效 +@property (nonatomic, strong) NSArray *tmcs; +@end + +///步行、骑行、驾车方案 +@interface AMapPath : AMapSearchObject +///起点和终点的距离 +@property (nonatomic, assign) NSInteger distance; +///预计耗时（单位：秒） +@property (nonatomic, assign) NSInteger duration; +///导航策略 +@property (nonatomic, copy) NSString *strategy; +///导航路段 AMapStep 数组 +@property (nonatomic, strong) NSArray *steps; +///此方案费用（单位：元） +@property (nonatomic, assign) CGFloat tolls; +///此方案收费路段长度（单位：米） +@property (nonatomic, assign) NSInteger tollDistance; +///此方案交通信号灯个数 +@property (nonatomic, assign) NSInteger totalTrafficLights; + +/** + 限行信息，仅在驾车和货车路径规划时有效。（since 6.0.0） + 驾车路径规划时： + 0 代表限行已规避或未限行; 1 代表限行无法规避。 + 货车路径规划时： + 0，未知（未输入完整/正确车牌号信息时候显示） + 1，已规避限行 + 2，起点限行 + 3，途径点在限行区域内（设置途径点才出现此报错） + 4，途径限行区域 + 5，终点限行 + */ +@property (nonatomic, assign) NSInteger restriction; +///规划路径完整坐标点串集合（since 7.4.0） +@property (nonatomic, copy) NSString *polyline; + +@end + +@interface AMapFutureTimeInfoElement : AMapSearchObject + +///总时长（分钟） +@property (nonatomic, assign) NSInteger duration; +///对应的路径规划方案中的路线 +@property (nonatomic, assign) NSInteger pathindex; +/** + 0：代表限行已规避或未限行，即该路线没有限行路段 + 1：代表限行无法规避，即该线路有限行路段 + */ +@property (nonatomic, assign) NSInteger restriction; +///路况信息数组，只会返回AMapTMC中的status、polyline +@property (nonatomic, strong) NSArray *tmcs; + +@end + +@interface AMapFutureTimeInfo : AMapSearchObject + +///出发时间 +@property (nonatomic, copy) NSString *startTime; +///路线列表 AMapFutureTimeInfoElement 数组 +@property (nonatomic, strong) NSArray *elements; +@end + +///步行换乘信息 +@interface AMapWalking : AMapSearchObject +///起点坐标 +@property (nonatomic, copy) AMapGeoPoint *origin; +///终点坐标 +@property (nonatomic, copy) AMapGeoPoint *destination; +///起点和终点的步行距离 +@property (nonatomic, assign) NSInteger distance; +///步行预计时间 +@property (nonatomic, assign) NSInteger duration; +///步行路段 AMapStep 数组 +@property (nonatomic, strong) NSArray *steps; +@end + +///出租车信息 +@interface AMapTaxi : AMapSearchObject +///起点坐标 +@property (nonatomic, copy) AMapGeoPoint *origin; +///终点坐标 +@property (nonatomic, copy) AMapGeoPoint *destination; +///距离，单位米 +@property (nonatomic, assign) NSInteger distance; +///耗时，单位秒 +@property (nonatomic, assign) NSInteger duration; +///起点名称 +@property (nonatomic, copy) NSString *sname; +///终点名称 +@property (nonatomic, copy) NSString *tname; +@end + +///火车站 +@interface AMapRailwayStation : AMapSearchObject +///火车站ID +@property (nonatomic, copy) NSString *uid; +///名称 +@property (nonatomic, copy) NSString *name; +///经纬度坐标 +@property (nonatomic, copy) AMapGeoPoint *location; +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///发车、到站时间，途径站时则为进站时间 +@property (nonatomic, copy) NSString *time; +///途径站点的停靠时间，单位为分钟 +@property (nonatomic, assign) NSInteger wait; +///是否是始发站，为出发站时有效 +@property (nonatomic, assign) BOOL isStart; +///是否是终点站，为到达站时有效 +@property (nonatomic, assign) BOOL isEnd; +@end + +///火车仓位及价格信息 +@interface AMapRailwaySpace : AMapSearchObject +///类型，硬卧、硬座等 +@property (nonatomic, copy) NSString *code; +///票价，单位元 +@property (nonatomic, assign) CGFloat cost; +@end + +///火车信息 +@interface AMapRailway : AMapSearchObject +///火车线路ID +@property (nonatomic, copy) NSString *uid; +///名称 +@property (nonatomic, copy) NSString *name; +///车次 +@property (nonatomic, copy) NSString *trip; +///类型 +@property (nonatomic, copy) NSString *type; +///该换乘段行车总距离，单位为米 +@property (nonatomic, assign) NSInteger distance; +///该线路车段耗时，单位为秒 +@property (nonatomic, assign) NSInteger time; +///出发站 +@property (nonatomic, strong) AMapRailwayStation *departureStation; +///到达站 +@property (nonatomic, strong) AMapRailwayStation *arrivalStation; +///仓位及价格信息 +@property (nonatomic, strong) NSArray *spaces; + +///途径站点信息 +@property (nonatomic, strong) NSArray *viaStops; +///备选路线信息, 目前只有id和name +@property (nonatomic, strong) NSArray *alters; +@end + + +///公交换乘路段，如果walking和buslines同时有值，则是先walking后buslines +@interface AMapSegment : AMapSearchObject +///此路段步行导航信息 +@property (nonatomic, strong) AMapWalking *walking; +///此路段可供选择的不同公交线路 AMapBusLine 数组 +@property (nonatomic, strong) NSArray *buslines; +///出租车信息，跨城时有效 +@property (nonatomic, strong) AMapTaxi *taxi; +///火车信息，跨城时有效 +@property (nonatomic, strong) AMapRailway *railway; +///入口名称 +@property (nonatomic, copy) NSString *enterName; +///入口经纬度 +@property (nonatomic, copy) AMapGeoPoint *enterLocation; +///出口名称 +@property (nonatomic, copy) NSString *exitName; +///出口经纬度 +@property (nonatomic, copy) AMapGeoPoint *exitLocation; +@end + +///公交方案 +@interface AMapTransit : AMapSearchObject +///此公交方案价格（单位：元） +@property (nonatomic, assign) CGFloat cost; +///此换乘方案预期时间（单位：秒） +@property (nonatomic, assign) NSInteger duration; +///是否是夜班车 +@property (nonatomic, assign) BOOL nightflag; +///此方案总步行距离（单位：米） +@property (nonatomic, assign) NSInteger walkingDistance; +///换乘路段 AMapSegment 数组 +@property (nonatomic, strong) NSArray *segments; +///当前方案的总距离 +@property (nonatomic, assign) NSInteger distance; +@end + +///路径规划信息 +@interface AMapRoute : AMapSearchObject +///起点坐标 +@property (nonatomic, copy) AMapGeoPoint *origin; +///终点坐标 +@property (nonatomic, copy) AMapGeoPoint *destination; +///出租车费用（单位：元） +@property (nonatomic, assign) CGFloat taxiCost; +///步行、骑行、驾车方案列表 AMapPath 数组 +@property (nonatomic, strong) NSArray *paths; +///公交换乘方案列表 AMapTransit 数组 +@property (nonatomic, strong) NSArray *transits; +@end + +///距离测量结果 +@interface AMapDistanceResult : AMapSearchObject +///起点坐标，起点坐标序列号（从１开始） +@property (nonatomic, assign) NSInteger originID; +///终点坐标，终点坐标序列号（从１开始） +@property (nonatomic, assign) NSInteger destID; +///路径距离，单位：米 +@property (nonatomic, assign) NSInteger distance; +///预计行驶时间，单位：秒 +@property (nonatomic, assign) NSInteger duration; +///错误信息，建议用此字段判断请求是否成功 +@property (nonatomic, copy) NSString *info; +///在驾车模式下有效。默认为0；1：指定地点之间没有可以行车的道路；2：起点/终点 距离所有道路均距离过远（例如在海洋/矿业）；3；起点/终点不在中国境内； +@property (nonatomic, assign) NSInteger code; +@end + +#pragma mark - 天气查询 + +///实况天气，仅支持中国部分地区数据(台湾省目前没有数据)返回 +@interface AMapLocalWeatherLive : AMapSearchObject +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///省份名 +@property (nonatomic, copy) NSString *province; +///城市名 +@property (nonatomic, copy) NSString *city; +///天气现象 +@property (nonatomic, copy) NSString *weather; +///实时温度 +@property (nonatomic, copy) NSString *temperature; +///风向 +@property (nonatomic, copy) NSString *windDirection; +///风力，单位：级 +@property (nonatomic, copy) NSString *windPower; +///空气湿度 +@property (nonatomic, copy) NSString *humidity; +///数据发布时间 +@property (nonatomic, copy) NSString *reportTime; +@end + +///某一天的天气预报信息 +@interface AMapLocalDayWeatherForecast : AMapSearchObject +///日期 +@property (nonatomic, copy) NSString *date; +///星期 +@property (nonatomic, copy) NSString *week; +///白天天气现象 +@property (nonatomic, copy) NSString *dayWeather; +///晚上天气现象 +@property (nonatomic, copy) NSString *nightWeather; +///白天温度 +@property (nonatomic, copy) NSString *dayTemp; +///晚上温度 +@property (nonatomic, copy) NSString *nightTemp; +///白天风向 +@property (nonatomic, copy) NSString *dayWind; +///晚上风向 +@property (nonatomic, copy) NSString *nightWind; +///白天风力 +@property (nonatomic, copy) NSString *dayPower; +///晚上风力 +@property (nonatomic, copy) NSString *nightPower; +@end + +///天气预报类，支持当前时间在内的3天的天气进行预报 +@interface AMapLocalWeatherForecast : AMapSearchObject +///区域编码 +@property (nonatomic, copy) NSString *adcode; +///省份名 +@property (nonatomic, copy) NSString *province; +///城市名 +@property (nonatomic, copy) NSString *city; +///数据发布时间 +@property (nonatomic, copy) NSString *reportTime; +///天气预报AMapLocalDayWeatherForecast数组 +@property (nonatomic, strong) NSArray *casts; +@end + +#pragma mark - 附近搜索 +///附近搜索返回的用户信息 +@interface AMapNearbyUserInfo : AMapSearchObject +///用户ID +@property (nonatomic, copy) NSString *userID; +///最后更新位置 +@property (nonatomic, copy) AMapGeoPoint *location; +///与搜索点的距离，由搜索时searchType决定 +@property (nonatomic, assign) CGFloat distance; +///最后更新的时间戳，单位秒 +@property (nonatomic, assign) NSTimeInterval updatetime; +@end + +#pragma mark - 交通态势 + +///道路路况评价 since 5.1.0 +@interface AMapTrafficEvaluation : AMapSearchObject +///综述 +@property (nonatomic, copy) NSString *evaluationDescription; +///0：未知;1：畅通;2：缓行;3：拥堵 +@property (nonatomic, assign) NSInteger status; +///畅通所占百分比 +@property (nonatomic, copy) NSString *expedite; +///缓行所占百分比 +@property (nonatomic, copy) NSString *congested; +///拥堵所占百分比 +@property (nonatomic, copy) NSString *blocked; +///未知路段所占百分比 +@property (nonatomic, copy) NSString *unknown; +@end + +///道路路况返回的道路信息 since 5.1.0 +@interface AMapTrafficRoad : AMapSearchObject +///道路名称 +@property (nonatomic, copy) NSString *name; +///0：未知;1：畅通;2：缓行;3：拥堵 +@property (nonatomic, assign) NSInteger status; +///方向描述 +@property (nonatomic, copy) NSString *direction; +///车行角度，判断道路正反向使用。 以正东方向为0度，逆时针方向为正，取值范围：[0,360] +@property (nonatomic, assign) float angle; +///速度 单位：千米/小时 +@property (nonatomic, assign) float speed; +///道路坐标集，经度和纬度使用","分隔，坐标之间使用";"分隔。例如：x1,y1;x2,y2 +@property (nonatomic, copy) NSString *polyline; +@end + +///道路路况信息 since 5.1.0 +@interface AMapTrafficInfo : AMapSearchObject +///路况综述 +@property (nonatomic, copy) NSString *statusDescription; +///路况评价 +@property (nonatomic, strong) AMapTrafficEvaluation *evaluation; +///道路信息 +@property (nonatomic, strong) NSArray* roads; + +@end + +#pragma mark - 企业地图基础数据类型 + +///POI点的图片信息 +@interface AMapCloudImage : AMapSearchObject +///图片的id标识 +@property (nonatomic, copy) NSString *uid; +///图片压缩后的url串 +@property (nonatomic, copy) NSString *preurl; +///图片原始的url +@property (nonatomic, copy) NSString *url; +@end + +///POI信息 +@interface AMapCloudPOI : AMapSearchObject +///唯一标识 +@property (nonatomic, assign) NSInteger uid; +///名称 +@property (nonatomic, copy) NSString *name; +///坐标位置 +@property (nonatomic, copy) AMapGeoPoint *location; +///地址 +@property (nonatomic, copy) NSString *address; +///用户自定义字段 +@property (nonatomic, strong) NSDictionary *customFields; +///创建时间 +@property (nonatomic, copy) NSString *createTime; +///更新时间 +@property (nonatomic, copy) NSString *updateTime; +///离当前位置的距离(只在企业地图周边搜索时有效) +@property (nonatomic, assign) NSInteger distance; +///图片信息 +@property (nonatomic, strong) NSArray *images __attribute((deprecated("已废弃 since 7.4.0"))); + +@end diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapNearbySearchManager.h b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapNearbySearchManager.h new file mode 100644 index 00000000..1d725f05 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapNearbySearchManager.h @@ -0,0 +1,85 @@ +// +// AMapNearbySearchManager.h +// AMapSearchKit +// +// Created by xiaoming han on 15/8/31. +// Copyright (c) 2015年 Amap. All rights reserved. +// + +#import +#import "AMapNearbyUploadInfo.h" + +@class AMapNearbySearchManager; + +///附近搜索代理 +@protocol AMapNearbySearchManagerDelegate +@optional + +/** + * @brief 开启自动上传，需实现该回调。 + */ +- (AMapNearbyUploadInfo *)nearbyInfoForUploading:(AMapNearbySearchManager *)manager; + +/** + * @brief 用户信息上传完毕回调。 + * @param error 错误，为空时表示成功。 + */ +- (void)onNearbyInfoUploadedWithError:(NSError *)error; + +/** + * @brief 用户信息清除完毕回调。 + * @param error 错误，为空时表示成功。 + */ +- (void)onUserInfoClearedWithError:(NSError *)error; + +@end + +///附近搜索管理类，同时只能有一个实例开启，否则可能会出现错误。 +@interface AMapNearbySearchManager : NSObject + +///上传最小间隔，默认15s，最小7s。自动上传的过程中设置无效。 +@property (nonatomic, assign) NSTimeInterval uploadTimeInterval; + +///代理对象。 +@property (nonatomic, weak) id delegate; + +///是否正在自动上传状态中。 +@property (nonatomic, readonly) BOOL isAutoUploading; + +/** + * @brief manager单例. + * 初始化之前请设置key，否则将无法正常使用该服务. + * @return nearbySearch实例。 + */ ++ (instancetype)sharedInstance; + +/** + * @brief 请使用单例。 + */ +- (instancetype)init __attribute__((unavailable)); + +/** + * @brief 启动自动上传。 + */ +- (void)startAutoUploadNearbyInfo; + +/** + * @brief 关闭自动上传。 + */ +- (void)stopAutoUploadNearbyInfo; + +/** + * @brief 执行单次上传，执行间隔不低于uploadTimeInterval最小值，否则执行失败。 + * @param info 需要上传的信息。 + * @return 成功执行返回YES，否则返回NO。 + */ +- (BOOL)uploadNearbyInfo:(AMapNearbyUploadInfo *)info __attribute((deprecated("已废弃 since 7.4.0，该功能不再支持"))); + +/** + * @brief 清除服务器上某一用户的信息。 + * @param userID 指定的用户ID + * @return 成功执行返回YES，否则返回NO。 + */ +- (BOOL)clearUserInfoWithID:(NSString *)userID __attribute((deprecated("已废弃 since 7.4.0，该功能不再支持"))); + +@end diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapNearbyUploadInfo.h b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapNearbyUploadInfo.h new file mode 100644 index 00000000..d8d316bc --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapNearbyUploadInfo.h @@ -0,0 +1,32 @@ +// +// AMapNearbyUploadInfo.h +// AMapSearchKit +// +// Created by xiaoming han on 15/9/6. +// Copyright (c) 2015年 Amap. All rights reserved. +// + +#import +#import + +///上传经纬度类型 +typedef NS_ENUM(NSInteger, AMapSearchCoordinateType) +{ + AMapSearchCoordinateTypeGPS = 1, ///< 标准GPS坐标 + AMapSearchCoordinateTypeAMap = 2, ///< 高德坐标 +}; + + +///附近搜索上传信息 +@interface AMapNearbyUploadInfo : NSObject + +///用户唯一标识，不能为空，否则上传会失败. 长度不超过32字符，只能包含英文、数字、下划线、短横杠 +@property (nonatomic, copy) NSString *userID; + +///坐标类型，默认是 AMapSearchCoordinateTypeAMap +@property (nonatomic, assign) AMapSearchCoordinateType coordinateType; + +///用户位置经纬度。 +@property (nonatomic, assign) CLLocationCoordinate2D coordinate; + +@end diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchAPI.h b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchAPI.h new file mode 100644 index 00000000..f7421279 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchAPI.h @@ -0,0 +1,351 @@ +// +// AMapSearchAPI.h +// AMapSearchKit +// +// Created by xiaoming han on 15/7/22. +// Copyright (c) 2015年 Amap. All rights reserved. +// + +#import +#import "AMapSearchObj.h" +#import "AMapCommonObj.h" + +@protocol AMapSearchDelegate; + +///搜索结果语言 +#define AMapSearchLanguageZhCN @"zh" ///< 中文 +#define AMapSearchLanguageEn @"en" ///< 英文 + +///搜索类 +@interface AMapSearchAPI : NSObject + +///实现了 AMapSearchDelegate 协议的类指针。 +@property (nonatomic, weak) id delegate; + +///查询超时时间，单位秒，默认为20秒。 +@property (nonatomic, assign) NSInteger timeout; + +///查询结果返回语言, 默认为中文。 +@property (nonatomic, copy) NSString *language; + +/** + * @brief AMapSearch的初始化函数。 + * 初始化之前请正确设置key，否则将无法正常使用搜索服务. + * @return AMapSearch类对象实例 + */ +- (instancetype)init; + +/** + * @brief 取消所有未回调的请求，触发错误回调。 + */ +- (void)cancelAllRequests; + +#pragma mark - 搜索服务接口 + +/** + * @brief POI ID查询接口 + * @param request 查询选项。具体属性字段请参考 AMapPOIIDSearchRequest 类。 + */ +- (void)AMapPOIIDSearch:(AMapPOIIDSearchRequest *)request; + +/** + * @brief POI 关键字查询接口 + * @param request 查询选项。具体属性字段请参考 AMapPOIKeywordsSearchRequest 类。 + */ +- (void)AMapPOIKeywordsSearch:(AMapPOIKeywordsSearchRequest *)request; + +/** + * @brief POI 周边查询接口 + * @param request 查询选项。具体属性字段请参考 AMapPOIAroundSearchRequest 类。 + */ +- (void)AMapPOIAroundSearch:(AMapPOIAroundSearchRequest *)request; + +/** + * @brief POI 多边形查询接口 + * @param request 查询选项。具体属性字段请参考 AMapPOIPolygonSearchRequest 类。 + */ +- (void)AMapPOIPolygonSearch:(AMapPOIPolygonSearchRequest *)request; + +/** + * @brief 沿途查询接口 (v4.3.0) + * @param request 查询选项。具体属性字段请参考 AMapRoutePOISearchRequest 类。 + */ +- (void)AMapRoutePOISearch:(AMapRoutePOISearchRequest *)request; + +/** + * @brief 地址编码查询接口 + * @param request 查询选项。具体属性字段请参考 AMapGeocodeSearchRequest 类。 + */ +- (void)AMapGeocodeSearch:(AMapGeocodeSearchRequest *)request; + +/** + * @brief 逆地址编码查询接口 + * @param request 查询选项。具体属性字段请参考 AMapReGeocodeSearchRequest 类。 + */ +- (void)AMapReGoecodeSearch:(AMapReGeocodeSearchRequest *)request; + +/** + * @brief 输入提示查询接口 + * @param request 查询选项。具体属性字段请参考 AMapInputTipsSearchRequest 类。 + */ +- (void)AMapInputTipsSearch:(AMapInputTipsSearchRequest *)request; + +/** + * @brief 公交站点查询接口 + * @param request 查询选项。具体属性字段请参考 AMapBusStopSearchRequest 类。 + */ +- (void)AMapBusStopSearch:(AMapBusStopSearchRequest *)request; + +/** + * @brief 公交线路关键字查询 + * @param request 查询选项。具体属性字段请参考 AMapBusLineIDSearchRequest 类。 + */ +- (void)AMapBusLineIDSearch:(AMapBusLineIDSearchRequest *)request; + +/** + * @brief 公交线路关键字查询 + * @param request 查询选项。具体属性字段请参考 AMapBusLineNameSearchRequest 类。 + */ +- (void)AMapBusLineNameSearch:(AMapBusLineNameSearchRequest *)request; + +/** + * @brief 行政区域查询接口 + * @param request 查询选项。具体属性字段请参考 AMapDistrictSearchRequest 类。 + */ +- (void)AMapDistrictSearch:(AMapDistrictSearchRequest *)request; + +/** + * @brief 驾车路径规划查询接口 + * @param request 查询选项。具体属性字段请参考 AMapDrivingRouteSearchRequest 类。 + */ +- (void)AMapDrivingRouteSearch:(AMapDrivingRouteSearchRequest *)request; + +/** + * @brief 步行路径规划查询接口 + * @param request 查询选项。具体属性字段请参考 AMapWalkingRouteSearchRequest 类。 + */ +- (void)AMapWalkingRouteSearch:(AMapWalkingRouteSearchRequest *)request; + +/** + * @brief 公交路径规划查询接口 + * @param request 查询选项。具体属性字段请参考 AMapTransitRouteSearchRequest 类。 + */ +- (void)AMapTransitRouteSearch:(AMapTransitRouteSearchRequest *)request; + +/** + * @brief 骑行路径规划查询接口 (since 4.3.0) + * @param request 查询选项。具体属性字段请参考 AMapRidingRouteSearchRequest 类。 + */ +- (void)AMapRidingRouteSearch:(AMapRidingRouteSearchRequest *)request; + +/** + * @brief 货车路径规划查询接口 （since 6.1.0） + * @param request 查询选项。具体属性字段请参考 AMapTruckRouteSearchRequest 类。 + */ +- (void)AMapTruckRouteSearch:(AMapTruckRouteSearchRequest *)request; + +/** + * @brief 未来路线规划查询接口 （since 6.9.0） + * @param request 查询选项。具体属性字段请参考 AMapTruckRouteSearchRequest 类。 + */ +- (void)AMapFutureRouteSearch:(AMapFutureRouteSearchRequest *)request; + +/** + * @brief 天气查询接口 + * @param request 查询选项。具体属性字段请参考 AMapWeatherSearchRequest 类。 + */ +- (void)AMapWeatherSearch:(AMapWeatherSearchRequest *)request; + +/** + * @brief 距离查询（since 6.1.0） + * @param request 查询选项。具体属性字段请参考 AMapDistanceSearchRequest 类。 + */ +- (void)AMapDistanceSearch:(AMapDistanceSearchRequest *)request; + +#pragma mark - 附近搜索相关 + +/** + * @brief 附近搜索查询接口 + * @param request 查询选项。具体属性字段请参考 AMapNearbySearchRequest 类。 + */ +- (void)AMapNearbySearch:(AMapNearbySearchRequest *)request __attribute__((deprecated("已废弃, from 7.4.0，该功能不再支持"))); + +#pragma mark - 企业地图搜索相关 + +/** + * @brief 企业地图周边查询接口 + * @param request 查询选项。具体属性字段请参考 AMapCloudPOIAroundSearchRequest 类。 + */ +- (void)AMapCloudPOIAroundSearch:(AMapCloudPOIAroundSearchRequest *)request; + +/** + * @brief 企业地图polygon区域查询接口 + * @param request 查询选项。具体属性字段请参考 AMapCloudPOIPolygonSearchRequest 类。 + */ +- (void)AMapCloudPOIPolygonSearch:(AMapCloudPOIPolygonSearchRequest *)request; + +/** + * @brief 企业地图ID查询接口 + * @param request 查询选项。具体属性字段请参考 AMapCloudPOIIDSearchRequest 类。 + */ +- (void)AMapCloudPOIIDSearch:(AMapCloudPOIIDSearchRequest *)request; + +/** + * @brief 企业地图本地查询接口 + * @param request 查询选项。具体属性字段请参考 AMapCloudPOILocalSearchRequest 类。 + */ +- (void)AMapCloudPOILocalSearch:(AMapCloudPOILocalSearchRequest *)request; + +#pragma mark - 短串分享相关 + +/** + * @brief 位置短串分享接口 + * @param request 查询选项。具体属性字段请参考 AMapLocationShareSearchRequest 类。 + */ +- (void)AMapLocationShareSearch:(AMapLocationShareSearchRequest *)request; + +/** + * @brief 兴趣点短串分享接口 + * @param request 查询选项。具体属性字段请参考 AMapPOIShareSearchRequest 类。 + */ +- (void)AMapPOIShareSearch:(AMapPOIShareSearchRequest *)request; + +/** + * @brief 路线规划短串分享接口 + * @param request 查询选项。具体属性字段请参考 AMapRouteShareSearchRequest 类。 + */ +- (void)AMapRouteShareSearch:(AMapRouteShareSearchRequest *)request; + +/** + * @brief 导航短串分享接口 + * @param request 查询选项。具体属性字段请参考 AMapNavigationShareSearchRequest 类。 + */ +- (void)AMapNavigationShareSearch:(AMapNavigationShareSearchRequest *)request; + +@end + +#pragma mark - AMapSearchDelegate + +///AMapSearchDelegate协议, 定义了搜索结果的回调方法，发生错误时的错误回调方法。 +@protocol AMapSearchDelegate +@optional + +/** + * @brief 当请求发生错误时，会调用代理的此方法. + * @param request 发生错误的请求. + * @param error 返回的错误. + */ +- (void)AMapSearchRequest:(id)request didFailWithError:(NSError *)error; + +/** + * @brief POI查询回调函数 + * @param request 发起的请求，具体字段参考 AMapPOISearchBaseRequest 及其子类。 + * @param response 响应结果，具体字段参考 AMapPOISearchResponse 。 + */ +- (void)onPOISearchDone:(AMapPOISearchBaseRequest *)request response:(AMapPOISearchResponse *)response; + +/** + * @brief 沿途查询回调函数 (since v4.3.0) + * @param request 发起的请求，具体字段参考 AMapRoutePOISearchRequest 及其子类。 + * @param response 响应结果，具体字段参考 AMapRoutePOISearchResponse 。 + */ +- (void)onRoutePOISearchDone:(AMapRoutePOISearchRequest *)request response:(AMapRoutePOISearchResponse *)response; + +/** + * @brief 地理编码查询回调函数 + * @param request 发起的请求，具体字段参考 AMapGeocodeSearchRequest 。 + * @param response 响应结果，具体字段参考 AMapGeocodeSearchResponse 。 + */ +- (void)onGeocodeSearchDone:(AMapGeocodeSearchRequest *)request response:(AMapGeocodeSearchResponse *)response; + +/** + * @brief 逆地理编码查询回调函数 + * @param request 发起的请求，具体字段参考 AMapReGeocodeSearchRequest 。 + * @param response 响应结果，具体字段参考 AMapReGeocodeSearchResponse 。 + */ +- (void)onReGeocodeSearchDone:(AMapReGeocodeSearchRequest *)request response:(AMapReGeocodeSearchResponse *)response; + +/** + * @brief 输入提示查询回调函数 + * @param request 发起的请求，具体字段参考 AMapInputTipsSearchRequest 。 + * @param response 响应结果，具体字段参考 AMapInputTipsSearchResponse 。 + */ +- (void)onInputTipsSearchDone:(AMapInputTipsSearchRequest *)request response:(AMapInputTipsSearchResponse *)response; + +/** + * @brief 公交站查询回调函数 + * @param request 发起的请求，具体字段参考 AMapBusStopSearchRequest 。 + * @param response 响应结果，具体字段参考 AMapBusStopSearchResponse 。 + */ +- (void)onBusStopSearchDone:(AMapBusStopSearchRequest *)request response:(AMapBusStopSearchResponse *)response; + +/** + * @brief 公交线路关键字查询回调 + * @param request 发起的请求，具体字段参考 AMapBusLineSearchRequest 。 + * @param response 响应结果，具体字段参考 AMapBusLineSearchResponse 。 + */ +- (void)onBusLineSearchDone:(AMapBusLineBaseSearchRequest *)request response:(AMapBusLineSearchResponse *)response; + +/** + * @brief 行政区域查询回调函数 + * @param request 发起的请求，具体字段参考 AMapDistrictSearchRequest 。 + * @param response 响应结果，具体字段参考 AMapDistrictSearchResponse 。 + */ +- (void)onDistrictSearchDone:(AMapDistrictSearchRequest *)request response:(AMapDistrictSearchResponse *)response; + +/** + * @brief 路径规划查询回调 + * @param request 发起的请求，具体字段参考 AMapRouteSearchBaseRequest 及其子类。 + * @param response 响应结果，具体字段参考 AMapRouteSearchResponse 。 + */ +- (void)onRouteSearchDone:(AMapRouteSearchBaseRequest *)request response:(AMapRouteSearchResponse *)response; + +/** + * @brief 未来路径规划查询回调 since 6.9.0 + * @param request 发起的请求，具体字段参考 AMapRouteSearchBaseRequest 及其子类。 + * @param response 响应结果，具体字段参考 AMapRouteSearchResponse 。 + */ +- (void)onFutureRouteSearchDone:(AMapRouteSearchBaseRequest *)request response:(AMapFutureRouteSearchResponse *)response; + +/** + * @brief 距离查询回调 + * @param request 发起的请求，具体字段参考 AMapDistanceSearchRequest 及其子类。 + * @param response 响应结果，具体字段参考 AMapDistanceSearchResponse 。 + */ +- (void)onDistanceSearchDone:(AMapDistanceSearchRequest *)request response:(AMapDistanceSearchResponse *)response; + +/** + * @brief 天气查询回调 + * @param request 发起的请求，具体字段参考 AMapWeatherSearchRequest 。 + * @param response 响应结果，具体字段参考 AMapWeatherSearchResponse 。 + */ +- (void)onWeatherSearchDone:(AMapWeatherSearchRequest *)request response:(AMapWeatherSearchResponse *)response; + +#pragma mark - 附近搜索回调 + +/** + * @brief 附近搜索回调 + * @param request 发起的请求，具体字段参考 AMapNearbySearchRequest 。 + * @param response 响应结果，具体字段参考 AMapNearbySearchResponse 。 + */ +- (void)onNearbySearchDone:(AMapNearbySearchRequest *)request response:(AMapNearbySearchResponse *)response; + +#pragma mark - 企业地图搜索回调 + +/** + * @brief 企业地图查询回调函数 + * @param request 发起的请求，具体字段参考 AMapCloudSearchBaseRequest 。 + * @param response 响应结果，具体字段参考 AMapCloudPOISearchResponse 。 + */ +- (void)onCloudSearchDone:(AMapCloudSearchBaseRequest *)request response:(AMapCloudPOISearchResponse *)response; + +#pragma mark - 短串分享搜索回调 + +/** + * @brief 短串分享搜索回调 + * @param request 发起的请求 + * @param response 相应结果，具体字段参考 AMapShareSearchResponse。 + */ +- (void)onShareSearchDone:(AMapShareSearchBaseRequest *)request response:(AMapShareSearchResponse *)response; + +@end diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchError.h b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchError.h new file mode 100644 index 00000000..335f3cbb --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchError.h @@ -0,0 +1,73 @@ +// +// AMapSearchError.h +// AMapSearchKit +// +// Created by xiaoming han on 15/7/29. +// Copyright (c) 2015年 Amap. All rights reserved. +// + +#ifndef AMapSearchKit_AMapSearchError_h +#define AMapSearchKit_AMapSearchError_h + +///AMapSearch errorDomain +extern NSString * const AMapSearchErrorDomain; + +///AMapSearch errorCode +typedef NS_ENUM(NSInteger, AMapSearchErrorCode) +{ + AMapSearchErrorOK = 1000,///< 没有错误 + AMapSearchErrorInvalidSignature = 1001,///< 无效签名 + AMapSearchErrorInvalidUserKey = 1002,///< key非法或过期 + AMapSearchErrorServiceNotAvailable = 1003,///< 没有权限使用相应的接口 + AMapSearchErrorDailyQueryOverLimit = 1004,///< 访问已超出日访问量 + AMapSearchErrorTooFrequently = 1005,///< 用户访问过于频繁 + AMapSearchErrorInvalidUserIP = 1006,///< 用户IP无效 + AMapSearchErrorInvalidUserDomain = 1007,///< 用户域名无效 + AMapSearchErrorInvalidUserSCode = 1008,///< 安全码验证错误，bundleID与key不对应 + AMapSearchErrorUserKeyNotMatch = 1009,///< 请求key与绑定平台不符 + AMapSearchErrorIPQueryOverLimit = 1010,///< IP请求超限 + AMapSearchErrorNotSupportHttps = 1011,///< 不支持HTTPS请求 + AMapSearchErrorInsufficientPrivileges = 1012,///< 权限不足，服务请求被拒绝 + AMapSearchErrorUserKeyRecycled = 1013,///< 开发者key被删除，无法正常使用 + + AMapSearchErrorInvalidResponse = 1100,///< 请求服务响应错误 + AMapSearchErrorInvalidEngineData = 1101,///< 引擎返回数据异常 + AMapSearchErrorConnectTimeout = 1102,///< 服务端请求链接超时 + AMapSearchErrorReturnTimeout = 1103,///< 读取服务结果超时 + AMapSearchErrorInvalidParams = 1200,///< 请求参数非法 + AMapSearchErrorMissingRequiredParams = 1201,///< 缺少必填参数 + AMapSearchErrorIllegalRequest = 1202,///< 请求协议非法 + AMapSearchErrorServiceUnknown = 1203,///< 其他服务端未知错误 + + AMapSearchErrorClientUnknown = 1800,///< 客户端未知错误，服务返回结果为空或其他错误 + AMapSearchErrorInvalidProtocol = 1801,///< 协议解析错误，通常是返回结果无法解析 + AMapSearchErrorTimeOut = 1802,///< 连接超时 + AMapSearchErrorBadURL = 1803,///< URL异常 + AMapSearchErrorCannotFindHost = 1804,///< 找不到主机 + AMapSearchErrorCannotConnectToHost = 1805,///< 服务器连接失败 + AMapSearchErrorNotConnectedToInternet = 1806,///< 连接异常，通常为没有网络的情况 + AMapSearchErrorCancelled = 1807,///< 连接取消 + + AMapSearchErrorOverPassPointCount = 1809,///< 途经点个数超限 + AMapSearchErrorOverPassAreaMaxCount = 1810,///< 避让区域个数超限 + AMapSearchErrorOverPassAreaMaxArea = 1811,///< 避让区域大小超限 + AMapSearchErrorOverPassAreaPointCount = 1812,///< 避让区域点个数超限 + AMapSearchErrorOverPassKeyWordLenth = 1813,///< 搜索关键字长度超限 + + AMapSearchErrorTableIDNotExist = 2000,///< table id 格式不正确 + AMapSearchErrorIDNotExist = 2001,///< id 不存在 + AMapSearchErrorServiceMaintenance = 2002,///< 服务器维护中 + AMapSearchErrorEngineTableIDNotExist = 2003,///< key对应的table id 不存在 + AMapSearchErrorInvalidNearbyUserID = 2100,///< 找不到对应userID的信息 + AMapSearchErrorNearbyKeyNotBind = 2101,///< key未开通“附近”功能 + + AMapSearchErrorOutOfService = 3000,///< 规划点（包括起点、终点、途经点）不在中国范围内 + AMapSearchErrorNoRoadsNearby = 3001,///< 规划点（包括起点、终点、途经点）附近搜不到道路 + AMapSearchErrorRouteFailed = 3002,///< 路线计算失败，通常是由于道路连通关系导致 + AMapSearchErrorOverDirectionRange = 3003,///< 起点终点距离过长 + + AMapSearchErrorShareLicenseExpired = 4000,///< 短串分享认证失败 + AMapSearchErrorShareFailed = 4001,///< 短串请求失败 +}; + +#endif diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchKit.h b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchKit.h new file mode 100644 index 00000000..ed46e5cb --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchKit.h @@ -0,0 +1,16 @@ +// +// AMapSearchKit.h +// AMapSearchKit +// +// Created by xiaoming han on 15/7/22. +// Copyright (c) 2015年 Amap. All rights reserved. +// + +#import +#import +#import +#import +#import +#import + +#import diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchObj.h b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchObj.h new file mode 100644 index 00000000..7d0fb200 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchObj.h @@ -0,0 +1,727 @@ +// +// AMapSearchObj.h +// AMapSearchKit +// +// Created by xiaoming han on 15/7/22. +// Copyright (c) 2015年 Amap. All rights reserved. +// + +/* 该文件定义了搜索请求和返回对象。*/ + +#import +#import "AMapCommonObj.h" + +///沿途搜索类型 +typedef NS_ENUM(NSInteger, AMapRoutePOISearchType) +{ + AMapRoutePOISearchTypeGasStation = 0, ///< 加油站 + AMapRoutePOISearchTypeMaintenanceStation = 1, ///< 维修站 + AMapRoutePOISearchTypeATM = 2, ///< ATM + AMapRoutePOISearchTypeToilet = 3, ///< 厕所 + AMapRoutePOISearchTypeGasAirStation = 4, ///< 加气站 + AMapRoutePOISearchTypeParkStation = 5, ///< 服务区 +}; + +///天气查询类型 +typedef NS_ENUM(NSInteger, AMapWeatherType) +{ + AMapWeatherTypeLive = 1, ///< 实时 + AMapWeatherTypeForecast ///< 预报 +}; + +///企业地图搜索结果排序 +typedef NS_ENUM(NSInteger, AMapCloudSortType) +{ + AMapCloudSortTypeDESC = 0, ///< 降序 + AMapCloudSortTypeASC = 1 ///< 升序 +}; + +///附近搜索距离类型 +typedef NS_ENUM(NSInteger, AMapNearbySearchType) +{ + AMapNearbySearchTypeLiner = 0, ///< 直线距离 + AMapNearbySearchTypeDriving = 1, ///< 驾车行驶距离 +}; + +///货车类型 +typedef NS_ENUM(NSInteger, AMapTruckSizeType) +{ + AMapTruckSizeTypeMini = 1, ///< 微型车 + AMapTruckSizeTypeLight = 2, ///< 轻型车 + AMapTruckSizeTypeMedium = 3, ///< 中型车 + AMapTruckSizeTypeHeavy = 4, ///< 重型车 +}; + +///规避道路类型 +typedef NS_ENUM(NSInteger, AMapDrivingRouteExcludeType) +{ + AMapDrivingRouteExcludeTypeNone = 0, ///< 不规避 + AMapDrivingRouteExcludeTypeToll = 1, ///< 收费道路 + AMapDrivingRouteExcludeTypeMotorway = 2, ///< 高速路 + AMapDrivingRouteExcludeTypeFerry = 3, ///< 渡船 +}; + +///距离测量类型 @since 7.7.0 +typedef NS_ENUM(NSInteger, AMapDistanceSearchType) +{ + AMapDistanceSearchTypeStraight = 0, ///< 直线距离 + AMapDistanceSearchTypeDrive = 1, ///< 驾车导航距离 + AMapDistanceSearchTypeWalk = 3, ///< 步行导航距离 +}; + +#pragma mark - AMapPOISearchBaseRequest + +///POI搜索请求基类 +@interface AMapPOISearchBaseRequest : AMapSearchObject +///类型，多个类型用“|”分割 可选值:文本分类、分类代码 +@property (nonatomic, copy) NSString *types; +///排序规则, 0-距离排序；1-综合排序, 默认0 +@property (nonatomic, assign) NSInteger sortrule; +///每页记录数, 范围1-25, [default = 20] +@property (nonatomic, assign) NSInteger offset; +///当前页数, 范围1-100, [default = 1] +@property (nonatomic, assign) NSInteger page; +///建筑物POI编号，传入建筑物POI之后，则只在该建筑物之内进行搜索（since 4.5.0） +@property (nonatomic, copy) NSString *building; +///是否返回扩展信息，默认为 NO。 +@property (nonatomic, assign) BOOL requireExtension; +///是否返回子POI，默认为 NO。 +@property (nonatomic, assign) BOOL requireSubPOIs; +@end + +///POI ID搜索请求 +@interface AMapPOIIDSearchRequest : AMapPOISearchBaseRequest +///POI全局唯一ID +@property (nonatomic, copy) NSString *uid; +@end + +///POI关键字搜索 +@interface AMapPOIKeywordsSearchRequest : AMapPOISearchBaseRequest +///查询关键字，多个关键字用“|”分割 +@property (nonatomic, copy) NSString *keywords; +///查询城市，可选值：cityname（中文或中文全拼）、citycode、adcode.(注：台湾省的城市一律设置为【台湾】，不具体到市。) +@property (nonatomic, copy) NSString *city; +///强制城市限制功能 默认NO，例如：在上海搜索天安门，如果citylimit为true，将不返回北京的天安门相关的POI +@property (nonatomic, assign) BOOL cityLimit; +///设置后，如果sortrule==0，则返回结果会按照距离此点的远近来排序,since 5.2.1 +@property (nonatomic, strong) AMapGeoPoint *location; + +@end + +///POI周边搜索 +@interface AMapPOIAroundSearchRequest : AMapPOISearchBaseRequest +///查询关键字，多个关键字用“|”分割 +@property (nonatomic, copy) NSString *keywords; +///中心点坐标 +@property (nonatomic, copy) AMapGeoPoint *location; +///查询半径，范围：0-50000，单位：米 [default = 1500] +@property (nonatomic, assign) NSInteger radius; +///查询城市，可选值：cityname（中文或中文全拼）、citycode、adcode。注：当用户指定的经纬度和city出现冲突，若范围内有用户指定city的数据，则返回相关数据，否则返回为空。（since 5.7.0） +@property (nonatomic, copy) NSString *city; +///是否对结果进行人工干预，如火车站，原因为poi较为特殊，结果存在人工干预，干预结果优先，所以距离优先的排序未生效,默认为YES (since 7.4.0) +@property (nonatomic, assign) BOOL special; + +@end + +///POI多边形搜索 +@interface AMapPOIPolygonSearchRequest : AMapPOISearchBaseRequest +///查询关键字，多个关键字用“|”分割 +@property (nonatomic, copy) NSString *keywords; +///多边形 +@property (nonatomic, copy) AMapGeoPolygon *polygon; +@end + +///POI搜索返回 +@interface AMapPOISearchResponse : AMapSearchObject +///返回的POI数目 +@property (nonatomic, assign) NSInteger count; +///关键字建议列表和城市建议列表 +@property (nonatomic, strong) AMapSuggestion *suggestion; +///POI结果，AMapPOI 数组 +@property (nonatomic, strong) NSArray *pois; +@end + +#pragma mark - AMapPOIRouteSearchRequest +///沿途搜索, 注意起点和终点不能相距太远(大概70公里)，否则可能搜索结果为空 +@interface AMapRoutePOISearchRequest : AMapSearchObject +///中心点坐标 +@property (nonatomic, copy) AMapGeoPoint *origin; +///目标点坐标 +@property (nonatomic, copy) AMapGeoPoint *destination; +///搜索类型 +@property (nonatomic, assign) AMapRoutePOISearchType searchType; +///驾车导航策略，同驾车路径规划请求的策略（5 多策略除外） +@property (nonatomic, assign) NSInteger strategy; +///道路周围搜索范围,单位米,[0-500]，默认250。 +@property (nonatomic, assign) NSInteger range; +///用户自己规划的路线,在origine、destination未填入时为必填.格式为:"经度,维度;经度,维度;...". 目前限制个数最多为100个点 +@property (nonatomic, strong) NSString *polylineStr; +///用户自己规划的路线,在origine、destination未填入且polylineStr未填入时为必填. 目前限制个数最多为100个点 +@property (nonatomic, strong) NSArray *polyline; + +@end + +///沿途搜索返回 +@interface AMapRoutePOISearchResponse : AMapSearchObject +///返回的POI数目 +@property (nonatomic, assign) NSInteger count; +///POI结果，AMapRoutePOI 数组 +@property (nonatomic, strong) NSArray *pois; +@end + +#pragma mark - AMapInputTipsSearchRequest + +///搜索提示请求 +@interface AMapInputTipsSearchRequest : AMapSearchObject +///查询关键字 +@property (nonatomic, copy) NSString *keywords; +///查询城市，可选值：cityname（中文或中文全拼）、citycode、adcode. +@property (nonatomic, copy) NSString *city; +///类型，多个类型用“|”分割 可选值:文本分类、分类代码 +@property (nonatomic, copy) NSString *types; +///强制城市限制功能，例如：在上海搜索天安门，如果citylimit为true，将不返回北京的天安门相关的POI +@property (nonatomic, assign) BOOL cityLimit; +///格式形如：@"116.481488,39.990464",(经度,纬度)，不可以包含空格。如果设置，在此location附近优先返回搜索关键词信息, since 5.0.0 +@property (nonatomic, copy) NSString *location; +@end + +///搜索提示返回 +@interface AMapInputTipsSearchResponse : AMapSearchObject +///返回数目 +@property (nonatomic, assign) NSInteger count; +///提示列表 AMapTip 数组， AMapTip 有多种属性，可根据该对象的返回信息，配合其他搜索服务使用，完善您应用的功能。如：\n 1）uid为空，location为空，该提示语为品牌词，可根据该品牌词进行POI关键词搜索。\n 2）uid不为空，location为空，为公交线路，根据uid进行公交线路查询。\n 3）uid不为空，location也不为空，是一个真实存在的POI，可直接显示在地图上。 +@property (nonatomic, strong) NSArray *tips; +@end + +#pragma mark - AMapGeocodeSearchRequest + +///地理编码请求 +@interface AMapGeocodeSearchRequest : AMapSearchObject +///地址 +@property (nonatomic, copy) NSString *address; +///查询城市，可选值：cityname（中文或中文全拼）、citycode、adcode. +@property (nonatomic, copy) NSString *city; +///指定查询国家，支持多个国家，用“|”分隔，可选值：国家代码ISO 3166 或 global，仅海外生效（since 7.4.0） +@property (nonatomic, copy) NSString *country; +@end + +///地理编码返回 +@interface AMapGeocodeSearchResponse : AMapSearchObject +///返回数目 +@property (nonatomic, assign) NSInteger count; +///地理编码结果 AMapGeocode 数组 +@property (nonatomic, strong) NSArray *geocodes; +@end + + +#pragma mark - AMapReGeocodeSearchRequest + +///逆地理编码请求 +@interface AMapReGeocodeSearchRequest : AMapSearchObject +///是否返回扩展信息，默认NO。 +@property (nonatomic, assign) BOOL requireExtension; +///中心点坐标。 +@property (nonatomic, copy) AMapGeoPoint *location; +///查询半径，单位米，范围0~3000，默认1000。 +@property (nonatomic, assign) NSInteger radius; +///指定返回结果poi数组中的POI类型，在requireExtension=YES时生效。输入为typecode, 支持传入多个typecode, 多值时用“|”分割 +@property (nonatomic, copy) NSString *poitype; +///distance 按距离返回,score 按权重返回，仅海外生效（since 7.4.0） +@property (nonatomic, copy) NSString *mode; + +@end + +///逆地理编码返回 +@interface AMapReGeocodeSearchResponse : AMapSearchObject +///逆地理编码结果 +@property (nonatomic, strong) AMapReGeocode *regeocode; +@end + +#pragma mark - AMapBusStopSearchRequest + +///公交站点请求 +@interface AMapBusStopSearchRequest : AMapSearchObject +///查询关键字 +@property (nonatomic, copy) NSString *keywords; +///城市 可选值：cityname（中文或中文全拼）、citycode、adcode +@property (nonatomic, copy) NSString *city; +///每页记录数，默认为20，取值为：1-50 +@property (nonatomic, assign) NSInteger offset; +///当前页数，默认值为1，取值为：1-100 +@property (nonatomic, assign) NSInteger page; +@end + +///公交站点返回 +@interface AMapBusStopSearchResponse : AMapSearchObject +///公交站数目 +@property (nonatomic, assign) NSInteger count; +///关键字建议列表和城市建议列表 +@property (nonatomic, strong) AMapSuggestion *suggestion; +///公交站点数组，数组中存放AMapBusStop对象 +@property (nonatomic, strong) NSArray *busstops; +@end + +#pragma mark - AMapBusLineSearchRequest + +///公交线路查询请求基类，不可直接调用 +@interface AMapBusLineBaseSearchRequest : AMapSearchObject +///城市 可选值：cityname（中文或中文全拼）、citycode、adcode +@property (nonatomic, copy) NSString *city; +///是否返回扩展信息，默认为NO +@property (nonatomic, assign) BOOL requireExtension; +///每页记录数，默认为20，取值为1－50 +@property (nonatomic, assign) NSInteger offset; +///当前页数，默认为1，取值为1-100 +@property (nonatomic, assign) NSInteger page; +@end + +///公交站线路根据名字请求 +@interface AMapBusLineNameSearchRequest : AMapBusLineBaseSearchRequest +///查询关键字 +@property (nonatomic, copy) NSString *keywords; +@end + +///公交站线路根据ID请求 +@interface AMapBusLineIDSearchRequest : AMapBusLineBaseSearchRequest +///唯一标识 +@property (nonatomic, copy) NSString *uid; +@end + +///公交站线路返回 +@interface AMapBusLineSearchResponse : AMapSearchObject +///返回公交站数目 +@property (nonatomic, assign) NSInteger count; +///关键字建议列表和城市建议列表 +@property (nonatomic, strong) AMapSuggestion *suggestion; +///公交线路数组，数组中存放 AMapBusLine 对象 +@property (nonatomic, strong) NSArray *buslines; +@end + +#pragma mark - AMapDistrictSearchRequest +///行政区划查询请求 +@interface AMapDistrictSearchRequest : AMapSearchObject +///查询关键字，只支持单关键字搜索，全国范围 +@property (nonatomic, copy) NSString *keywords; +///是否返回边界坐标，默认NO +@property (nonatomic, assign) BOOL requireExtension; +///是否显示商圈信息，默认NO。注：已废弃，行政区划搜索无商圈信息。 +@property (nonatomic, assign) BOOL showBusinessArea __attribute__((deprecated("已废弃, from 5.3.0")));; +///每页记录数, 范围1-50, [default = 20] +@property (nonatomic, assign) NSInteger offset; +///当前页数, 范围1-100, [default = 1] +@property (nonatomic, assign) NSInteger page; +///子区域层级，默认1。规则：设置显示下级行政区级数（行政区级别包括：国家、省/直辖市、市、区/县、乡镇/街道多级数据）可选值：0、1、2、3等数字，0-不返回下级行政区；1-返回下一级行政区；2-返回下两级行政区；3-返回下三级行政区 +@property (nonatomic, assign) NSInteger subdistrict; + +@end + +///行政区划响应 +@interface AMapDistrictSearchResponse : AMapSearchObject +///返回数目 +@property (nonatomic, assign) NSInteger count; +///行政区域 AMapDistrict 数组 +@property (nonatomic, strong) NSArray *districts; +@end + +#pragma mark - AMapRouteSearchBaseRequest + +///路径规划基础类，不可直接调用 +@interface AMapRouteSearchBaseRequest : AMapSearchObject +///出发点 +@property (nonatomic, copy) AMapGeoPoint *origin; +///目的地 +@property (nonatomic, copy) AMapGeoPoint *destination; +@end + +#pragma mark - AMapDrivingRouteSearchRequest + +///驾车路径规划 +@interface AMapDrivingRouteSearchRequest : AMapRouteSearchBaseRequest + +/** + 驾车导航策略，默认策略为0。 + 0，速度优先（时间)；1，费用优先（不走收费路段的最快道路）；2，距离优先；3，不走快速路；4，躲避拥堵； + 5，多策略（同时使用速度优先、费用优先、距离优先三个策略计算路径），其中必须说明，就算使用三个策略算路，会根据路况不固定的返回一至三条路径规划信息； + 6，不走高速；7，不走高速且避免收费；8，躲避收费和拥堵；9，不走高速且躲避收费和拥堵； + 10，多备选，时间最短，距离最短，躲避拥堵（考虑路况）； + 11，多备选，时间最短，距离最短； + 12，多备选，躲避拥堵（考虑路况）； + 13，多备选，不走高速； + 14，多备选，费用优先； + 15，多备选，躲避拥堵，不走高速（考虑路况）； + 16，多备选，费用有限，不走高速； + 17，多备选，躲避拥堵，费用优先（考虑路况）； + 18，多备选，躲避拥堵，不走高速，费用优先（考虑路况）； + 19，多备选，高速优先； + 20，多备选，高速优先，躲避拥堵（考虑路况） + */ +@property (nonatomic, assign) NSInteger strategy; +///途经点 AMapGeoPoint 数组，最多支持16个途经点 +@property (nonatomic, copy) NSArray *waypoints; +///避让区域 AMapGeoPolygon 数组，最多支持100个避让区域，每个区域16个点 +@property (nonatomic, copy) NSArray *avoidpolygons; +///避让道路名 +@property (nonatomic, copy) NSString *avoidroad; +///出发点 POI ID +@property (nonatomic, copy) NSString *originId; +///目的地 POI ID +@property (nonatomic, copy) NSString *destinationId; +///出发点POI类型编码 +@property (nonatomic, copy) NSString *origintype; +///目的地POI类型编码 +@property (nonatomic, copy) NSString *destinationtype; +///是否返回扩展信息，默认为 NO +@property (nonatomic, assign) BOOL requireExtension; +///车牌省份，用汉字填入车牌省份缩写。用于判断是否限行 +@property (nonatomic, copy) NSString *plateProvince; +///车牌详情,填入除省份及标点之外的字母和数字（需大写）。用于判断是否限行。 +@property (nonatomic, copy) NSString *plateNumber; +///使用轮渡,0使用1不使用,默认为0使用 +@property (nonatomic, assign) NSInteger ferry; +/** + 驾车路径规划车辆类型，默认策略为0。 + 0：普通汽车(默认值); + 1：纯电动车; + 2：插电混动车 + */ +@property (nonatomic, assign) NSInteger cartype; +///规避道路类型,默认为AMapDrivingRouteExcludeTypeNone，仅海外生效 +@property (nonatomic, assign) AMapDrivingRouteExcludeType exclude; + +@end + +#pragma mark - AMapWalkingRouteSearchRequest + +///步行路径规划 +@interface AMapWalkingRouteSearchRequest : AMapRouteSearchBaseRequest +///是否提供备选步行方案([default = 0])0-只提供一条步行方案; 1-提供备选步行方案(有可能无备选方案) +@property (nonatomic, assign) NSInteger multipath __attribute__((deprecated("已废弃, from 5.0.0"))); +@end + +#pragma mark - AMapTransitRouteSearchRequest + +///公交路径规划 +@interface AMapTransitRouteSearchRequest : AMapRouteSearchBaseRequest +///公交换乘策略([default = 0])\n 0-最快捷模式；\n 1-最经济模式；\n 2-最少换乘模式；\n 3-最少步行模式；\n 4-最舒适模式；\n 5-不乘地铁模式 +@property (nonatomic, assign) NSInteger strategy; +///城市, 必填 +@property (nonatomic, copy) NSString *city; +///目的城市, 跨城时需要填写，否则会出错 +@property (nonatomic, copy) NSString *destinationCity; +///是否包含夜班车，默认为 NO +@property (nonatomic, assign) BOOL nightflag; +///是否返回扩展信息，默认为 NO +@property (nonatomic, assign) BOOL requireExtension; +@end + +#pragma mark - AMapRidingRouteSearchRequest + +///骑行路径规划 +@interface AMapRidingRouteSearchRequest : AMapRouteSearchBaseRequest +///路径方案类型([default = 0])\n 0-推荐路线及最快路线综合\n 1-推荐路线\n 2-最快路线 +@property (nonatomic, assign) NSInteger type __attribute__((deprecated("已废弃, from 5.0.0"))); +///是否返回扩展信息，默认为 NO （since 7.6.0） +@property (nonatomic, assign) BOOL requireExtension; +@end + +///路径规划返回 +@interface AMapRouteSearchResponse : AMapSearchObject +///路径规划信息数目 +@property (nonatomic, assign) NSInteger count; +///路径规划信息 +@property (nonatomic, strong) AMapRoute *route; +@end + +///骑行路径规划返回 +@interface AMapRidingRouteSearchResponse : AMapRouteSearchResponse +@end + +#pragma mark - AMapTruckRouteSearchRequest + +///货车路径规划（since 6.1.0） +@interface AMapTruckRouteSearchRequest : AMapRouteSearchBaseRequest + +/** + 驾车导航策略，默认为策略1。 + 1，返回的结果考虑路况，尽量躲避拥堵而规划路径，与高德地图的“躲避拥堵”策略一致； + 2，返回的结果不走高速，与高德地图“不走高速”策略一致； + 3，返回的结果尽可能规划收费较低甚至免费的路径，与高德地图“避免收费”策略一致； + 4，返回的结果考虑路况，尽量躲避拥堵而规划路径，并且不走高速，与高德地图的“躲避拥堵&不走高速”策略一致； + 5，返回的结果尽量不走高速，并且尽量规划收费较低甚至免费的路径结果，与高德地图的“避免收费&不走高速”策略一致； + 6，返回路径规划结果会尽量的躲避拥堵，并且规划收费较低甚至免费的路径结果，与高德地图的“躲避拥堵&避免收费”策略一致； + 7，返回的结果尽量躲避拥堵，规划收费较低甚至免费的路径结果，并且尽量不走高速路，与高德地图的“避免拥堵&避免收费&不走高速”策略一致； + 8，返回的结果会优先选择高速路，与高德地图的“高速优先”策略一致； + 9，返回的结果会优先考虑高速路，并且会考虑路况躲避拥堵，与高德地图的“躲避拥堵&高速优先”策略一致。 + */ +@property (nonatomic, assign) NSInteger strategy; +///途经点 AMapGeoPoint 数组，最多支持16个途经点 +@property (nonatomic, copy) NSArray *waypoints; +///出发点 POI ID +@property (nonatomic, copy) NSString *originId; +///目的地 POI ID +@property (nonatomic, copy) NSString *destinationId; +///出发点POI类型编码 +@property (nonatomic, copy) NSString *origintype; +///目的地POI类型编码 +@property (nonatomic, copy) NSString *destinationtype; +///车牌省份，用汉字填入车牌省份缩写。用于判断是否限行 +@property (nonatomic, copy) NSString *plateProvince; +///车牌详情,填入除省份及标点之外的字母和数字（需大写）。用于判断是否限行。 +@property (nonatomic, copy) NSString *plateNumber; +///货车大小，默认为 轻型车（AMapTruckSizeTypeLight） +@property (nonatomic, assign) AMapTruckSizeType size; +///车辆高度，单位米，取值[0 – 25.5]米，默认 1.6 米 +@property (nonatomic, assign) CGFloat height; +///车辆宽度，单位米，取值[0 – 25.5]米，默认 2.5 米 +@property (nonatomic, assign) CGFloat width; +///车辆总重，单位吨，取值[0 – 6553.5]吨，默认 0.9 吨 +@property (nonatomic, assign) CGFloat load; +///货车核定载重，单位吨，取值[0 – 6553.5]吨，默认 10 吨 +@property (nonatomic, assign) CGFloat weight; +///车辆轴数，单位个，取值[0 –255]个，默认 2个轴 +@property (nonatomic, assign) NSInteger axis; +///是否返回扩展信息，默认为 NO （since 7.6.0） +@property (nonatomic, assign) BOOL requireExtension; +@end + +#pragma mark - AMapDistanceSearchRequest + +///距离查询请求（since 6.1.0） +@interface AMapDistanceSearchRequest : AMapSearchObject +///起点坐标数组，最多支持100个点。 +@property (nonatomic, strong) NSArray *origins; +///终点坐标 +@property (nonatomic, strong) AMapGeoPoint *destination; +///路径计算的类型，当type为导航距离时，会考虑路况，故在不同时间请求返回结果可能不同； +@property (nonatomic, assign) AMapDistanceSearchType type; +///驾车距离测量策略，参考驾车路径规划。仅当type为AMapDistanceSearchTypeDrive时有效，默认4 +@property (nonatomic, assign) NSInteger strategy; +///是否返回扩展信息，默认为 NO （since 7.6.0） +@property (nonatomic, assign) BOOL requireExtension; +@end + +///距离查询结果（since 6.1.0） +@interface AMapDistanceSearchResponse : AMapSearchObject +///距离查询结果 AMapDistanceResult 数组。 +@property (nonatomic, strong) NSArray *results; + +@end + +#pragma mark - AMapWeatherSearchRequest + +///天气查询请求 +@interface AMapWeatherSearchRequest : AMapSearchObject +///城市名称，支持cityname及adcode +@property (nonatomic, copy) NSString *city; +///气象类型，Live为实时天气，Forecast为后三天预报天气，默认为Live +@property (nonatomic, assign) AMapWeatherType type; +@end + +///天气查询返回 +@interface AMapWeatherSearchResponse : AMapSearchObject +///实时天气数据信息 AMapLocalWeatherLive 数组，仅在请求实时天气时有返回。 +@property (nonatomic, strong) NSArray *lives; +///预报天气数据信息 AMapLocalWeatherForecast 数组，仅在请求预报天气时有返回 +@property (nonatomic, strong) NSArray *forecasts; + +@end + +#pragma mark - AMapNearbySearchRequest +///附近搜索请求 +@interface AMapNearbySearchRequest : AMapSearchObject +///中心点坐标 +@property (nonatomic, copy) AMapGeoPoint *center; +///查询半径，范围：[0, 10000]，单位：米 [default = 1000] +@property (nonatomic, assign) NSInteger radius; +///搜索距离类型，默认为直线距离 +@property (nonatomic, assign) AMapNearbySearchType searchType; +///检索时间范围，超过24小时的数据无法返回，范围[5, 24*60*60] 单位：秒 [default = 1800] +@property (nonatomic, assign) NSInteger timeRange; +///返回条数，范围[1, 100], 默认30 +@property (nonatomic, assign) NSInteger limit; +@end + +///附近搜索返回 +@interface AMapNearbySearchResponse : AMapSearchObject +///结果总条数 +@property (nonatomic, assign) NSInteger count; +///周边用户信息 AMapNearbyUserInfo 数组 +@property (nonatomic, strong) NSArray *infos; +@end + +#pragma mark - AMapCloudSearchBaseRequest + +///企业地图搜索请求基类 +@interface AMapCloudSearchBaseRequest : AMapSearchObject +///要查询的表格ID, 必选 +@property (nonatomic, copy) NSString *tableID; +///筛选条件数组, 可选, 说明：\n 1.支持建立索引的字段根据多个条件筛选，多个条件用双&符号连接;\n 2.判断符合支持:>= 大于等于，<= 小于等于，>大于，<小于，= 精确匹配(text索引不可用);\n 3.示例规则：key1=value1&&key2=value2&&lastloctime>=1469817532，示例："name=王师傅|张师傅&&lastloctime>=1469817532 +@property (nonatomic, strong) NSArray *filter; +///排序字段名, 可选.\n 说明：\n 1.支持按建立了排序筛选索引的整数或小数字段进行排序：sortFields = "字段名"；\n 2.系统预设的字段(忽略sortType)：_distance：坐标与中心点距离升序排序，仅在周边检索时有效（若其它请求使用会异常返回）；_weight：权重降序排序，当存在keywords时有效；\n； +@property (nonatomic, copy) NSString *sortFields; +///可选, 排序方式(默认升序) +@property (nonatomic, assign) AMapCloudSortType sortType; +///可选, 每页记录数(每页最大记录数100, 默认20) +@property (nonatomic, assign) NSInteger offset; +///可选, 当前页数(>=1, 默认1) +@property (nonatomic, assign) NSInteger page; +@end + +#pragma mark - AMapCloudPlaceAroundSearchRequest + +///企业地图周边搜请求 +@interface AMapCloudPOIAroundSearchRequest : AMapCloudSearchBaseRequest +///必填，中心点坐标。 +@property (nonatomic, copy) AMapGeoPoint *center; +///可选，查询半径（默认值为3000），单位：米 +@property (nonatomic, assign) NSInteger radius; +///可选，搜索关键词。\n 说明：1. 只支持建立过文本索引的字段查询/n 2.支持关键字模糊检索，即对建立【文本索引字段】对应列内容进行模糊检索；如keywords=工商银行，检索返回已建立文本索引列值中包含“工商”或者“银行”或者“工商银行”关键字的POI结果集。/n 3.支持关键字多值模糊检索；如keywords=招商银行&&华夏银行&&工商银行，检索返回已建立索引列值中包含“招商银行”或者“华夏银行”或者“工商银行”的POI结果集，不会返回检索词切分后，如仅包含“招商”或者“银行”的POI集 +@property (nonatomic, copy) NSString *keywords; +@end + +///企业地图polygon区域查询请求 +@interface AMapCloudPOIPolygonSearchRequest : AMapCloudSearchBaseRequest +///必填，多边形。 +@property (nonatomic, copy) AMapGeoPolygon *polygon; +///可选，搜索关键词。\n 说明：1. 只支持建立过文本索引的字段查询/n 2.支持关键字模糊检索，即对建立【文本索引字段】对应列内容进行模糊检索；如keywords=工商银行，检索返回已建立文本索引列值中包含“工商”或者“银行”或者“工商银行”关键字的POI结果集。/n 3.支持关键字多值模糊检索；如keywords=招商银行&&华夏银行&&工商银行，检索返回已建立索引列值中包含“招商银行”或者“华夏银行”或者“工商银行”的POI结果集，不会返回检索词切分后，如仅包含“招商”或者“银行”的POI集 +@property (nonatomic, copy) NSString *keywords; +@end + +///企业地图ID查询请求 +@interface AMapCloudPOIIDSearchRequest : AMapCloudSearchBaseRequest +///必填,POI的ID +@property (nonatomic, assign) NSInteger uid; +@end + +///企业地图本地查询请求 +@interface AMapCloudPOILocalSearchRequest : AMapCloudSearchBaseRequest +///可选，搜索关键词。\n 说明：1. 只支持建立过文本索引的字段查询/n 2.支持关键字模糊检索，即对建立【文本索引字段】对应列内容进行模糊检索；如keywords=工商银行，检索返回已建立文本索引列值中包含“工商”或者“银行”或者“工商银行”关键字的POI结果集。/n 3.支持关键字多值模糊检索；如keywords=招商银行&&华夏银行&&工商银行，检索返回已建立索引列值中包含“招商银行”或者“华夏银行”或者“工商银行”的POI结果集，不会返回检索词切分后，如仅包含“招商”或者“银行”的POI集 +@property (nonatomic, copy) NSString *keywords; +///必填，城市名称\n 说明：\n 1. 支持全国/省/市/区县行政区划范围的检索；\n 2. city = "全国"，即对用户全表搜索；\n 3. 当city值设置非法或不正确时，按照 city = "全国"返回。 +@property (nonatomic, copy) NSString *city; +@end + +///企业地图搜索返回 +@interface AMapCloudPOISearchResponse : AMapSearchObject +///返回结果总数目 +@property (nonatomic, assign) NSInteger count; +///返回的结果, AMapCloudPOI 数组 +@property (nonatomic, strong) NSArray *POIs; + +@end + +#pragma mark - AMapShareSearchBaseRequest + +///短串分享搜索请求基类, 请使用具体的子类。 +@interface AMapShareSearchBaseRequest : AMapSearchObject +@end + +///位置短串分享请求 +@interface AMapLocationShareSearchRequest : AMapShareSearchBaseRequest +///必填, 位置坐标 +@property (nonatomic, copy) AMapGeoPoint *location; +///位置名称，请不要包含【,%&@#】等特殊符号 +@property (nonatomic, copy) NSString *name; +@end + +///兴趣点短串分享请求 +@interface AMapPOIShareSearchRequest : AMapShareSearchBaseRequest +///POI的ID，如果有ID则指定POI，否则按name查询。 +@property (nonatomic, copy) NSString *uid; +///坐标 +@property (nonatomic, copy) AMapGeoPoint *location; +///名称，请不要包含【,%&@#】等特殊符号。 +@property (nonatomic, copy) NSString *name; +///地址，请不要包含【,%&@#】等特殊符号。 +@property (nonatomic, copy) NSString *address; +@end + +///路径规划短串分享请求 +@interface AMapRouteShareSearchRequest : AMapShareSearchBaseRequest +///默认为0\n 驾车:0-速度最快（时间）;\n 1-避免收费（不走收费路段的最快道路）;\n 2-距离优先;\n 3-不走高速;\n 4-结合实时交通（躲避拥堵）;\n 5-不走高速且避免收费;\n 6-不走高速且躲避拥堵;\n 7-躲避收费和拥堵;\n 8-不走高速且躲避收费和拥堵\n\n 公交:0-最快捷;\n 1-最经济;\n 2-最少换乘;\n 3-最少步行;\n 4-最舒适;\n 5-不乘地铁;\n\n 步行，无策略，均一样 +@property (nonatomic, assign) NSInteger strategy; +///Route的type，默认为0，超出范围为0.\n 0为驾车，\n 1为公交，\n 2为步行 +@property (nonatomic, assign) NSInteger type; +///起点坐标 +@property (nonatomic, copy) AMapGeoPoint *startCoordinate; +///终点坐标 +@property (nonatomic, copy) AMapGeoPoint *destinationCoordinate; +///起点名称，默认为“已选择的位置”，请不要包含【,%&@#】等特殊符号 +@property (nonatomic, copy) NSString *startName; +///终点名称，默认为“已选择的位置”，请不要包含【,%&@#】等特殊符号 +@property (nonatomic, copy) NSString *destinationName; +@end + +///导航短串分享请求 +@interface AMapNavigationShareSearchRequest : AMapShareSearchBaseRequest + +///默认为0，超出范围为0\n 驾车:0-速度最快（时间）;\n 1-避免收费（不走收费路段的最快道路）;\n 2-距离优先;\n 3-不走高速;\n 4-结合实时交通（躲避拥堵）;\n 5-不走高速且避免收费;\n 6-不走高速且躲避拥堵;\n 7-躲避收费和拥堵;\n 8-不走高速且躲避收费和拥堵 +@property (nonatomic, assign) NSInteger strategy; +///起点坐标，若跳转到高德地图，默认更换为定位坐标 +@property (nonatomic, copy) AMapGeoPoint *startCoordinate; +///终点坐标 +@property (nonatomic, copy) AMapGeoPoint *destinationCoordinate; +@end + +///导航短串分享响应 +@interface AMapShareSearchResponse : AMapSearchObject +///转换后的短串 +@property (nonatomic, copy) NSString *shareURL; +@end + +///未来路线规划（since 6.9.0） +@interface AMapFutureRouteSearchRequest : AMapRouteSearchBaseRequest +///出发时间 单位为秒 +@property (nonatomic, copy) NSString *beginTime; +///时间间隔 单位为秒 +@property (nonatomic, assign) NSInteger interval; +///时间点个数,最多48个 +@property (nonatomic, assign) NSInteger timeCount; +/** + 未来路线规划策略，默认策略为0。 + 1，返回的结果考虑路况，尽量躲避拥堵而规划路径，与高德地图的“躲避拥堵”策略一致 + 2，返回的结果不走高速，与高德地图“不走高速”策略一致 + 3，返回的结果尽可能规划收费较低甚至免费的路径，与高德地图“避免收费”策略一致 + 4，返回的结果考虑路况，尽量躲避拥堵而规划路径，并且不走高速，与高德地图的“躲避拥堵&不走高速”策略一致 + 5，返回的结果尽量不走高速，并且尽量规划收费较低甚至免费的路径结果，与高德地图的“避免收费&不走高速”策略一致 + 6，返回路径规划结果会尽量的躲避拥堵，并且规划收费较低甚至免费的路径结果，与高德地图的“躲避拥堵&避免收费”策略一致 + 7，返回的结果尽量躲避拥堵，规划收费较低甚至免费的路径结果，并且尽量不走高速路，与高德地图的“避免拥堵&避免收费&不走高速”策略一致 + 8，返回的结果会优先选择高速路，与高德地图的“高速优先”策略一致 + 9，返回的结果会优先考虑高速路，并且会考虑路况躲避拥堵，与高德地图的“躲避拥堵&高速优先”策略一致 + 10，不考虑路况，返回速度最优、耗时最短的路线，但是此路线不一定距离最短 + 11，避让拥堵&速度优先&避免收费 + */ +@property (nonatomic, assign) NSInteger strategy; +///出发点 POI ID +@property (nonatomic, copy) NSString *originId; +///目的地 POI ID +@property (nonatomic, copy) NSString *destinationId; +///出发点POI类型编码 +@property (nonatomic, copy) NSString *origintype; +///目的地POI类型编码 +@property (nonatomic, copy) NSString *destinationtype; +///终点的父POI ID +@property (nonatomic, copy) NSString *parentId; + +/////是否返回扩展信息，默认为 NO +//@property (nonatomic, assign) BOOL requireExtension; +///车牌省份，用汉字填入车牌省份缩写。用于判断是否限行 +@property (nonatomic, copy) NSString *plateProvince; +///车牌详情,填入除省份及标点之外的字母和数字（需大写）。用于判断是否限行。 +@property (nonatomic, copy) NSString *plateNumber; +/** + 驾车路径规划车辆类型，默认策略为0。 + 0：普通汽车(默认值); + 1：纯电动车; + 2：插电混动车 + */ +@property (nonatomic, assign) NSInteger cartype; +@end + +///未来路线规划（since 6.9.0） +@interface AMapFutureRouteSearchResponse : AMapSearchObject +///路径规划方案,只会返回AMapPath中的distance、totalTrafficLights、steps +@property (nonatomic, strong) NSArray *paths; +///不同时间的规划以及信息列表 +@property (nonatomic, strong) NSArray *timeInfos; +@end diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchVersion.h b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchVersion.h new file mode 100644 index 00000000..59c4aad4 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Headers/AMapSearchVersion.h @@ -0,0 +1,26 @@ +// +// AMapSearchVersion.h +// AMapSearchKit +// +// Created by xiaoming han on 15/10/27. +// Copyright © 2015年 Amap. All rights reserved. +// + +#import +#import + +#ifndef AMapSearchVersion_h +#define AMapSearchVersion_h + +#define AMapSearchVersionNumber 70800 +#define AMapSearchMinRequiredFoundationVersion 10604 + +// 依赖库版本检测 +#if AMapFoundationVersionNumber < AMapSearchMinRequiredFoundationVersion +#error "The AMapFoundationKit version is less than minimum required, please update! Any questions please to visit http://lbs.amap.com" +#endif + +FOUNDATION_EXTERN NSString * const AMapSearchVersion; +FOUNDATION_EXTERN NSString * const AMapSearchName; + +#endif /* AMapSearchVersion_h */ diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/Modules/module.modulemap b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Modules/module.modulemap new file mode 100644 index 00000000..c09b8b19 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module AMapSearchKit { + umbrella header "AMapSearchKit.h" + + export * + module * { export * } +} diff --git a/ios/UniMPSDK/Libs/AMapSearchKit.framework/version.txt b/ios/UniMPSDK/Libs/AMapSearchKit.framework/version.txt new file mode 100644 index 00000000..b52eff06 --- /dev/null +++ b/ios/UniMPSDK/Libs/AMapSearchKit.framework/version.txt @@ -0,0 +1 @@ +7.8.0+sea.4b6a128 diff --git a/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/DCUniVideoPublic b/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/DCUniVideoPublic new file mode 100644 index 00000000..8974570e Binary files /dev/null and b/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/DCUniVideoPublic differ diff --git a/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Headers/HJDanmakuView.h b/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Headers/HJDanmakuView.h new file mode 100644 index 00000000..374b7fe8 --- /dev/null +++ b/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Headers/HJDanmakuView.h @@ -0,0 +1,99 @@ +// +// HJDanmakuView.h +// HJDanmakuDemo +// +// Created by haijiao on 2017/7/6. +// Copyright © 2017年 olinone. All rights reserved. +// + +#import +#import "HJDanmakuConfiguration.h" +#import "HJDanmakuModel.h" +#import "HJDanmakuCell.h" + +@class HJDanmakuView; +@protocol HJDanmakuViewDelegate + +@optional + +// preparate completed. you can start render after callback +- (void)prepareCompletedWithDanmakuView:(HJDanmakuView *)danmakuView; + +// called before render. return NO will ignore danmaku +- (BOOL)danmakuView:(HJDanmakuView *)danmakuView shouldRenderDanmaku:(HJDanmakuModel *)danmaku; + +// display customization +- (void)danmakuView:(HJDanmakuView *)danmakuView willDisplayCell:(HJDanmakuCell *)cell danmaku:(HJDanmakuModel *)danmaku; +- (void)danmakuView:(HJDanmakuView *)danmakuView didEndDisplayCell:(HJDanmakuCell *)cell danmaku:(HJDanmakuModel *)danmaku; + +// selection customization +- (BOOL)danmakuView:(HJDanmakuView *)danmakuView shouldSelectCell:(HJDanmakuCell *)cell danmaku:(HJDanmakuModel *)danmaku; +- (void)danmakuView:(HJDanmakuView *)danmakuView didSelectCell:(HJDanmakuCell *)cell danmaku:(HJDanmakuModel *)danmaku; + +@end + +//_______________________________________________________________________________________________________________ + +@protocol HJDanmakuViewDateSource; +@interface HJDanmakuView : UIView + +@property (nonatomic, weak) id dataSource; +@property (nonatomic, weak) id delegate; + +@property (readonly) HJDanmakuConfiguration *configuration; +@property (readonly) BOOL isPrepared; +@property (readonly) BOOL isPlaying; + +// traverse touches outside of the danmaku view, default NO +@property (nonatomic, assign) BOOL traverseTouches; + +- (instancetype)initWithFrame:(CGRect)frame configuration:(HJDanmakuConfiguration *)configuration; + +- (void)registerClass:(Class)cellClass forCellReuseIdentifier:(NSString *)identifier; +- (__kindof HJDanmakuCell *)dequeueReusableCellWithIdentifier:(NSString *)identifier; + +- (__kindof HJDanmakuModel *)danmakuForVisibleCell:(HJDanmakuCell *)danmakuCell; // returns nil if cell is not visible +@property (nonatomic, readonly) NSArray<__kindof HJDanmakuCell *> *visibleCells; + +// you can prepare with nil when liveModel +- (void)prepareDanmakus:(NSArray *)danmakus; + +// be sure to call -prepareDanmakus before -play, when isPrepared is NO, call will be invalid +- (void)play; +- (void)pause; +- (void)stop; + +// reset and clear all danmakus, must call -prepareDanmakus before -play once again +- (void)reset; +- (void)clearScreen; + + +/* send customization. when force, renderer will draw the danmaku immediately and ignore the maximum quantity limit. + you should call -sendDanmakus: instead of -sendDanmaku:forceRender: to send the danmakus from a remote servers + */ +- (void)sendDanmaku:(HJDanmakuModel *)danmaku forceRender:(BOOL)force; +- (void)sendDanmakus:(NSArray *)danmakus; + +@end + +//_______________________________________________________________________________________________________________ + +@protocol HJDanmakuViewDateSource + +@required + +// variable cell width support +- (CGFloat)danmakuView:(HJDanmakuView *)danmakuView widthForDanmaku:(HJDanmakuModel *)danmaku; + +// cell display. implementers should *always* try to reuse cells by setting each cell's reuseIdentifier and querying for available reusable cells with dequeueReusableCellWithIdentifier: +- (HJDanmakuCell *)danmakuView:(HJDanmakuView *)danmakuView cellForDanmaku:(HJDanmakuModel *)danmaku; + +@optional + +// current play time, unit second, must implementation when videoModel +- (float)playTimeWithDanmakuView:(HJDanmakuView *)danmakuView; + +// play buffer status, when YES, stop render new danmaku, rendered danmaku in screen will continue anim until disappears, only valid when videoModel +- (BOOL)bufferingWithDanmakuView:(HJDanmakuView *)danmakuView; + +@end diff --git a/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Headers/libcomMasonry.h b/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Headers/libcomMasonry.h new file mode 100644 index 00000000..32fc02c9 --- /dev/null +++ b/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Headers/libcomMasonry.h @@ -0,0 +1,32 @@ +// +// libcomMasonry.h +// libcomMasonry +// +// Created by 4Ndf on 2019/4/15. +// Copyright © 2019年 Dcloud. All rights reserved. +// + +#import + +//! Project version number for libcomMasonry. +FOUNDATION_EXPORT double libcomMasonryVersionNumber; + +//! Project version string for libcomMasonry. +FOUNDATION_EXPORT const unsigned char libcomMasonryVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + +#import "MASUtilities.h" +#import "View+MASAdditions.h" +#import "View+MASShorthandAdditions.h" +#import "ViewController+MASAdditions.h" +#import "NSArray+MASAdditions.h" +#import "NSArray+MASShorthandAdditions.h" +#import "MASConstraint.h" +#import "MASCompositeConstraint.h" +#import "MASViewAttribute.h" +#import "MASViewConstraint.h" +#import "MASConstraintMaker.h" +#import "MASLayoutConstraint.h" +#import "NSLayoutConstraint+MASDebugAdditions.h" diff --git a/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Info.plist b/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Info.plist new file mode 100644 index 00000000..1437ce20 Binary files /dev/null and b/ios/UniMPSDK/Libs/DCUniVideoPublic.framework/Info.plist differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_navi_sky_day.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_navi_sky_day.data new file mode 100644 index 00000000..4947a5a9 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_navi_sky_day.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_sky_day.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_sky_day.data new file mode 100644 index 00000000..55a4616e Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_sky_day.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_sky_night.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_sky_night.data new file mode 100644 index 00000000..f789b450 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3d_sky_night.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3dlandscape.xml b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3dlandscape.xml new file mode 100644 index 00000000..17fbb3a9 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3dlandscape.xml @@ -0,0 +1,112 @@ + + v1.0 + + + 1 + + 30 + + 70 + + 40 + + 50 + + 10 + + 45 + + + 100 + + 100 + + 70 + + 40 + + + 100 + + 100 + + 75 + + 3.0 + + 4 + + + 10 + + 0 + + + 15 + + 150 + + 80 + + + 250 + + 25 + + 50 + + + 6.5 + + + 7.0 + + 0 + 174 + 255 + 204 + + + 30 + + 30 + + 7.0 + + 100 + + + + + 29 + + 30 + + 26 + + 4 + + 6 + + + 29 + + 30 + + 26 + + 2 + + 3 + + + 60 + + 120 + + 180 + + 100 + + + diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3dportrait.xml b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3dportrait.xml new file mode 100644 index 00000000..90a616c7 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/3dportrait.xml @@ -0,0 +1,112 @@ + + v1.0 + + + 0 + + 30 + + 65 + + 50 + + 50 + + 10 + + 45 + + + 100 + + 100 + + 65 + + 50 + + + 100 + + 100 + + 70 + + 3.0 + + 4 + + + 10 + + 0 + + + 15 + + 150 + + 80 + + + 250 + + 25 + + 50 + + + 6.5 + + + 7.0 + + 0 + 174 + 255 + 204 + + + 30 + + 30 + + 7.0 + + 100 + + + + + 29 + + 30 + + 26 + + 4 + + 6 + + + 29 + + 30 + + 26 + + 2 + + 3 + + + 60 + + 120 + + 180 + + 100 + + + diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1015_1.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1015_1.png new file mode 100644 index 00000000..9af326c5 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1015_1.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1015_2.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1015_2.png new file mode 100644 index 00000000..0f4044de Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1015_2.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1016_1.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1016_1.png new file mode 100644 index 00000000..4b34a087 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1016_1.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1016_2.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1016_2.png new file mode 100644 index 00000000..8e3dd3b1 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/1016_2.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_bk_grass_day.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_bk_grass_day.png new file mode 100644 index 00000000..90e0e92d Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_bk_grass_day.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_bk_grass_night.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_bk_grass_night.png new file mode 100644 index 00000000..28ade07f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_bk_grass_night.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_sky_day.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_sky_day.png new file mode 100644 index 00000000..2f0d315d Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_sky_day.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_sky_night.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_sky_night.png new file mode 100644 index 00000000..0ddc29d0 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/cross_sky_night.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/d_yellow_day.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/d_yellow_day.png new file mode 100644 index 00000000..9f756f22 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/d_yellow_day.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/d_yellow_night.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/d_yellow_night.png new file mode 100644 index 00000000..4a95f211 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/d_yellow_night.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/exit_label_bk_main_day.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/exit_label_bk_main_day.png new file mode 100644 index 00000000..c8f6316d Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/exit_label_bk_main_day.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/exit_label_bk_secondary_day.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/exit_label_bk_secondary_day.png new file mode 100644 index 00000000..677b8b7f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/exit_label_bk_secondary_day.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/grass_day.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/grass_day.png new file mode 100644 index 00000000..a57fe339 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/grass_day.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/grass_night.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/grass_night.png new file mode 100644 index 00000000..08203866 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/grass_night.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/road_bottom_day.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/road_bottom_day.png new file mode 100644 index 00000000..f3aa02f6 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/road_bottom_day.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/road_bottom_night.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/road_bottom_night.png new file mode 100644 index 00000000..09fdbe82 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/road_bottom_night.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/roadbk_main_day.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/roadbk_main_day.png new file mode 100644 index 00000000..c3732fec Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/roadbk_main_day.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/roadbk_main_night.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/roadbk_main_night.png new file mode 100644 index 00000000..f9f1ae25 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/VM3DRes/roadbk_main_night.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/anscii.fnt b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/anscii.fnt new file mode 100644 index 00000000..e3868315 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/anscii.fnt @@ -0,0 +1,191 @@ +info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 +common lineHeight=32 base=26 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 +page id=0 file="anscii_0.png" +chars count=95 +char id=32 x=110 y=22 width=3 height=1 xoffset=-1 yoffset=31 xadvance=8 page=0 chnl=15 +char id=33 x=199 y=63 width=4 height=20 xoffset=2 yoffset=6 xadvance=8 page=0 chnl=15 +char id=34 x=242 y=79 width=10 height=7 xoffset=0 yoffset=6 xadvance=10 page=0 chnl=15 +char id=35 x=0 y=48 width=16 height=20 xoffset=-1 yoffset=6 xadvance=15 page=0 chnl=15 +char id=36 x=94 y=0 width=15 height=23 xoffset=0 yoffset=5 xadvance=15 page=0 chnl=15 +char id=37 x=161 y=0 width=22 height=20 xoffset=1 yoffset=6 xadvance=24 page=0 chnl=15 +char id=38 x=132 y=21 width=17 height=20 xoffset=1 yoffset=6 xadvance=18 page=0 chnl=15 +char id=39 x=0 y=106 width=5 height=7 xoffset=0 yoffset=6 xadvance=5 page=0 chnl=15 +char id=40 x=47 y=0 width=8 height=25 xoffset=1 yoffset=6 xadvance=9 page=0 chnl=15 +char id=41 x=56 y=0 width=8 height=25 xoffset=1 yoffset=6 xadvance=9 page=0 chnl=15 +char id=42 x=230 y=79 width=11 height=8 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15 +char id=43 x=187 y=84 width=14 height=12 xoffset=1 yoffset=10 xadvance=16 page=0 chnl=15 +char id=44 x=6 y=106 width=4 height=6 xoffset=2 yoffset=24 xadvance=8 page=0 chnl=15 +char id=45 x=53 y=106 width=9 height=2 xoffset=0 yoffset=18 xadvance=9 page=0 chnl=15 +char id=46 x=209 y=79 width=4 height=2 xoffset=2 yoffset=24 xadvance=8 page=0 chnl=15 +char id=47 x=153 y=63 width=10 height=20 xoffset=-1 yoffset=6 xadvance=8 page=0 chnl=15 +char id=48 x=15 y=69 width=14 height=20 xoffset=0 yoffset=6 xadvance=15 page=0 chnl=15 +char id=49 x=164 y=63 width=9 height=20 xoffset=2 yoffset=6 xadvance=15 page=0 chnl=15 +char id=50 x=134 y=42 width=14 height=20 xoffset=0 yoffset=6 xadvance=15 page=0 chnl=15 +char id=51 x=59 y=68 width=13 height=20 xoffset=1 yoffset=6 xadvance=15 page=0 chnl=15 +char id=52 x=179 y=42 width=14 height=20 xoffset=0 yoffset=6 xadvance=15 page=0 chnl=15 +char id=53 x=45 y=69 width=13 height=20 xoffset=1 yoffset=6 xadvance=15 page=0 chnl=15 +char id=54 x=194 y=42 width=14 height=20 xoffset=0 yoffset=6 xadvance=15 page=0 chnl=15 +char id=55 x=115 y=66 width=13 height=20 xoffset=1 yoffset=6 xadvance=15 page=0 chnl=15 +char id=56 x=102 y=45 width=15 height=20 xoffset=0 yoffset=6 xadvance=15 page=0 chnl=15 +char id=57 x=118 y=43 width=15 height=20 xoffset=0 yoffset=6 xadvance=15 page=0 chnl=15 +char id=58 x=251 y=63 width=4 height=15 xoffset=2 yoffset=11 xadvance=8 page=0 chnl=15 +char id=59 x=204 y=63 width=4 height=19 xoffset=2 yoffset=11 xadvance=8 page=0 chnl=15 +char id=60 x=172 y=84 width=14 height=13 xoffset=1 yoffset=10 xadvance=16 page=0 chnl=15 +char id=61 x=215 y=79 width=14 height=8 xoffset=1 yoffset=12 xadvance=16 page=0 chnl=15 +char id=62 x=157 y=84 width=14 height=13 xoffset=1 yoffset=10 xadvance=16 page=0 chnl=15 +char id=63 x=101 y=68 width=13 height=20 xoffset=1 yoffset=6 xadvance=15 page=0 chnl=15 +char id=64 x=0 y=0 width=26 height=26 xoffset=1 yoffset=6 xadvance=27 page=0 chnl=15 +char id=65 x=227 y=0 width=19 height=20 xoffset=-1 yoffset=6 xadvance=18 page=0 chnl=15 +char id=66 x=17 y=48 width=16 height=20 xoffset=1 yoffset=6 xadvance=18 page=0 chnl=15 +char id=67 x=58 y=26 width=18 height=20 xoffset=1 yoffset=6 xadvance=20 page=0 chnl=15 +char id=68 x=168 y=21 width=17 height=20 xoffset=2 yoffset=6 xadvance=20 page=0 chnl=15 +char id=69 x=51 y=47 width=16 height=20 xoffset=1 yoffset=6 xadvance=18 page=0 chnl=15 +char id=70 x=240 y=21 width=15 height=20 xoffset=2 yoffset=6 xadvance=17 page=0 chnl=15 +char id=71 x=0 y=27 width=19 height=20 xoffset=1 yoffset=6 xadvance=21 page=0 chnl=15 +char id=72 x=186 y=21 width=17 height=20 xoffset=1 yoffset=6 xadvance=19 page=0 chnl=15 +char id=73 x=184 y=63 width=4 height=20 xoffset=2 yoffset=6 xadvance=8 page=0 chnl=15 +char id=74 x=129 y=64 width=12 height=20 xoffset=0 yoffset=6 xadvance=13 page=0 chnl=15 +char id=75 x=39 y=26 width=18 height=20 xoffset=1 yoffset=6 xadvance=18 page=0 chnl=15 +char id=76 x=0 y=69 width=14 height=20 xoffset=1 yoffset=6 xadvance=15 page=0 chnl=15 +char id=77 x=184 y=0 width=21 height=20 xoffset=1 yoffset=6 xadvance=23 page=0 chnl=15 +char id=78 x=96 y=24 width=17 height=20 xoffset=1 yoffset=6 xadvance=19 page=0 chnl=15 +char id=79 x=206 y=0 width=20 height=20 xoffset=1 yoffset=6 xadvance=21 page=0 chnl=15 +char id=80 x=85 y=47 width=16 height=20 xoffset=1 yoffset=6 xadvance=17 page=0 chnl=15 +char id=81 x=110 y=0 width=21 height=21 xoffset=0 yoffset=6 xadvance=21 page=0 chnl=15 +char id=82 x=77 y=26 width=18 height=20 xoffset=2 yoffset=6 xadvance=20 page=0 chnl=15 +char id=83 x=68 y=47 width=16 height=20 xoffset=1 yoffset=6 xadvance=18 page=0 chnl=15 +char id=84 x=34 y=48 width=16 height=20 xoffset=0 yoffset=6 xadvance=16 page=0 chnl=15 +char id=85 x=204 y=21 width=17 height=20 xoffset=1 yoffset=6 xadvance=19 page=0 chnl=15 +char id=86 x=222 y=21 width=17 height=20 xoffset=0 yoffset=6 xadvance=17 page=0 chnl=15 +char id=87 x=132 y=0 width=28 height=20 xoffset=0 yoffset=6 xadvance=28 page=0 chnl=15 +char id=88 x=150 y=21 width=17 height=20 xoffset=0 yoffset=6 xadvance=17 page=0 chnl=15 +char id=89 x=20 y=27 width=18 height=20 xoffset=0 yoffset=6 xadvance=18 page=0 chnl=15 +char id=90 x=114 y=22 width=17 height=20 xoffset=0 yoffset=6 xadvance=17 page=0 chnl=15 +char id=91 x=73 y=0 width=7 height=25 xoffset=1 yoffset=6 xadvance=8 page=0 chnl=15 +char id=92 x=174 y=63 width=9 height=20 xoffset=-1 yoffset=6 xadvance=8 page=0 chnl=15 +char id=93 x=65 y=0 width=7 height=25 xoffset=0 yoffset=6 xadvance=8 page=0 chnl=15 +char id=94 x=202 y=84 width=12 height=10 xoffset=0 yoffset=6 xadvance=12 page=0 chnl=15 +char id=95 x=35 y=106 width=17 height=2 xoffset=-1 yoffset=29 xadvance=15 page=0 chnl=15 +char id=96 x=28 y=106 width=6 height=4 xoffset=1 yoffset=6 xadvance=9 page=0 chnl=15 +char id=97 x=48 y=90 width=14 height=15 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=98 x=149 y=42 width=14 height=20 xoffset=1 yoffset=6 xadvance=15 page=0 chnl=15 +char id=99 x=106 y=89 width=13 height=15 xoffset=0 yoffset=11 xadvance=14 page=0 chnl=15 +char id=100 x=164 y=42 width=14 height=20 xoffset=0 yoffset=6 xadvance=15 page=0 chnl=15 +char id=101 x=0 y=90 width=15 height=15 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=102 x=142 y=63 width=10 height=20 xoffset=-1 yoffset=6 xadvance=7 page=0 chnl=15 +char id=103 x=209 y=42 width=14 height=20 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=104 x=73 y=68 width=13 height=20 xoffset=1 yoffset=6 xadvance=15 page=0 chnl=15 +char id=105 x=189 y=63 width=4 height=20 xoffset=1 yoffset=6 xadvance=6 page=0 chnl=15 +char id=106 x=81 y=0 width=7 height=25 xoffset=-2 yoffset=6 xadvance=6 page=0 chnl=15 +char id=107 x=87 y=68 width=13 height=20 xoffset=1 yoffset=6 xadvance=14 page=0 chnl=15 +char id=108 x=194 y=63 width=4 height=20 xoffset=1 yoffset=6 xadvance=6 page=0 chnl=15 +char id=109 x=209 y=63 width=20 height=15 xoffset=1 yoffset=11 xadvance=22 page=0 chnl=15 +char id=110 x=78 y=89 width=13 height=15 xoffset=1 yoffset=11 xadvance=15 page=0 chnl=15 +char id=111 x=16 y=90 width=15 height=15 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=112 x=30 y=69 width=14 height=20 xoffset=1 yoffset=11 xadvance=15 page=0 chnl=15 +char id=113 x=224 y=42 width=14 height=20 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=114 x=147 y=84 width=9 height=15 xoffset=1 yoffset=11 xadvance=9 page=0 chnl=15 +char id=115 x=63 y=89 width=14 height=15 xoffset=0 yoffset=11 xadvance=14 page=0 chnl=15 +char id=116 x=247 y=0 width=8 height=20 xoffset=0 yoffset=6 xadvance=8 page=0 chnl=15 +char id=117 x=92 y=89 width=13 height=15 xoffset=1 yoffset=11 xadvance=15 page=0 chnl=15 +char id=118 x=32 y=90 width=15 height=15 xoffset=-1 yoffset=11 xadvance=13 page=0 chnl=15 +char id=119 x=230 y=63 width=20 height=15 xoffset=-1 yoffset=11 xadvance=19 page=0 chnl=15 +char id=120 x=134 y=85 width=12 height=15 xoffset=0 yoffset=11 xadvance=12 page=0 chnl=15 +char id=121 x=239 y=42 width=14 height=20 xoffset=0 yoffset=11 xadvance=14 page=0 chnl=15 +char id=122 x=120 y=87 width=13 height=15 xoffset=0 yoffset=11 xadvance=13 page=0 chnl=15 +char id=123 x=37 y=0 width=9 height=25 xoffset=0 yoffset=6 xadvance=9 page=0 chnl=15 +char id=124 x=89 y=0 width=4 height=25 xoffset=1 yoffset=6 xadvance=6 page=0 chnl=15 +char id=125 x=27 y=0 width=9 height=25 xoffset=0 yoffset=6 xadvance=9 page=0 chnl=15 +char id=126 x=11 y=106 width=16 height=4 xoffset=0 yoffset=14 xadvance=16 page=0 chnl=15 +kernings count=91 +kerning first=32 second=65 amount=-2 +kerning first=32 second=84 amount=-1 +kerning first=32 second=89 amount=-1 +kerning first=121 second=46 amount=-2 +kerning first=121 second=44 amount=-2 +kerning first=119 second=46 amount=-2 +kerning first=119 second=44 amount=-2 +kerning first=118 second=46 amount=-2 +kerning first=118 second=44 amount=-2 +kerning first=114 second=46 amount=-2 +kerning first=49 second=49 amount=-2 +kerning first=65 second=32 amount=-2 +kerning first=65 second=84 amount=-2 +kerning first=65 second=86 amount=-2 +kerning first=65 second=87 amount=-1 +kerning first=65 second=89 amount=-2 +kerning first=65 second=118 amount=-1 +kerning first=65 second=119 amount=-1 +kerning first=65 second=121 amount=-1 +kerning first=114 second=44 amount=-2 +kerning first=70 second=44 amount=-3 +kerning first=70 second=46 amount=-3 +kerning first=70 second=65 amount=-2 +kerning first=76 second=32 amount=-1 +kerning first=76 second=84 amount=-2 +kerning first=76 second=86 amount=-2 +kerning first=76 second=87 amount=-2 +kerning first=76 second=89 amount=-2 +kerning first=76 second=121 amount=-1 +kerning first=102 second=102 amount=-1 +kerning first=80 second=32 amount=-1 +kerning first=80 second=44 amount=-4 +kerning first=80 second=46 amount=-4 +kerning first=80 second=65 amount=-2 +kerning first=82 second=84 amount=-1 +kerning first=82 second=86 amount=-1 +kerning first=82 second=87 amount=-1 +kerning first=82 second=89 amount=-1 +kerning first=84 second=32 amount=-1 +kerning first=84 second=44 amount=-3 +kerning first=84 second=45 amount=-2 +kerning first=84 second=46 amount=-3 +kerning first=84 second=58 amount=-3 +kerning first=89 second=118 amount=-2 +kerning first=84 second=65 amount=-2 +kerning first=84 second=79 amount=-1 +kerning first=84 second=97 amount=-3 +kerning first=84 second=99 amount=-3 +kerning first=84 second=101 amount=-3 +kerning first=84 second=105 amount=-1 +kerning first=84 second=111 amount=-3 +kerning first=84 second=114 amount=-1 +kerning first=84 second=115 amount=-3 +kerning first=84 second=117 amount=-1 +kerning first=84 second=119 amount=-2 +kerning first=84 second=121 amount=-2 +kerning first=86 second=44 amount=-3 +kerning first=86 second=45 amount=-2 +kerning first=86 second=46 amount=-3 +kerning first=86 second=58 amount=-1 +kerning first=89 second=117 amount=-2 +kerning first=86 second=65 amount=-2 +kerning first=86 second=97 amount=-2 +kerning first=86 second=101 amount=-2 +kerning first=86 second=105 amount=-1 +kerning first=86 second=111 amount=-2 +kerning first=86 second=114 amount=-1 +kerning first=86 second=117 amount=-1 +kerning first=86 second=121 amount=-1 +kerning first=87 second=44 amount=-2 +kerning first=87 second=45 amount=-1 +kerning first=87 second=46 amount=-2 +kerning first=87 second=58 amount=-1 +kerning first=89 second=113 amount=-3 +kerning first=87 second=65 amount=-1 +kerning first=87 second=97 amount=-1 +kerning first=87 second=101 amount=-1 +kerning first=89 second=112 amount=-2 +kerning first=87 second=111 amount=-1 +kerning first=87 second=114 amount=-1 +kerning first=87 second=117 amount=-1 +kerning first=89 second=111 amount=-3 +kerning first=89 second=32 amount=-1 +kerning first=89 second=44 amount=-4 +kerning first=89 second=45 amount=-3 +kerning first=89 second=46 amount=-4 +kerning first=89 second=58 amount=-2 +kerning first=89 second=105 amount=-1 +kerning first=89 second=65 amount=-2 +kerning first=89 second=97 amount=-2 +kerning first=89 second=101 amount=-3 diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/anscii_0.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/anscii_0.png new file mode 100644 index 00000000..7fb41bd6 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/anscii_0.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/arrow_topface.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/arrow_topface.data new file mode 100644 index 00000000..196ce022 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/arrow_topface.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/bktile.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/bktile.data new file mode 100644 index 00000000..6fdf33bd Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/bktile.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/bktile_n.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/bktile_n.data new file mode 100644 index 00000000..e2440435 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/bktile_n.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/building.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/building.data new file mode 100644 index 00000000..28530a86 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/building.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_1_16_1560339683.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_1_16_1560339683.data new file mode 100644 index 00000000..3244f35a Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_1_16_1560339683.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_1_17_1598583696.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_1_17_1598583696.data new file mode 100644 index 00000000..d0e28838 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_1_17_1598583696.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_2_16_1560339691.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_2_16_1560339691.data new file mode 100644 index 00000000..572068a9 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_2_16_1560339691.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_2_17_1594715854.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_2_17_1594715854.data new file mode 100644 index 00000000..e19cee2c Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/config_2_17_1594715854.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/crossing_day_bk.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/crossing_day_bk.data new file mode 100644 index 00000000..fff1b61e Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/crossing_day_bk.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/crossing_nigth_bk.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/crossing_nigth_bk.data new file mode 100644 index 00000000..928155e9 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/crossing_nigth_bk.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash.data new file mode 100644 index 00000000..da1b48fb Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash_cd.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash_cd.data new file mode 100644 index 00000000..3a590327 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash_cd.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash_tq.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash_tq.data new file mode 100644 index 00000000..c721927f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/dash_tq.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons-for_custom_5_14.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons-for_custom_5_14.data new file mode 100644 index 00000000..27bd2723 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons-for_custom_5_14.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_10_17_1597738891.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_10_17_1597738891.data new file mode 100644 index 00000000..4a4ffb1c Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_10_17_1597738891.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_1_16_1561444603.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_1_16_1561444603.data new file mode 100755 index 00000000..6e16ce13 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_1_16_1561444603.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_1_17_1597895142.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_1_17_1597895142.data new file mode 100644 index 00000000..3319a0af Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_1_17_1597895142.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_25_16_1560344307.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_25_16_1560344307.data new file mode 100644 index 00000000..aab2d3a2 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_25_16_1560344307.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_2_16_1560344131.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_2_16_1560344131.data new file mode 100755 index 00000000..1a3740a4 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_2_16_1560344131.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_2_17_1597738874.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_2_17_1597738874.data new file mode 100644 index 00000000..234fdb2b Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_2_17_1597738874.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_3_16_1560517561.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_3_16_1560517561.data new file mode 100755 index 00000000..a8d0e1ce Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_3_16_1560517561.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_3_17_1597738877.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_3_17_1597738877.data new file mode 100644 index 00000000..7d5514fe Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_3_17_1597738877.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_40_17_1597739013.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_40_17_1597739013.data new file mode 100644 index 00000000..13904077 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_40_17_1597739013.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_4_16_1560344142.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_4_16_1560344142.data new file mode 100755 index 00000000..3d4dffc7 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_4_16_1560344142.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_4_17_1594719480.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_4_17_1594719480.data new file mode 100644 index 00000000..501415b5 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_4_17_1594719480.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_50_16_1541648499.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_50_16_1541648499.data new file mode 100755 index 00000000..e8096878 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_50_16_1541648499.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_50_17_1594748499.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_50_17_1594748499.data new file mode 100644 index 00000000..a0c13dd8 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_50_17_1594748499.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_5_16_1561028345.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_5_16_1561028345.data new file mode 100644 index 00000000..f6a95b9c Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_5_16_1561028345.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_5_17_1597739000.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_5_17_1597739000.data new file mode 100644 index 00000000..c5f2b6e2 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_5_17_1597739000.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_6_16_1560344646.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_6_16_1560344646.data new file mode 100755 index 00000000..011b76b4 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_6_16_1560344646.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_6_17_1594719483.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_6_17_1594719483.data new file mode 100644 index 00000000..38ef84af Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_6_17_1594719483.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_7_16_1560344652.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_7_16_1560344652.data new file mode 100755 index 00000000..c252d88d Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_7_16_1560344652.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_8_16_1560344658.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_8_16_1560344658.data new file mode 100755 index 00000000..71c15da7 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_8_16_1560344658.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_9_16_1560344664.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_9_16_1560344664.data new file mode 100755 index 00000000..232f62d7 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/icons_9_16_1560344664.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/lineround.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/lineround.data new file mode 100644 index 00000000..0231b37d Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/lineround.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_1_16_1560563265.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_1_16_1560563265.data new file mode 100644 index 00000000..3ff00be9 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_1_16_1560563265.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_1_17_1594760814.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_1_17_1594760814.data new file mode 100644 index 00000000..1b66ec4e Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_1_17_1594760814.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_2_16_1560563265.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_2_16_1560563265.data new file mode 100644 index 00000000..f5e481ae Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_2_16_1560563265.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_2_17_1594770801.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_2_17_1594770801.data new file mode 100644 index 00000000..2b20a0db Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/mapprofile_2_17_1594770801.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/roadarrow.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/roadarrow.data new file mode 100644 index 00000000..915091c6 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/roadarrow.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/search_scenic_icon.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/search_scenic_icon.data new file mode 100644 index 00000000..d103f2f9 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/search_scenic_icon.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style-for-custom_0_17_1594719935.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style-for-custom_0_17_1594719935.data new file mode 100644 index 00000000..2c9b09e3 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style-for-custom_0_17_1594719935.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style-for_custom_0_16_1561381751.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style-for_custom_0_16_1561381751.data new file mode 100644 index 00000000..2d1fd63c Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style-for_custom_0_16_1561381751.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_0_16_1561381751.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_0_16_1561381751.data new file mode 100644 index 00000000..951597f9 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_0_16_1561381751.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_0_17_1594719935.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_0_17_1594719935.data new file mode 100644 index 00000000..f409259a Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_0_17_1594719935.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_100_16_1561026477.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_100_16_1561026477.data new file mode 100644 index 00000000..b647d7ae Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_100_16_1561026477.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_100_17_1597738792.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_100_17_1597738792.data new file mode 100644 index 00000000..84d90091 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_100_17_1597738792.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_101_17_1594715411.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_101_17_1594715411.data new file mode 100644 index 00000000..7c58cf85 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_101_17_1594715411.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_17_16_1561023816.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_17_16_1561023816.data new file mode 100644 index 00000000..190082ba Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_17_16_1561023816.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_17_17_1594715345.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_17_17_1594715345.data new file mode 100644 index 00000000..680f2c8f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_17_17_1594715345.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_18_17_1598951705.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_18_17_1598951705.data new file mode 100644 index 00000000..7b08e976 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_18_17_1598951705.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_1_16_1562032355.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_1_16_1562032355.data new file mode 100644 index 00000000..9a2e4b86 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_1_16_1562032355.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_1_17_1598932719.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_1_17_1598932719.data new file mode 100644 index 00000000..76829e26 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_1_17_1598932719.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_3_16_1561987623.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_3_16_1561987623.data new file mode 100644 index 00000000..6ca2b215 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_3_16_1561987623.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_3_17_1596079144.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_3_17_1596079144.data new file mode 100644 index 00000000..4ec6330d Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_3_17_1596079144.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_4_16_1561711243.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_4_16_1561711243.data new file mode 100644 index 00000000..0f08fd44 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_4_16_1561711243.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_4_17_1598940176.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_4_17_1598940176.data new file mode 100644 index 00000000..07577777 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_4_17_1598940176.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_50_16_1501671321.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_50_16_1501671321.data new file mode 100644 index 00000000..71a8bb2a Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_50_16_1501671321.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_50_17_1594771321.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_50_17_1594771321.data new file mode 100644 index 00000000..71a8bb2a Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_50_17_1594771321.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_5_16_1561711250.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_5_16_1561711250.data new file mode 100644 index 00000000..a875e010 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_5_16_1561711250.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_5_17_1598940139.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_5_17_1598940139.data new file mode 100644 index 00000000..ded21ed4 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_5_17_1598940139.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_6_16_1562032423.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_6_16_1562032423.data new file mode 100644 index 00000000..293161b3 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_6_16_1562032423.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_6_17_1598951684.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_6_17_1598951684.data new file mode 100644 index 00000000..727e7d9a Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/style_6_17_1598951684.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/styleiconslist.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/styleiconslist.data new file mode 100644 index 00000000..193916b2 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/styleiconslist.data @@ -0,0 +1,34 @@ +33 +config_1_17_1598583696.data +config_2_17_1594715854.data +icons_10_17_1597738891.data +icons_1_17_1597895142.data +icons_24_17_1597738974.data +icons_25_17_1597739007.data +icons_2_17_1597738874.data +icons_3_17_1597738877.data +icons_40_17_1597739013.data +icons_41_17_1598535255.data +icons_4_17_1594719480.data +icons_50_17_1594748499.data +icons_5_17_1597739000.data +icons_6_17_1594719483.data +mapprofile_1_17_1594760814.data +mapprofile_2_17_1594770801.data +style_0_17_1594719935.data +style_100_17_1597738792.data +style_101_17_1594715411.data +style_16_17_1594715308.data +style_17_17_1594715345.data +style_18_17_1598951705.data +style_19_17_1594715322.data +style_1_17_1598932719.data +style_25_17_1596520587.data +style_26_17_1594715203.data +style_29_17_1594715223.data +style_3_17_1596079144.data +style_4_17_1598940176.data +style_50_17_1594771321.data +style_5_17_1598940139.data +style_6_17_1598951684.data +style_8_17_1598951648.data diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_allinone.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_allinone.data new file mode 100644 index 00000000..67772247 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_allinone.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_blind_allinone.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_blind_allinone.data new file mode 100644 index 00000000..53ea9b33 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_blind_allinone.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_l_allinone.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_l_allinone.data new file mode 100644 index 00000000..b74a4028 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_l_allinone.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_n_allinone.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_n_allinone.data new file mode 100644 index 00000000..272e10bc Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc3d_n_allinone.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_allinone.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_allinone.data new file mode 100644 index 00000000..22cc8556 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_allinone.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_blind_allinone.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_blind_allinone.data new file mode 100644 index 00000000..cccf2688 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_blind_allinone.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_l_allinone.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_l_allinone.data new file mode 100644 index 00000000..4b924197 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_l_allinone.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_n_allinone.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_n_allinone.data new file mode 100644 index 00000000..5726855a Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/tmc_n_allinone.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/waterline.data b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/waterline.data new file mode 100644 index 00000000..96f117db Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/waterline.data differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/fog.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/fog.png new file mode 100644 index 00000000..35473042 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/fog.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/haze.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/haze.png new file mode 100644 index 00000000..e24725a8 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/haze.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/rain.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/rain.png new file mode 100644 index 00000000..a8a065bb Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/rain.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/rainmask.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/rainmask.png new file mode 100644 index 00000000..d569c730 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/rainmask.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/shanbai.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/shanbai.png new file mode 100644 index 00000000..b3ecc3f0 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/shanbai.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/shandianyun.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/shandianyun.png new file mode 100644 index 00000000..af6f8ef5 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/shandianyun.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snow.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snow.png new file mode 100644 index 00000000..984abebe Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snow.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snow_far.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snow_far.png new file mode 100644 index 00000000..608b8248 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snow_far.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snowmask.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snowmask.png new file mode 100644 index 00000000..ff7eb0da Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/snowmask.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/yunhou.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/yunhou.png new file mode 100644 index 00000000..6486b261 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/yunhou.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/yunqian.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/yunqian.png new file mode 100644 index 00000000..12d47f93 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/AMap3D.bundle/weather/yunqian.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/GNaviConfig.xml b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/GNaviConfig.xml new file mode 100755 index 00000000..28b2624e --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/GNaviConfig.xml @@ -0,0 +1,9 @@ + + + + ./data/ + ./diff/ + ./res780/ + ./log/ + + diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_inner.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_inner.png new file mode 100644 index 00000000..11a0b1ab Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_inner.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_outer.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_outer.png new file mode 100644 index 00000000..f2b40cb9 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_outer.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_shadow.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_shadow.png new file mode 100644 index 00000000..e531d683 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_3d_shadow.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_inner.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_inner.png new file mode 100644 index 00000000..6c3e709f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_inner.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_outer.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_outer.png new file mode 100644 index 00000000..26ddb2c5 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/arrow_line_outer.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/calloutArrowMask.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/calloutArrowMask.png new file mode 100644 index 00000000..a89c653e Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/calloutArrowMask.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/calloutArrowMask@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/calloutArrowMask@2x.png new file mode 100644 index 00000000..f3e2cf23 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/calloutArrowMask@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin.png new file mode 100644 index 00000000..20d04246 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin@2x.png new file mode 100644 index 00000000..54d04604 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin@3x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin@3x.png new file mode 100644 index 00000000..cd5c6a31 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin@3x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift.png new file mode 100644 index 00000000..48f5c1ba Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift@2x.png new file mode 100644 index 00000000..20d15d7b Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift@3x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift@3x.png new file mode 100644 index 00000000..f2598b75 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/greenPin_lift@3x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineDashTexture.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineDashTexture.png new file mode 100644 index 00000000..20c7df8f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineDashTexture.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineDashTextureDot.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineDashTextureDot.png new file mode 100644 index 00000000..1092c26b Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineDashTextureDot.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineTexture.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineTexture.png new file mode 100644 index 00000000..a3d7e71d Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineTexture.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineTextureThin.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineTextureThin.png new file mode 100644 index 00000000..47553620 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/lineTextureThin.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/marker_blue.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/marker_blue.png new file mode 100644 index 00000000..63686150 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/marker_blue.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/marker_blue@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/marker_blue@2x.png new file mode 100644 index 00000000..ddb06df8 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/marker_blue@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_clear@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_clear@2x.png new file mode 100644 index 00000000..aed36590 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_clear@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_down@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_down@2x.png new file mode 100644 index 00000000..b950a2fe Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_down@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_shouqi@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_shouqi@2x.png new file mode 100755 index 00000000..9ac82af3 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_shouqi@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_shouqi_2@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_shouqi_2@2x.png new file mode 100644 index 00000000..b00a79bc Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_shouqi_2@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_sousuo@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_sousuo@2x.png new file mode 100644 index 00000000..23eed114 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_sousuo@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_zhankai@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_zhankai@2x.png new file mode 100644 index 00000000..00566746 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_zhankai@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_zhankai_2@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_zhankai_2@2x.png new file mode 100644 index 00000000..86ce2478 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/offline_zhankai_2@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_fog.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_fog.png new file mode 100644 index 00000000..f1aa1e77 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_fog.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_haze.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_haze.png new file mode 100644 index 00000000..e24725a8 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_haze.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_rain.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_rain.png new file mode 100644 index 00000000..bcb304be Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_rain.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_snow.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_snow.png new file mode 100644 index 00000000..984abebe Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_snow.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_sun_0.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_sun_0.png new file mode 100644 index 00000000..8ffaeead Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_sun_0.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_sun_1.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_sun_1.png new file mode 100644 index 00000000..b57761e4 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/particle_sun_1.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow.png new file mode 100644 index 00000000..4f85ff13 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow@2x.png new file mode 100644 index 00000000..8acfc67a Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow@3x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow@3x.png new file mode 100644 index 00000000..fc166589 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/pin_shadow@3x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin.png new file mode 100644 index 00000000..ffe3892d Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin@2x.png new file mode 100644 index 00000000..4a08cf2f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin@3x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin@3x.png new file mode 100644 index 00000000..2f92d11c Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin@3x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift.png new file mode 100644 index 00000000..bf1f8f4b Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift@2x.png new file mode 100644 index 00000000..ef2b2a6c Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift@3x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift@3x.png new file mode 100644 index 00000000..d58f14fb Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/purplePin_lift@3x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin.png new file mode 100644 index 00000000..1cf47446 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin@2x.png new file mode 100644 index 00000000..08822721 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin@3x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin@3x.png new file mode 100644 index 00000000..2a66034a Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin@3x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift.png new file mode 100644 index 00000000..24c4b9a6 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift@2x.png new file mode 100644 index 00000000..cfee8aa2 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift@3x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift@3x.png new file mode 100644 index 00000000..5d90fa38 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/redPin_lift@3x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_.png new file mode 100644 index 00000000..5889ed2f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_@2x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_@2x.png new file mode 100644 index 00000000..5889ed2f Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_@2x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_@3x.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_@3x.png new file mode 100644 index 00000000..dd955cd5 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/select_@3x.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_blue.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_blue.png new file mode 100644 index 00000000..c54767ed Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_blue.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_darkred.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_darkred.png new file mode 100644 index 00000000..7935f1a0 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_darkred.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_gray.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_gray.png new file mode 100644 index 00000000..2a368422 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_gray.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_green.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_green.png new file mode 100644 index 00000000..1cad28c2 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_green.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_red.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_red.png new file mode 100644 index 00000000..fccb8983 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_red.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_yellow.png b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_yellow.png new file mode 100644 index 00000000..b222b87e Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/images/traffic_texture_yellow.png differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/offline/offlinePackage.plist b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/offline/offlinePackage.plist new file mode 100644 index 00000000..786118a1 Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/offline/offlinePackage.plist differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/res.ck b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/res.ck new file mode 100644 index 00000000..740c2463 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/res.ck @@ -0,0 +1 @@ +4e1c13d45bd20d929cf9fdfdaab52e59 diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/res.zip b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/res.zip new file mode 100644 index 00000000..7a9854dc Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/AMap.bundle/res.zip differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnimatedAnnotation.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnimatedAnnotation.h new file mode 100644 index 00000000..364c20db --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnimatedAnnotation.h @@ -0,0 +1,60 @@ +// +// MAAnimatedAnnotation.h +// MAMapKit +// +// Created by shaobin on 16/12/8. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import "MAPointAnnotation.h" +#import "MAAnnotationMoveAnimation.h" + +///支持动画效果的点标注 +@interface MAAnimatedAnnotation : MAPointAnnotation + +///移动方向. since 4.5.0 +@property (nonatomic, assign) CLLocationDirection movingDirection; + +/** + @brief 添加移动动画, 第一个添加的动画以当前coordinate为起始点，沿传入的coordinates点移动，否则以上一个动画终点为起始点. since 4.5.0 + @param coordinates c数组，由调用者负责coordinates指向内存的管理 + @param count coordinates数组大小 + @param duration 动画时长，0或<0为无动画 + @param name 名字，如不指定可传nil + @param completeCallback 动画完成回调，isFinished: 动画是否执行完成 + */ +- (MAAnnotationMoveAnimation *)addMoveAnimationWithKeyCoordinates:(CLLocationCoordinate2D *)coordinates + count:(NSUInteger)count + withDuration:(CGFloat)duration + withName:(NSString *)name + completeCallback:(void(^)(BOOL isFinished))completeCallback; + +/** + @brief 添加移动动画, 第一个添加的动画以当前coordinate为起始点，沿传入的coordinates点移动，否则以上一个动画终点为起始点. since 5.4.0 + @param coordinates c数组，由调用者负责coordinates指向内存的管理 + @param count coordinates数组大小 + @param duration 动画时长，0或<0为无动画 + @param name 名字，如不指定可传nil + @param completeCallback 动画完成回调，isFinished: 动画是否执行完成 + @param stepCallback 动画每一帧回调 + */ +- (MAAnnotationMoveAnimation *)addMoveAnimationWithKeyCoordinates:(CLLocationCoordinate2D *)coordinates + count:(NSUInteger)count + withDuration:(CGFloat)duration + withName:(NSString *)name + completeCallback:(void(^)(BOOL isFinished))completeCallback + stepCallback:(void(^)(MAAnnotationMoveAnimation* currentAni))stepCallback; + +/** + * @brief 获取所有未完成的移动动画, 返回数组内为MAAnnotationMoveAnimation对象. since 4.5.0 + * @return 返回所有移动动画，数组内元素类型为 MAAnnotationMoveAnimation + */ +- (NSArray *)allMoveAnimations; + +/** + * @brief 设置需要开始动画，自定义其他类型动画时需要调用. since 6.0.0 + */ +- (void)setNeedsStart; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotation.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotation.h new file mode 100755 index 00000000..712aa0f1 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotation.h @@ -0,0 +1,69 @@ +// +// MAAnnotation.h +// MAMapKit +// +// Created by yin cai on 11-12-13. +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import +#import +#import "MAGeometry.h" + +///该类为标注点的protocol，提供了标注类的基本信息函数 +@protocol MAAnnotation + +///标注view中心坐标 +@property (nonatomic, readonly) CLLocationCoordinate2D coordinate; + +@optional + +///annotation标题 +@property (nonatomic, copy) NSString *title; + +///annotation副标题 +@property (nonatomic, copy) NSString *subtitle; + +/** + * @brief 设置标注的坐标，在拖拽时会被调用. + * @param newCoordinate 新的坐标值 + */ +- (void)setCoordinate:(CLLocationCoordinate2D)newCoordinate; + +@end + +/** + * 支持动画需要实现的协议. since 4.5.0 + */ +@protocol MAAnimatableAnnotation + +@required +/** + * @brief 动画帧更新回调接口，实现者可在内部做更新处理，如更新coordinate. （since 4.5.0） + * @param timeDelta 时间步长，单位秒 + */ +- (void)step:(CGFloat)timeDelta; + +/** + * @brief 动画是否已完成. 通过此方法判断是否需要将动画annotation移出渲染执行过程。（since 4.5.0） + * @return YES动画已完成，NO没有完成 + */ +- (BOOL)isAnimationFinished; + +/** + * @brief 动画是否可以开始. 通过此方法判断是否需要将动画annotation加入渲染过程，已经start且尚未finish的动画标注才会调用step方法。（since 6.0.0） + * @return YES 可以开始，NO 尚未开始。 + */ +- (BOOL)shouldAnimationStart; + +@optional +/** + * @brief 动画更新时调用此接口，获取annotationView的旋转角度，不实现默认为0. （since 4.5.0） + * @return 当前annotation的旋转角度 + */ +- (CLLocationDirection)rotateDegree; + + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotationMoveAnimation.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotationMoveAnimation.h new file mode 100644 index 00000000..b039d7b5 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotationMoveAnimation.h @@ -0,0 +1,65 @@ +// +// MAAnnotationMoveAnimation.h +// MAMapKit +// +// Created by shaobin on 16/11/21. +// Copyright © 2016 Amap. All rights reserved. +// + + +#import "MAConfig.h" +#import +#import "MAAnnotation.h" + +///annotation移动动画. since 4.5.0 +@interface MAAnnotationMoveAnimation : NSObject + +/** + * @brief 获取动画名字 + * @return 添加动画时传入的名字 + */ +- (NSString *)name; + +/** + * @brief 获取经纬度坐标点数组 + * @return 返回经纬度坐标点数组 + */ +- (CLLocationCoordinate2D *)coordinates; + +/** + * @brief 获取coordinates数组内坐标点个数 + * @return coordinates数组内坐标点个数 + */ +- (NSUInteger)count; + +/** + * @brief 获取动画时长 + * @return 动画时长 + */ +- (CGFloat)duration; + +/** + * @brief 获取动画已执行的时长 + * @return 动画已执行的时长 + */ +- (CGFloat)elapsedTime; + +/** + * @brief 取消 + */ +- (void)cancel; + +/** + * @brief 是否已取消 + * @return YES已取消，NO未取消 + */ +- (BOOL)isCancelled; + +/** + * @brief 获取当前动画已走过点的总个数 + * @return 个数 + */ +- (NSInteger)passedPointCount; + + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotationView.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotationView.h new file mode 100644 index 00000000..4ef3f533 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAAnnotationView.h @@ -0,0 +1,106 @@ +// +// MAAnnotationView.h +// MAMapKitDemo +// +// Created by songjian on 13-1-7. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MACustomCalloutView.h" + +///MAAnnotationView拖动状态 +typedef NS_ENUM(NSInteger, MAAnnotationViewDragState) +{ + MAAnnotationViewDragStateNone = 0, ///< 静止状态 + MAAnnotationViewDragStateStarting, ///< 开始拖动 + MAAnnotationViewDragStateDragging, ///< 拖动中 + MAAnnotationViewDragStateCanceling, ///< 取消拖动 + MAAnnotationViewDragStateEnding ///< 拖动结束 +}; + +@protocol MAAnnotation; + +///标注view +@interface MAAnnotationView : UIView + +///复用标识 +@property (nonatomic, readonly, copy) NSString *reuseIdentifier; + +///z值，大值在上，默认为0。类似CALayer的zPosition。zIndex属性只有在viewForAnnotation或者didAddAnnotationViews回调中设置有效。 +@property (nonatomic, assign) NSInteger zIndex; + +///关联的annotation +@property (nonatomic, strong) id annotation; + +///显示的image +@property (nonatomic, strong) UIImage *image; + +///image所对应的UIImageView since 5.0.0 +@property (nonatomic, strong, readonly) UIImageView *imageView; + +///自定制弹出框view, 用于替换默认弹出框. 注意:此弹出框不会触发-(void)mapView: didAnnotationViewCalloutTapped: since 5.0.0 +@property (nonatomic, strong) MACustomCalloutView *customCalloutView; + +///annotationView的中心默认位于annotation的坐标位置，可以设置centerOffset改变view的位置，正的偏移使view朝右下方移动，负的朝左上方，单位是屏幕坐标 +@property (nonatomic) CGPoint centerOffset; + +///弹出框默认位于view正中上方，可以设置calloutOffset改变view的位置，正的偏移使view朝右下方移动，负的朝左上方，单位是屏幕坐标 +@property (nonatomic) CGPoint calloutOffset; + +///默认为YES,当为NO时view忽略触摸事件 +@property (nonatomic, getter=isEnabled) BOOL enabled; + +///是否高亮 +@property (nonatomic, getter=isHighlighted) BOOL highlighted; + +///设置是否处于选中状态, 外部如果要选中请使用mapView的selectAnnotation方法 +@property (nonatomic, getter=isSelected) BOOL selected; + +///是否允许弹出callout +@property (nonatomic) BOOL canShowCallout; + +///显示在默认弹出框左侧的view +@property (nonatomic, strong) UIView *leftCalloutAccessoryView; + +///显示在默认弹出框右侧的view +@property (nonatomic, strong) UIView *rightCalloutAccessoryView; + +///是否支持拖动 +@property (nonatomic, getter=isDraggable) BOOL draggable; + +///当前view的拖动状态 +@property (nonatomic) MAAnnotationViewDragState dragState; + +///弹出默认弹出框时，是否允许地图调整到合适位置来显示弹出框，默认为YES +@property (nonatomic) BOOL canAdjustPositon; + +/** + * @brief 设置是否处于选中状态, 外部如果要选中请使用mapView的selectAnnotation方法 + * @param selected 是否选中 + * @param animated 是否使用动画效果 + */ +- (void)setSelected:(BOOL)selected animated:(BOOL)animated; + +/** + * @brief 初始化并返回一个annotation view + * @param annotation 关联的annotation对象 + * @param reuseIdentifier 如果要重用view,传入一个字符串,否则设为nil,建议重用view + * @return 初始化成功则返回annotation view,否则返回nil + */ +- (id)initWithAnnotation:(id )annotation reuseIdentifier:(NSString *)reuseIdentifier; + +/** + * @brief 当从reuse队列里取出时被调用, 子类重新必须调用super + */ +- (void)prepareForReuse; + +/** + * @brief 设置view的拖动状态 + * @param newDragState 新的拖动状态 + * @param animated 是否使用动画动画 + */ +- (void)setDragState:(MAAnnotationViewDragState)newDragState animated:(BOOL)animated; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAArc.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAArc.h new file mode 100644 index 00000000..6b879c73 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAArc.h @@ -0,0 +1,43 @@ +// +// MAArc.h +// MAMapKit +// +// Created by liubo on 2018/4/10. +// Copyright © 2018年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_ARC + +#import "MAShape.h" +#import "MAOverlay.h" + +///该类用于定义一个圆弧, 通常MAArc是MAArcRenderer的model +@interface MAArc : MAShape + +///起点经纬度坐标，无效坐标按照{0，0}处理 +@property (nonatomic, assign) CLLocationCoordinate2D startCoordinate; + +///途径点经纬度坐标，无效坐标按照{0，0}处理 +@property (nonatomic, assign) CLLocationCoordinate2D passedCoordinate; + +///终点经纬度坐标，无效坐标按照{0，0}处理 +@property (nonatomic, assign) CLLocationCoordinate2D endCoordinate; + +///该圆弧的外接MapRect +@property (nonatomic, readonly) MAMapRect boundingMapRect; + +/** + * @brief 根据起点、途经点和终点生成圆弧 + * @param startCoordinate 起点的经纬度坐标，无效坐标按照{0，0}处理 + * @param passedCoordinate 途径点的经纬度坐标，无效坐标按照{0，0}处理 + * @param endCoordinate 终点的经纬度坐标，无效坐标按照{0，0}处理 + * @return 新生成的圆弧 + */ ++ (instancetype)arcWithStartCoordinate:(CLLocationCoordinate2D)startCoordinate + passedCoordinate:(CLLocationCoordinate2D)passedCoordinate + endCoordinate:(CLLocationCoordinate2D)endCoordinate; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAArcRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAArcRenderer.h new file mode 100644 index 00000000..2e10db4d --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAArcRenderer.h @@ -0,0 +1,30 @@ +// +// MAArcRenderer.h +// MAMapKit +// +// Created by liubo on 2018/4/10. +// Copyright © 2018年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_ARC + +#import "MAArc.h" +#import "MAOverlayPathRenderer.h" + +///此类用于绘制MAArc,可以通过MAOverlayPathRenderer修改其stroke attributes +@interface MAArcRenderer : MAOverlayPathRenderer + +///关联的MAArc model +@property (nonatomic, readonly) MAArc *arc; + +/** + * @brief 根据指定的MAArc生成一个圆弧Renderer + * @param arc 指定MAArc + * @return 新生成的圆弧Renderer + */ +- (instancetype)initWithArc:(MAArc *)arc; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACircle.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACircle.h new file mode 100755 index 00000000..6442c352 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACircle.h @@ -0,0 +1,55 @@ +// +// MACircle.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. + +#import "MAConfig.h" +#import "MAShape.h" +#import "MAOverlay.h" +#import "MAGeometry.h" + +///该类用于定义一个圆, 通常MACircle是MACircleView的model +@interface MACircle : MAShape { + @package + MAMapRect _boundingMapRect; +} + +///设置中空区域，用来创建中间带空洞的复杂图形。注意：传入的overlay只支持MAPolgon类型和MACircle类型,不支持与此circle边相交或在circle外部,不支持hollowShapes彼此间相交,和空洞顺序有关,不支持嵌套. since 5.5.0 +@property (nonatomic, strong) NSArray> *hollowShapes; + +///中心点经纬度坐标，无效坐标按照{0，0}处理 +@property (nonatomic, assign) CLLocationCoordinate2D coordinate; + +///半径，单位：米 负数按照0处理 +@property (nonatomic, assign) CLLocationDistance radius; + +///该圆的外接map rect +@property (nonatomic, readonly) MAMapRect boundingMapRect; + +/** + * @brief 根据中心点和半径生成圆 + * @param coord 中心点的经纬度坐标，无效坐标按照{0，0}处理 + * @param radius 半径，单位：米, 负数按照0处理 + * @return 新生成的圆 + */ ++ (instancetype)circleWithCenterCoordinate:(CLLocationCoordinate2D)coord + radius:(CLLocationDistance)radius; + +/** + * @brief 根据map rect生成圆 + * @param mapRect mapRect 圆的最小外界矩形 + * @return 新生成的圆 + */ ++ (instancetype)circleWithMapRect:(MAMapRect)mapRect; + +/** + * @brief 设置圆的中心点和半径. since 5.0.0 + * @param coord 中心点的经纬度坐标，无效坐标按照{0，0}处理 + * @param radius 半径，单位：米 负数按照0处理 + * @return 是否设置成功 + */ +- (BOOL)setCircleWithCenterCoordinate:(CLLocationCoordinate2D)coord radius:(CLLocationDistance)radius; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACircleRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACircleRenderer.h new file mode 100755 index 00000000..389026ef --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACircleRenderer.h @@ -0,0 +1,26 @@ +// +// MACircleRenderer.h +// MAMapKit +// +// Created by yin cai on 11-12-30. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import "MACircle.h" +#import "MAOverlayPathRenderer.h" + +///该类是MACircle的显示圆Renderer,可以通过MAOverlayPathRenderer修改其fill和stroke attributes +@interface MACircleRenderer : MAOverlayPathRenderer + +///关联的MAcirlce model +@property (nonatomic, readonly) MACircle *circle; + +/** + * @brief 根据指定圆生成对应的Renderer + * @param circle 指定的MACircle model + * @return 生成的Renderer + */ +- (instancetype)initWithCircle:(MACircle *)circle; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAConfig.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAConfig.h new file mode 100644 index 00000000..5c2fd231 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAConfig.h @@ -0,0 +1,89 @@ +// +// MAConfig.h +// MAMapKit +// +// Created by shaobin on 16/10/24. +// Copyright © 2016 Amap. All rights reserved. +// +// Public version + +#ifndef MAConfig_h +#define MAConfig_h + +#ifndef MA_INCLUDE_OFFLINE +#define MA_INCLUDE_OFFLINE 1 +#endif + +#ifndef MA_INCLUDE_TRACE_CORRECT +#define MA_INCLUDE_TRACE_CORRECT 1 +#endif + +#ifndef MA_INCLUDE_INDOOR +#define MA_INCLUDE_INDOOR 1 +#endif + +#ifndef MA_INCLUDE_CACHE +#define MA_INCLUDE_CACHE 1 +#endif + +#ifndef MA_INCLUDE_CUSTOM_MAP_STYLE +#define MA_INCLUDE_CUSTOM_MAP_STYLE 1 +#endif + +#ifndef MA_INCLUDE_WORLD_EN_MAP +#define MA_INCLUDE_WORLD_EN_MAP 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_TILE +#define MA_INCLUDE_OVERLAY_TILE 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_HEATMAP +#define MA_INCLUDE_OVERLAY_HEATMAP 1 +#endif + +#ifndef MA_INCLUDE_QUARDTREE +#define MA_INCLUDE_QUARDTREE 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_ARC +#define MA_INCLUDE_OVERLAY_ARC 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_CUSTOMBUILDING +#define MA_INCLUDE_OVERLAY_CUSTOMBUILDING 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_GROUND +#define MA_INCLUDE_OVERLAY_GROUND 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_GEODESIC +#define MA_INCLUDE_OVERLAY_GEODESIC 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_MAMultiPolyline +#define MA_INCLUDE_OVERLAY_MAMultiPolyline 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_MAMultiPoint +#define MA_INCLUDE_OVERLAY_MAMultiPoint 1 +#endif + +#ifndef MA_INCLUDE_OVERLAY_ParticleSystem +#define MA_INCLUDE_OVERLAY_ParticleSystem 1 +#endif + +#ifndef MA_INCLUDE_3DModel +#define MA_INCLUDE_3DModel 1 +#endif + +#ifndef MA_INCLUDE_OVERSEA +#define MA_INCLUDE_OVERSEA 0 +#endif + +#ifndef MA_ENABLE_ThirdPartyLog +#define MA_ENABLE_ThirdPartyLog 0 +#endif + +#endif /* MAConfig_h */ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomBuildingOverlay.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomBuildingOverlay.h new file mode 100644 index 00000000..3456235a --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomBuildingOverlay.h @@ -0,0 +1,80 @@ +// +// MACustomBuildingOverlay.h +// MAMapKit +// +// Created by liubo on 2018/5/23. +// Copyright © 2018年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_CUSTOMBUILDING + +#import "MAShape.h" +#import "MAOverlay.h" +#import "MAMultiPoint.h" + +#pragma mark - MACustomBuildingOverlayOption + +///该类用于定义一个楼块显示选项. since 6.3.0 +@interface MACustomBuildingOverlayOption : MAMultiPoint + +///楼块的高度. 修改该属性会使option范围内的所有楼块为同一个高度. (范围 (-1 U [1, 1000]). 默认-1,显示为默认高度.) +@property (nonatomic, assign) CGFloat height; + +///楼块的高度缩放比例. 修改该属性会使option范围内的所有楼块高度放大或者缩小heightScale倍. (默认1. 如果指定了height则此值将被忽略.) +@property (nonatomic, assign) CGFloat heightScale; + +///楼块的顶面颜色. (默认[UIColor lightGrayColor], 不支持透明度) +@property (nonatomic, strong) UIColor *topColor; + +///楼块的侧面颜色. (默认[UIColor darkGrayColor], 不支持透明度) +@property (nonatomic, strong) UIColor *sideColor; + +///option选项是否可见. (默认YES) +@property (nonatomic, assign) BOOL visibile; + +/** + * @brief 根据经纬度坐标数据生成楼块显示选项option + * @param coords 经纬度坐标点数据,coords对应的内存会拷贝,调用者负责该内存的释放 + * @param count 经纬度坐标点数组个数 + * @return 新生成的楼块显示选项option + */ ++ (instancetype)optionWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count; + +/** + * @brief 重新设置option范围. + * @param coords 指定的经纬度坐标点数组, C数组，内部会做copy，调用者负责内存管理 + * @param count 坐标点的个数 + * @return 是否设置成功 + */ +- (BOOL)setOptionWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count; + +@end + + +#pragma mark - MACustomBuildingOverlay + +///该类用于定义一个自定义楼块MACustomBuildingOverlay, 通常MACustomBuildingOverlay是MACustomBuildingOverlayRenderer的model.(注意: 自定义楼块仅支持在zoomLevel>=15级时显示) since 6.3.0 +@interface MACustomBuildingOverlay : MAShape + +///默认的楼块显示option, 将显示所有的楼块. (如果不需要显示所有的楼块,可以设置defaultOption.visibile = NO) +@property (nonatomic, readonly) MACustomBuildingOverlayOption *defaultOption; + +///当前自定义的楼块显示options. (options按添加顺序, 后添加的在最上层显示) +@property (nonatomic, readonly) NSArray *customOptions; + +/** + * @brief 增加自定义楼块显示的option + * @param option 要增加的自定义楼块显示option + */ +- (void)addCustomOption:(MACustomBuildingOverlayOption *)option; + +/** + * @brief 移除自定义楼块显示的option + * @param option 要移除的自定义楼块显示option + */ +- (void)removeCustomOption:(MACustomBuildingOverlayOption *)option; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomBuildingOverlayRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomBuildingOverlayRenderer.h new file mode 100644 index 00000000..194ee1ac --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomBuildingOverlayRenderer.h @@ -0,0 +1,29 @@ +// +// MACustomBuildingOverlayRenderer.h +// MAMapKit +// +// Created by liubo on 2018/5/23. +// Copyright © 2018年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_CUSTOMBUILDING + +#import "MAOverlayRenderer.h" +#import "MACustomBuildingOverlay.h" + +///该类是MACustomBuildingOverlay的显示Renderer. since 6.3.0 +@interface MACustomBuildingOverlayRenderer : MAOverlayRenderer + +///关联的MACustomBuildingOverlay model +@property (nonatomic, readonly) MACustomBuildingOverlay *customBuildingOverlay; + +/** + * @brief 根据指定MACustomBuildingOverlay生成对应的Renderer + * @param customBuildingOverlay 指定的MACustomBuildingOverlay model + * @return 生成的Renderer + */ +- (instancetype)initWithCustomBuildingOverlay:(MACustomBuildingOverlay *)customBuildingOverlay; + +@end +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomCalloutView.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomCalloutView.h new file mode 100644 index 00000000..17ebd2a5 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MACustomCalloutView.h @@ -0,0 +1,29 @@ +// +// MACustomCalloutView.h +// MAMapKit +// +// Created by shaobin on 17/1/6. +// Copyright © 2017年 Amap. All rights reserved. +// + +#import +#import "MAConfig.h" + +///自定义annotationView的弹出框. 注意:不会触发-(void)mapView: didAnnotationViewCalloutTapped: since 5.0.0 +@interface MACustomCalloutView : UIView + +///init时传入的customView since 5.0.0 +@property (nonatomic, strong, readonly) UIView *customView; + +///用户自定义数据，内部不做处理 since 5.0.0 +@property (nonatomic, strong) id userData; + +/** + * @brief 初始化并返回一个MACustomCalloutView since 5.0.0 + * @param customView 自定义View，不能为nil + * @return 初始化成功则返回MACustomCalloutView,否则返回nil + */ +- (id)initWithCustomView:(UIView *)customView; + + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGeodesicPolyline.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGeodesicPolyline.h new file mode 100644 index 00000000..7ee07c31 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGeodesicPolyline.h @@ -0,0 +1,51 @@ +// +// MAGeodesicPolyline.h +// MapKit_static +// +// Created by songjian on 13-10-23. +// Copyright © 2016 Amap. All rights reserved. + +#import "MAConfig.h" + +#if MA_INCLUDE_OVERLAY_GEODESIC + +#import "MAPolyline.h" + +///大地曲线 +@interface MAGeodesicPolyline : MAPolyline + +/** + * @brief 根据MAMapPoints生成大地曲线 + * @param points MAMapPoint点 + * @param count 点的个数 + * @return 生成的大地曲线 + */ ++ (instancetype)polylineWithPoints:(MAMapPoint *)points count:(NSUInteger)count; + +/** + * @brief 根据经纬度生成大地曲线 + * @param coords 经纬度 + * @param count 点的个数 + * @return 生成的大地曲线 + */ ++ (instancetype)polylineWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count; + +/** + * @brief 重新设置坐标点. since 5.0.0 + * @param points 指定的直角坐标点数组，C数组，内部会做copy，调用者负责内存管理。 + * @param count 坐标点的个数 + * @return 是否设置成功 + */ +- (BOOL)setPolylineWithPoints:(MAMapPoint *)points count:(NSInteger)count; + +/** + * @brief 重新设置坐标点. since 5.0.0 + * @param coords 指定的经纬度坐标点数组，C数组，内部会做copy，调用者负责内存管理 + * @param count 坐标点的个数 + * @return 是否设置成功 + */ +- (BOOL)setPolylineWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSInteger)count; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGeometry.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGeometry.h new file mode 100644 index 00000000..dc9fa406 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGeometry.h @@ -0,0 +1,490 @@ +// +// MAGeometry.h +// MAMapKit +// +// Created by AutoNavi. +// Copyright (c) 2013年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import +#import + + +#ifdef __cplusplus +extern "C" { +#endif + + ///东北、西南两个点定义的四边形经纬度范围 + typedef struct MACoordinateBounds{ + CLLocationCoordinate2D northEast; ///< 东北角经纬度 + CLLocationCoordinate2D southWest; ///< 西南角经纬度 + } MACoordinateBounds; + + ///经度、纬度定义的经纬度跨度范围 + typedef struct MACoordinateSpan{ + CLLocationDegrees latitudeDelta; ///< 纬度跨度 + CLLocationDegrees longitudeDelta; ///< 经度跨度 + } MACoordinateSpan; + + ///中心点、跨度范围定义的四边形经纬度范围 + typedef struct MACoordinateRegion{ + CLLocationCoordinate2D center; ///< 中心点经纬度 + MACoordinateSpan span; ///< 跨度范围 + } MACoordinateRegion; + + ///平面投影坐标结构定义 + typedef struct MAMapPoint{ + double x; /// +#import "MAShape.h" +#import "MAOverlay.h" + +///该类用于确定覆盖在地图上的图片，及其覆盖区域, 通常MAGroundOverlay是MAGroundOverlayRenderer的model +@interface MAGroundOverlay : MAShape + +///绘制在地图上的覆盖图片 +@property (nonatomic, readonly) UIImage *icon; + +///透明度. 最终透明度 = 纹理透明度 * alpha. 有效范围为[0.f, 1.f], 默认为1.f +@property (nonatomic, assign) CGFloat alpha; + +///覆盖图片在地图尺寸等同于其像素的zoom值 +@property (nonatomic, readonly) CGFloat zoomLevel; + +///图片在地图中的覆盖范围 +@property (nonatomic, readonly) MACoordinateBounds bounds; + +/** + * @brief 根据bounds值和icon生成GroundOverlay + * @param bounds 图片的在地图的覆盖范围 + * @param icon 覆盖图片 + * @return 以bounds和icon 新生成GroundOverlay + */ ++ (instancetype)groundOverlayWithBounds:(MACoordinateBounds)bounds + icon:(UIImage *)icon; + +/** + * @brief 根据coordinate,icon,zoomLevel生成GroundOverlay + * @param coordinate 图片的在地图上的中心点 + * @param zoomLevel 图片在地图尺寸等同于像素的zoom值 + * @param icon 覆盖图片 + * @return 以coordinate,icon,zoomLevel 新生成GroundOverlay + */ ++ (instancetype)groundOverlayWithCoordinate:(CLLocationCoordinate2D)coordinate + zoomLevel:(CGFloat)zoomLevel + icon:(UIImage *)icon; + +/** + * @brief 更新GroundOverlay. since 5.0.0 + * @param bounds 图片的在地图的覆盖范围 + * @param icon 覆盖图片 + * @return 返回是否成功 + */ +- (BOOL)setGroundOverlayWithBounds:(MACoordinateBounds)bounds icon:(UIImage *)icon; + +/** + * @brief 更新GroundOverlay, 内部会自动计算覆盖物大小，以满足zoomLevel下显示大小为icon大小. since 5.0.0 + * @param coordinate 图片在地图上的中心点 + * @param zoomLevel 图片在地图尺寸等同于像素的zoom值 + * @param icon 覆盖图片 + * @return 返回是否成功 + */ +- (BOOL)setGroundOverlayWithCoordinate:(CLLocationCoordinate2D)coordinate + zoomLevel:(CGFloat)zoomLevel + icon:(UIImage *)icon; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGroundOverlayRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGroundOverlayRenderer.h new file mode 100644 index 00000000..d47842fe --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAGroundOverlayRenderer.h @@ -0,0 +1,31 @@ +// +// MAGroundOverlayRenderer.h +// MapKit_static +// +// Created by Li Fei on 11/13/13. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#if MA_INCLUDE_OVERLAY_GROUND + +#import "MAOverlayRenderer.h" +#import "MAGroundOverlay.h" + +///此类是将MAGroundOverlay中的覆盖图片显示在地图上的renderer +@interface MAGroundOverlayRenderer : MAOverlayRenderer + +///具有覆盖图片，以及图片覆盖的区域 +@property (nonatomic ,readonly) MAGroundOverlay *groundOverlay; + +/** + * @brief 根据指定的GroundOverlay生成将图片显示在地图上Renderer + * @param groundOverlay 制定了覆盖图片，以及图片的覆盖区域的groundOverlay + * @return 以GroundOverlay新生成Renderer + */ +- (instancetype)initWithGroundOverlay:(MAGroundOverlay *)groundOverlay; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapTileOverlay.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapTileOverlay.h new file mode 100644 index 00000000..bb3aa5ac --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapTileOverlay.h @@ -0,0 +1,69 @@ +// +// MAHeatMapTileOverlay.h +// test2D +// +// Created by xiaoming han on 15/4/21. +// Copyright (c) 2015年 Amap. All rights reserved. +// + + + +#import "MAConfig.h" + +#if MA_INCLUDE_OVERLAY_HEATMAP + +#import "MATileOverlay.h" + +///热力图节点 +@interface MAHeatMapNode : NSObject + +///经纬度 +@property (nonatomic, assign) CLLocationCoordinate2D coordinate; + +///强度 +@property (nonatomic, assign) float intensity; + +@end + +///热力图渐变属性 +@interface MAHeatMapGradient : NSObject + +///颜色变化数组。 default [blue,green,red] +@property (nonatomic, readonly) NSArray *colors; + +///颜色变化起点，需为递增数组，区间为(0, 1)。default[@(0.2),@(0.5),@(0,9)] +@property (nonatomic, readonly) NSArray *startPoints; + +/** + * @brief 重新设置gradient的时候，需要执行 MATileOverlayRenderer 的 reloadData 方法重刷新渲染缓存。 + * @param colors 颜色 + * @param startPoints startPoints + * @return instance + */ +- (instancetype)initWithColor:(NSArray *)colors andWithStartPoints:(NSArray *)startPoints; + +@end + +///热力图tileOverlay +@interface MAHeatMapTileOverlay : MATileOverlay + +///MAHeatMapNode array +@property (nonatomic, strong) NSArray *data; + +///热力图半径，默认为12，范围:0-100 screen point +@property (nonatomic, assign) NSInteger radius; + +///透明度，默认为0.6，范围：0-1 +@property (nonatomic, assign) CGFloat opacity; + +///热力图梯度 +@property (nonatomic, strong) MAHeatMapGradient *gradient; + +///是否开启高清热力图，默认关闭 +@property (nonatomic, assign) BOOL allowRetinaAdapting; + +@end + +#endif + + diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapVectorOverlay.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapVectorOverlay.h new file mode 100644 index 00000000..8146cf2f --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapVectorOverlay.h @@ -0,0 +1,111 @@ +// +// MAHeatMapVectorOverlay.h +// MAMapKit +// +// Created by ldj on 2019/7/25. +// Copyright © 2019 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_HEATMAP + +#import "MAShape.h" +#import "MAOverlay.h" + +///热力图类型 +typedef NS_ENUM(NSInteger, MAHeatMapType) +{ + MAHeatMapTypeSquare = 1, ///< 网格热力图 + MAHeatMapTypeHoneycomb = 2 ///< 蜂窝热力图 +}; + +///单个点对象 +@interface MAHeatMapVectorNode : NSObject + +///经纬度 +@property (nonatomic, assign) CLLocationCoordinate2D coordinate; + +///权重 +@property (nonatomic, assign) float weight; + +@end + +///热力图展示节点（用以描述一个蜂窝或一个网格） +@interface MAHeatMapVectorItem : NSObject + +///中心点坐标 +@property (nonatomic, readonly) MAMapPoint center; + +///当前热力值，求和后的权重 +@property (nonatomic, readonly) float intensity; + +///落在此节点区域内的所有热力点的索引数组 +@property (nonatomic, readonly) NSArray *nodeIndices; + +@end + +///该类用于定义热力图属性. +@interface MAHeatMapVectorOverlayOptions : NSObject + +///热力图类型 (默认为蜂窝类型MAHeatMapTypeHoneycomb) +@property (nonatomic, assign) MAHeatMapType type; + +///option选项是否可见. (默认YES) +@property (nonatomic, assign) BOOL visible; + +///MAHeatMapVectorNode array +@property (nonatomic, strong) NSArray *inputNodes; + +/** + @verbatim + 节点的宽 单位：米 负数按照0处理 default 2000 + —— —— —— —— + 丨 丨 丨 丨 + 丨 丨 丨 丨 + —— —— —— —— + + 每个方框的宽就是 size（六边形同理） + 两个方框之间的间隔就是 gap （六边形同理） + @endverbatim + */ +@property (nonatomic, assign) CLLocationDistance size; + +///节点之间的间隔 单位：米 负数按照0处理。注意：改变gap可能会改变热力节点的计算，内部会用size+gap来计算热力，最终用size来画方框。 +@property (nonatomic, assign) CGFloat gap; + +///颜色变化数组。 注意：colors和startPoints两数组长度必须一致且不能为0， +@property (nonatomic, strong) NSArray *colors; + +///颜色变化起点，需为递增数组，区间为[0, 1]。 注意：colors和startPoints两数组长度必须一致且不能为0。例如：startPoints @[@(0), @(0.3),@(0.7)] 表示区间 [0,0.3)使用第一个颜色，区间[0.3,0.7)使用第二个颜色，区间[0.7,1]使用第三个颜色。注意：startPoints首位需设置成0，如果首位不是0，内部也会把首位当成0来处理。 +@property (nonatomic, strong) NSArray *startPoints; + +///透明度，取值范围[0,1] ，default为1不透明 +@property (nonatomic, assign) CGFloat opacity; + +///权重的最大值，default为0，表示不填，不填则取数组inputNodes中权重的最大值 +@property (nonatomic, assign) int maxIntensity; + +///最小显示级别 default 3 +@property (nonatomic, assign) CGFloat minZoom; + +///最大显示级别 default 20 +@property (nonatomic, assign) CGFloat maxZoom; + +@end + +///矢量热力图，支持类型详见MAHeatMapType +@interface MAHeatMapVectorOverlay : MAShape + +///热力图的配置属性 +@property (nonatomic, strong) MAHeatMapVectorOverlayOptions *option; + +/** + * @brief 根据配置属性option生成MAHeatMapVectorOverlay + * @param option 热力图配置属性option + * @return 新生成的热力图MAHeatMapVectorOverlay + */ ++ (instancetype)heatMapOverlayWithOption:(MAHeatMapVectorOverlayOptions *)option; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapVectorOverlayRender.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapVectorOverlayRender.h new file mode 100644 index 00000000..72a33f1b --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAHeatMapVectorOverlayRender.h @@ -0,0 +1,36 @@ +// +// MAHeatMapVectorOverlayRender.h +// MAMapKit +// +// Created by ldj on 2019/7/26. +// Copyright © 2019 Amap. All rights reserved. +// +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_HEATMAP + +#import "MAOverlayRenderer.h" +#import "MAHeatMapVectorOverlay.h" + +///矢量热力图绘制类 +@interface MAHeatMapVectorOverlayRender : MAOverlayRenderer + +///关联的MAHeatMapVectorOverlay +@property (nonatomic, readonly) MAHeatMapVectorOverlay *heatOverlay; + +/** + * @brief 根据指定的MAHeatMapVectorOverlay生成一个Renderer + * @param heatOverlay 指定MAHeatMapVectorOverlay + * @return 新生成的MAHeatMapVectorOverlayRender + */ +- (instancetype)initWithHeatOverlay:(MAHeatMapVectorOverlay *)heatOverlay; + + +/** + * @brief 根据经纬度获取对应的热力节点信息MAHeatMapVectorItem + * @param coordinate 经纬度 + */ +- (MAHeatMapVectorItem *)getHeatMapItem:(CLLocationCoordinate2D )coordinate; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAIndoorInfo.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAIndoorInfo.h new file mode 100644 index 00000000..d90f410d --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAIndoorInfo.h @@ -0,0 +1,49 @@ +// +// MAIndoorInfo.h +// MAMapKit +// +// Created by 翁乐 on 5/6/16. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#if MA_INCLUDE_INDOOR + +#import + +///室内楼层信息 +@interface MAIndoorFloorInfo : NSObject +///楼层名 +@property (nonatomic, readonly) NSString *floorName; +///楼层index +@property (nonatomic, readonly) int floorIndex; +///楼层别名 +@property (nonatomic, readonly) NSString *floorNona; +///是否属于停车场 +@property (nonatomic, readonly) BOOL isPark; +@end + +///室内图信息 +@interface MAIndoorInfo : NSObject +///室内地图中文名 +@property (nonatomic, readonly) NSString *cnName; +///室内地图英文名 +@property (nonatomic, readonly) NSString *enName; +///室内地图poiID +@property (nonatomic, readonly) NSString *poiID; +///建筑类型 +@property (nonatomic, readonly) NSString *buildingType; +///当前楼层index，和floorInfo内部的index相关 +@property (nonatomic, readonly) int activeFloorIndex; +///当前激活的楼层，只和floorInfo相关，与floorInfo内部元素的index无关 +@property (nonatomic, readonly) int activeFloorInfoIndex; +///由 MAIndoorFloorInfo 组成，可直接通过 activeFloorInfoIndex 取出当前楼层 +@property (nonatomic, readonly) NSArray *floorInfo; +///楼层数量 +@property (nonatomic, readonly) int numberOfFloor; +///停车场楼层数量 +@property (nonatomic, readonly) int numberOfParkFloor; +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MALineDrawType.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MALineDrawType.h new file mode 100644 index 00000000..f4a0ad89 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MALineDrawType.h @@ -0,0 +1,40 @@ +// +// MALineDrawType.h +// MapKit_static +// +// Created by yi chen on 14-7-30. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#ifndef MapKit_static_MALineDrawType_h +#define MapKit_static_MALineDrawType_h + +enum MALineJoinType +{ + kMALineJoinBevel, ///< 斜面连接点 + kMALineJoinMiter, ///< 斜接连接点 + kMALineJoinRound ///< 圆角连接点 +}; +typedef enum MALineJoinType MALineJoinType; + +enum MALineCapType +{ + kMALineCapButt, ///< 普通头 + kMALineCapSquare, ///< 扩展头 + kMALineCapArrow, ///< 箭头 + kMALineCapRound ///< 圆形头 +}; +typedef enum MALineCapType MALineCapType; + +///虚线类型 +enum MALineDashType +{ + kMALineDashTypeNone = 0, ///<不画虚线 + kMALineDashTypeSquare, ///<方块样式 + kMALineDashTypeDot, ///<圆点样式 +}; +typedef enum MALineDashType MALineDashType; + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapAccessibilityIdentifier.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapAccessibilityIdentifier.h new file mode 100644 index 00000000..43b5e096 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapAccessibilityIdentifier.h @@ -0,0 +1,27 @@ +// +// MAMapAccessibilityIdentifier.h +// MAMapKit +// +// Created by hanxiaoming on 17/1/9. +// Copyright © 2017年 Amap. All rights reserved. +// + +#ifndef MAMapAccessibilityIdentifier_h +#define MAMapAccessibilityIdentifier_h + +#define kMAAcceIdForMapView @"mamapview" +#define kMAAcceIdForRender @"marender" +#define kMAAcceIdForLogoView @"malogo" + +#define kMAAcceIdForAnnotationContainer @"maannotationcontainer" +#define kMAAcceIdForOverlayContainer @"maoverlaycontainer" +#define kMAAcceIdForAnnotationView @"maannotationview" +#define kMAAcceIdForCalloutView @"macalloutview" + +#define kMAAcceIdForUserLocationView @"mauserlocationview" + +#define kMAAcceIdForScaleView @"mascaleview" +#define kMAAcceIdForCompassView @"macompassview" +#define kMAAcceIdForIndoorView @"maindoorview" + +#endif /* MAMapAccessibilityIdentifier_h */ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapCustomStyleOptions.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapCustomStyleOptions.h new file mode 100644 index 00000000..7a648205 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapCustomStyleOptions.h @@ -0,0 +1,30 @@ +// +// MAMapCustomStyleOptions.h +// MAMapKit +// +// Created by ldj on 2018/11/27. +// Copyright © 2018 Amap. All rights reserved. +// + +#import + +@interface MAMapCustomStyleOptions : NSObject + +///自定义样式二进制 +@property (nonatomic, strong) NSData *styleData; + +///海外自定义样式文件路径 +@property (nonatomic, strong) NSString *styleDataOverseaPath; + +///设置地图自定义样式对应的styleID，从官网获取 +@property (nonatomic, strong) NSString *styleId; + +///设置自定义纹理文件二进制 +@property (nonatomic, strong) NSData *styleTextureData; + +///样式额外的配置，比如路况，背景颜色等 since 6.7.0 +@property (nonatomic, strong) NSData *styleExtraData; + + +@end + diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapKit.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapKit.h new file mode 100644 index 00000000..c1047f8d --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapKit.h @@ -0,0 +1,73 @@ +// +// MAMapKit.h +// MAMapKit +// +// Created by 翁乐 on 12/2/15. +// Copyright © 2015 Amap. All rights reserved. +// + +#import +#import + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import + +#import +#import + +#import +#import + +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import + +#import +#import +#import +#import +#import + diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapStatus.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapStatus.h new file mode 100644 index 00000000..6148564c --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapStatus.h @@ -0,0 +1,63 @@ +// +// MAMapStatus.h +// MapKit_static +// +// Created by yi chen on 1/27/15. +// Copyright © 2016 Amap. All rights reserved. +// + + + +#import "MAConfig.h" +#import +#import + +///地图状态对象 +@interface MAMapStatus : NSObject + +///地图的中心点，改变该值时，地图的比例尺级别不会发生变化 +@property (nonatomic) CLLocationCoordinate2D centerCoordinate; + +///缩放级别 +@property (nonatomic) CGFloat zoomLevel; + +///设置地图旋转角度(逆时针为正向), 单位度, [0,360) +@property (nonatomic) CGFloat rotationDegree; + +///设置地图相机角度(范围为[0.f, 45.f]) +@property (nonatomic) CGFloat cameraDegree; + +///地图的视图锚点。坐标系归一化，(0, 0)为MAMapView左上角，(1, 1)为右下角。默认为(0.5, 0.5)，即当前地图的视图中心 +@property (nonatomic) CGPoint screenAnchor; + +/** + * @brief 根据指定参数生成对应的status + * @param coordinate 地图的中心点，改变该值时，地图的比例尺级别不会发生变化 + * @param zoomLevel 缩放级别 + * @param rotationDegree 设置地图旋转角度(逆时针为正向) + * @param cameraDegree 设置地图相机角度(范围为[0.f, 45.f]) + * @param screenAnchor 地图的视图锚点。坐标系归一化，(0, 0)为MAMapView左上角，(1, 1)为右下角。默认为(0.5, 0.5)，即当前地图的视图中心 + * @return 生成的Status + */ ++ (instancetype)statusWithCenterCoordinate:(CLLocationCoordinate2D)coordinate + zoomLevel:(CGFloat)zoomLevel + rotationDegree:(CGFloat)rotationDegree + cameraDegree:(CGFloat)cameraDegree + screenAnchor:(CGPoint)screenAnchor; + +/** + * @brief 根据指定参数初始化对应的status + * @param coordinate 地图的中心点，改变该值时，地图的比例尺级别不会发生变化 + * @param zoomLevel 缩放级别 + * @param rotationDegree 设置地图旋转角度(逆时针为正向) + * @param cameraDegree 设置地图相机角度(范围为[0.f, 45.f]) + * @param screenAnchor 地图的视图锚点。坐标系归一化，(0, 0)为MAMapView左上角，(1, 1)为右下角。默认为(0.5, 0.5)，即当前地图的视图中心 + * @return 生成的Status + */ +- (id)initWithCenterCoordinate:(CLLocationCoordinate2D)coordinate + zoomLevel:(CGFloat)zoomLevel + rotationDegree:(CGFloat)rotationDegree + cameraDegree:(CGFloat)cameraDegree + screenAnchor:(CGPoint)screenAnchor; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapVersion.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapVersion.h new file mode 100644 index 00000000..3438caaf --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapVersion.h @@ -0,0 +1,27 @@ +// +// MAMapVersion.h +// MAMapKit +// +// Created by yi chen on 2/24/16. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import + +#ifndef MAMapVersion_h +#define MAMapVersion_h + +#define MAMapVersionNumber 70800 +#define MAMapMinRequiredFoundationVersion 10604 + +// 依赖库版本检测 +#if AMapFoundationVersionNumber < MAMapMinRequiredFoundationVersion +#error "The AMapFoundationKit version is less than minimum required, please update! Any questions please to visit http://lbs.amap.com" +#endif + +FOUNDATION_EXTERN NSString * const MAMapKitVersion; +FOUNDATION_EXTERN NSString * const MAMapKitName; + + +#endif /* MAMapVersion_h */ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapView.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapView.h new file mode 100644 index 00000000..9bd56498 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMapView.h @@ -0,0 +1,1055 @@ +// +// MAMapView.h +// MAMapKit +// +// Created by 翁乐 on 3/17/16. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import +#import "MAOverlay.h" +#import "MAOverlayRenderer.h" +#import "MAAnnotationView.h" +#import "MACircle.h" +#import "MAUserLocation.h" +#import "MAMapStatus.h" +#import "MAIndoorInfo.h" +#import "MAUserLocationRepresentation.h" +#import "MAMapCustomStyleOptions.h" + +///地图类型 +typedef NS_ENUM(NSInteger, MAMapType) +{ + MAMapTypeStandard = 0, ///< 普通地图 + MAMapTypeSatellite, ///< 卫星地图 + MAMapTypeStandardNight, ///< 夜间视图 + MAMapTypeNavi, ///< 导航视图 + MAMapTypeBus ///< 公交视图 +}; + +///用户跟踪模式 +typedef NS_ENUM(NSInteger, MAUserTrackingMode) +{ + MAUserTrackingModeNone = 0, ///< 不追踪用户的location更新 + MAUserTrackingModeFollow = 1, ///< 追踪用户的location更新 + MAUserTrackingModeFollowWithHeading = 2 ///< 追踪用户的location与heading更新 +}; + +///交通拥堵状态 +typedef NS_ENUM(NSInteger, MATrafficStatus) +{ + MATrafficStatusSmooth = 1, ///< 1 通畅 + MATrafficStatusSlow, ///< 2 缓行 + MATrafficStatusJam, ///< 3 阻塞 + MATrafficStatusSeriousJam, ///< 4 严重阻塞 +}; + +///绘制overlay的层级 +typedef NS_ENUM(NSInteger, MAOverlayLevel) { + MAOverlayLevelAboveRoads = 0, ///< 在地图底图标注和兴趣点图标之下绘制overlay + MAOverlayLevelAboveLabels ///< 在地图底图标注和兴趣点图标之上绘制overlay +}; + +#pragma mark - 动画相关的key +///中心点(MAMapPoint)key, 封装成[NSValue valueWithMAMapPoint:] +extern NSString * const kMAMapLayerCenterMapPointKey; + +///缩放级别key, 范围[minZoomLevel, maxZoomLevel], 封装成NSNumber +extern NSString * const kMAMapLayerZoomLevelKey; + +///旋转角度key, 范围[0, 360), 封装成NSNumber +extern NSString * const kMAMapLayerRotationDegreeKey; + +///摄像机俯视角度, 范围[0, 45], 封装成NSNumber +extern NSString * const kMAMapLayerCameraDegreeKey; + + +@protocol MAMapViewDelegate; + +@interface MAMapView : UIView + +///地图view的delegate +@property (nonatomic, weak) id delegate; + +///地图类型。注意：自定义样式优先级高于mapType，如开启了自定义样式，要关闭自定义样式后mapType才生效 +@property (nonatomic) MAMapType mapType; + +///当前地图的中心点，改变该值时，地图的比例尺级别不会发生变化 +@property (nonatomic) CLLocationCoordinate2D centerCoordinate; + +///当前地图的经纬度范围，设定的该范围可能会被调整为适合地图窗口显示的范围 +@property (nonatomic) MACoordinateRegion region; + +///可见区域, 设定的该范围可能会被调整为适合地图窗口显示的范围 +@property (nonatomic) MAMapRect visibleMapRect; + +///设置可见地图区域的矩形边界，如限制地图只显示北京市范围 +@property (nonatomic, assign) MACoordinateRegion limitRegion; + +///设置可见地图区域的矩形边界，如限制地图只显示北京市范围 +@property (nonatomic, assign) MAMapRect limitMapRect; + +///缩放级别（默认3-19，有室内地图时为3-20） +@property (nonatomic) CGFloat zoomLevel; + +///最小缩放级别 +@property (nonatomic) CGFloat minZoomLevel; + +///最大缩放级别（有室内地图时最大为20，否则为19） +@property (nonatomic) CGFloat maxZoomLevel; + +///设置地图旋转角度(逆时针为正向) +@property (nonatomic) CGFloat rotationDegree; + +///设置地图相机角度(范围为[0.f, 60.f]，但高于40度的角度需要在16级以上才能生效) +@property (nonatomic) CGFloat cameraDegree; + +///是否以screenAnchor点作为锚点进行缩放，默认为YES。如果为NO，则以手势中心点作为锚点 +@property (nonatomic, assign) BOOL zoomingInPivotsAroundAnchorPoint; + +///是否支持缩放, 默认YES +@property (nonatomic, getter = isZoomEnabled) BOOL zoomEnabled; + +///是否支持平移, 默认YES +@property (nonatomic, getter = isScrollEnabled) BOOL scrollEnabled; + +///是否支持旋转, 默认YES +@property (nonatomic, getter = isRotateEnabled) BOOL rotateEnabled; + +///是否支持camera旋转, 默认YES +@property (nonatomic, getter = isRotateCameraEnabled) BOOL rotateCameraEnabled; + +///是否支持天空模式，默认为YES. 开启后，进入天空模式后，annotation重用可视范围会缩减 +@property (nonatomic, getter = isSkyModelEnabled) BOOL skyModelEnable __attribute((deprecated("已废弃 since 6.0.0"))); + +///是否显示楼块，默认为YES +@property (nonatomic, getter = isShowsBuildings) BOOL showsBuildings; + +///是否显示底图标注, 默认为YES +@property (nonatomic, assign, getter = isShowsLabels) BOOL showsLabels; + +///是否显示交通路况图层, 默认为NO +@property (nonatomic, getter = isShowTraffic) BOOL showTraffic; + +///设置实时交通颜色,key为 MATrafficStatus +@property (nonatomic, copy) NSDictionary *trafficStatus __attribute((deprecated("已废弃 since 7.8.0"))); + +///设置实时交通线宽系数，默认线宽系数为0.8，范围为[0 - 1] (since 5.3.0) +@property (nonatomic, assign) CGFloat trafficRatio __attribute((deprecated("已废弃 since 6.0.0, 不再支持修改实时交通线宽"))); + +///是否支持单击地图获取POI信息(默认为YES), 对应的回调是 -(void)mapView:(MAMapView *) didTouchPois:(NSArray *) +@property (nonatomic, assign) BOOL touchPOIEnabled; + +///是否显示指南针, 默认YES +@property (nonatomic, assign) BOOL showsCompass; + +///指南针原点位置 +@property (nonatomic, assign) CGPoint compassOrigin; + +///指南针的宽高 +@property (nonatomic, readonly) CGSize compassSize; + +///是否显示比例尺, 默认YES +@property (nonatomic, assign) BOOL showsScale; + +///比例尺原点位置 +@property (nonatomic, assign) CGPoint scaleOrigin; + +///比例尺的最大宽高 +@property (nonatomic, readonly) CGSize scaleSize; + +///logo位置, 必须在mapView.bounds之内，否则会被忽略 +@property (nonatomic, assign) CGPoint logoCenter; + +///logo的宽高 +@property (nonatomic, readonly) CGSize logoSize; + +///在当前缩放级别下, 基于地图中心点, 1 screen point 对应的距离(单位是米) +@property (nonatomic, readonly) double metersPerPointForCurrentZoom; + +///标识当前地图中心位置是否在中国范围外。此属性不是精确判断，不能用于边界区域 +@property (nonatomic, readonly) BOOL isAbroad; + +///最大帧数，有效的帧数为：60、30、20、10等能被60整除的数。默认为60 +@property (nonatomic, assign) NSUInteger maxRenderFrame; + +///是否允许降帧，默认为YES +@property (nonatomic, assign) BOOL isAllowDecreaseFrame; + +///停止/开启 OpenGLES绘制, 默认NO. 对应回调是 - (void)mapView:(MAMapView *) didChangeOpenGLESDisabled:(BOOL) +@property (nonatomic, assign) BOOL openGLESDisabled; + +///地图的视图锚点。坐标系归一化，(0, 0)为MAMapView左上角，(1, 1)为右下角。默认为(0.5, 0.5)，即当前地图的视图中心 （since 5.0.0） +@property (nonatomic, assign) CGPoint screenAnchor; + +///地图渲染的runloop mode，默认为NSRunLoopCommonModes。如果是和UIScrollView一起使用且不希望地图在scrollView拖动时渲染，请设置此值为NSDefaultRunLoopMode。（since 5.1.0） +@property (nonatomic, copy) NSRunLoopMode runLoopMode; + +///是否显示海外地图，默认为@NO. 注意：必须先在官网申请开通海外权限 +@property (nonatomic, getter=isShowsWorldMap) NSNumber *showsWorldMap; + +///设置语言。中文:@0: 英文:@1. 英文使用注意事项：1、不能和自定义地图样式同时使用；2、英文状态只在MAMapTypeStandard生效 +@property (nonatomic, strong) NSNumber *mapLanguage; + +/** + * @brief 设定当前地图的经纬度范围，该范围可能会被调整为适合地图窗口显示的范围 + * @param region 要设定的经纬度范围 + * @param animated 是否动画设置 + */ +- (void)setRegion:(MACoordinateRegion)region animated:(BOOL)animated; + +/** + * @brief 根据当前地图视图frame的大小调整region范围 + * @param region 要调整的经纬度范围 + * @return 调整后的经纬度范围 + */ +- (MACoordinateRegion)regionThatFits:(MACoordinateRegion)region; + +/** + * @brief 设置可见区域 + * @param mapRect 要设定的可见区域 + * @param animated 是否动画设置 + */ +- (void)setVisibleMapRect:(MAMapRect)mapRect animated:(BOOL)animated; + +/** + * @brief 重新计算可见地图矩形区域,使之匹配mapview长宽比 + * @param mapRect 要调整的地图矩形区域 + * @return 调整后的地图矩形区域 + */ +- (MAMapRect)mapRectThatFits:(MAMapRect)mapRect; + +/** + * @brief 根据边缘插入来调整地图矩形区域，使之匹配mapview加insets后的长宽比 + * @param mapRect 要调整的地图矩形区域 + * @param insets 边缘插入 + * @return 调整后的地图矩形区域 + */ +- (MAMapRect)mapRectThatFits:(MAMapRect)mapRect edgePadding:(UIEdgeInsets)insets; + +/** + * @brief 设置可见地图矩形区域 + * @param insets 边缘插入 + * @param mapRect 要显示的地图矩形区域 + * @param animated 是否动画效果 + */ +- (void)setVisibleMapRect:(MAMapRect)mapRect edgePadding:(UIEdgeInsets)insets animated:(BOOL)animated; + +/** + * @brief 设置当前地图的中心点，改变该值时，地图的比例尺级别不会发生变化 + * @param coordinate 要设置的中心点 + * @param animated 是否动画设置 + */ +- (void)setCenterCoordinate:(CLLocationCoordinate2D)coordinate animated:(BOOL)animated; + +/** + * @brief 设置缩放级别（默认3-19，有室内地图时为3-20） + * @param zoomLevel 要设置的缩放级别 + * @param animated 是否动画设置 + */ +- (void)setZoomLevel:(CGFloat)zoomLevel animated:(BOOL)animated; + +/** + * @brief 根据指定的枢纽点来缩放地图 + * @param zoomLevel 缩放级别 + * @param pivot 枢纽点(基于地图view的坐标系) + * @param animated 是否动画 + */ +- (void)setZoomLevel:(CGFloat)zoomLevel atPivot:(CGPoint)pivot animated:(BOOL)animated; + +/** + * @brief 设置地图旋转角度(逆时针为正向) + * @param rotationDegree 旋转角度, 如当前角度是0，720表示逆时针旋转2周，-720表示正时针旋转2周 + * @param animated 动画 + * @param duration 动画时间 + */ +- (void)setRotationDegree:(CGFloat)rotationDegree animated:(BOOL)animated duration:(CFTimeInterval)duration; + +/** + * @brief 设置地图相机角度(范围为[0.f, 60.f]，但高于40度的角度需要在16级以上才能生效) + * @param cameraDegree 要设置的相机角度 + * @param animated 是否动画 + * @param duration 动画时间 + */ +- (void)setCameraDegree:(CGFloat)cameraDegree animated:(BOOL)animated duration:(CFTimeInterval)duration; + +/** + * @brief 获取地图状态 + * @return 地图状态 + */ +- (MAMapStatus *)getMapStatus; + + +/** + * @brief 设置地图状态 + * @param status 要设置的地图状态 + * @param animated 是否动画 + */ +- (void)setMapStatus:(MAMapStatus *)status animated:(BOOL)animated; + +/** + * @brief 设置地图状态 + * @param status 要设置的地图状态 + * @param animated 是否动画 + * @param duration 动画时间，默认动画时间为0.35s + */ +- (void)setMapStatus:(MAMapStatus *)status + animated:(BOOL)animated + duration:(CFTimeInterval)duration; + +/** + * @brief 设置指南针的图片 + * @param image 新的指南针图片 + */ +- (void)setCompassImage:(UIImage *)image; + +/** + * @brief 在指定区域内截图(默认会包含该区域内的annotationView),注意不要在地图回调方法内直接调用 + * @param rect 指定的区域 + * @return 截图image + */ +- (UIImage *)takeSnapshotInRect:(CGRect)rect __attribute((deprecated("已废弃，请使用takeSnapshotInRect:withCompletionBlock:方法 since 6.0.0"))); + +/** + * @brief 异步在指定区域内截图(默认会包含该区域内的annotationView), 地图载入完整时回调 + * @param rect 指定的区域 + * @param block 回调block(resultImage:返回的图片,state：0载入不完整，1完整） + */ +- (void)takeSnapshotInRect:(CGRect)rect withCompletionBlock:(void (^)(UIImage *resultImage, NSInteger state))block; + +/** + * @brief 异步在指定区域内截图(默认会包含该区域内的annotationView), 地图载入完整时回调 (since 7.8.0) + * @param rect 指定的区域 + * @param timeout 超时时间 + * @param block 回调block(resultImage:返回的图片,state：0载入不完整，1完整） + */ +- (void)takeSnapshotInRect:(CGRect)rect timeoutInterval:(NSTimeInterval)timeout completionBlock:(void (^)(UIImage *resultImage, NSInteger state))block; + +/** + * @brief 在指定的缩放级别下, 基于地图中心点, 1 screen point 对应的距离(单位是米). + * @param zoomLevel 指定的缩放级别, 在[minZoomLevel, maxZoomLevel]范围内. + * @return 对应的距离(单位是米) + */ +- (double)metersPerPointForZoomLevel:(CGFloat)zoomLevel; + +/** + * @brief 将经纬度转换为指定view坐标系的坐标 + * @param coordinate 经纬度 + * @param view 指定的view + * @return 基于指定view坐标系的坐标 + */ +- (CGPoint)convertCoordinate:(CLLocationCoordinate2D)coordinate toPointToView:(UIView *)view; + +/** + * @brief 将指定view坐标系的坐标转换为经纬度 + * @param point 指定view坐标系的坐标 + * @param view 指定的view + * @return 经纬度 + */ +- (CLLocationCoordinate2D)convertPoint:(CGPoint)point toCoordinateFromView:(UIView *)view; + +/** + * @brief 将经纬度region转换为指定view坐标系的rect + * @param region 经纬度region + * @param view 指定的view + * @return 指定view坐标系的rect + */ +- (CGRect)convertRegion:(MACoordinateRegion)region toRectToView:(UIView *)view; + +/** + * @brief 将指定view坐标系的rect转换为经纬度region + * @param rect 指定view坐标系的rect + * @param view 指定的view + * @return 经纬度region + */ +- (MACoordinateRegion)convertRect:(CGRect)rect toRegionFromView:(UIView *)view; + +/** + * @brief 重新加载地图 + * + * 将离线地图解压到 Documents/3dvmap/ 目录下后，调用此函数使离线数据生效, + * 对应的回调分别是 offlineDataWillReload:(MAMapView *)mapView, offlineDataDidReload:(MAMapView *)mapView. + */ +- (void)reloadMap; + +/** + * @brief 清除所有磁盘上缓存的地图数据(不包括离线地图) + */ +- (void)clearDisk; + +/** + * @brief 重新加载内部纹理，在纹理被错误释放时可以执行此方法。（since 5.4.0） + */ +- (void)reloadInternalTexture; + +/** + * @brief 获取地图审图号。如果启用了“自定义样式”功能(customMapStyleEnabled 为 YES)，则返回nil。（since 5.4.0） + * @return 地图审图号 + */ +- (NSString *)mapContentApprovalNumber; + +/** + * @brief 获取卫星图片审图号。（since 5.4.0） + * @return 卫星图片审图号 + */ +- (NSString *)satelliteImageApprovalNumber; + +/** + * @brief 添加CAKeyframeAnimation动画。（since 6.0.0） + * @param mapCenterAnimation 地图中心点动画 + * @param zoomAnimation 放大缩小动画 + * @param rotateAnimation 旋转动画 + * @param cameraDegreeAnimation 仰角动画 + */ +- (void)addAnimationWith:(CAKeyframeAnimation *)mapCenterAnimation + zoomAnimation:(CAKeyframeAnimation *)zoomAnimation + rotateAnimation:(CAKeyframeAnimation *)rotateAnimation + cameraDegreeAnimation:(CAKeyframeAnimation *)cameraDegreeAnimation; + +/** + * @brief 强制刷新。（since 6.0.0） + */ +- (void)forceRefresh; + +/** + * @brief 设置在建道路图层是否显示。默认NO（since 7.7.0） + * @param enabled 是否显示 + */ +- (void)setConstructingRoadEnable:(BOOL)enabled; + +@end + +@interface MAMapView (Annotation) + +///所有添加的标注, 注意从5.3.0开始返回数组内不再包含定位蓝点userLocation +@property (nonatomic, readonly) NSArray *annotations; + +///处于选中状态的标注数据数据(其count == 0 或 1) +@property (nonatomic, copy) NSArray *selectedAnnotations; + +///annotation 可见区域 +@property (nonatomic, readonly) CGRect annotationVisibleRect; + +///是否允许对annotationView根据zIndex进行排序，默认为NO 注意：如果设置为YES，慎重重载MAAnnoationView的willMoveToSuperview:，内部排序时会调用removeFromSuperView. 注：从5.3.0版本开启此属性废弃，如果添加的annotationView有zIndex不为0的，则自动开启为YES，否则为NO。删除所有annotation后会重置。zIndex属性只有在viewForAnnotation或者didAddAnnotationViews回调中设置有效。 +@property (nonatomic, assign) BOOL allowsAnnotationViewSorting __attribute((deprecated("已废弃 since 5.3.0"))); + +/** + * @brief 向地图窗口添加标注，需要实现MAMapViewDelegate的-mapView:viewForAnnotation:函数来生成标注对应的View + * @param annotation 要添加的标注 + */ +- (void)addAnnotation:(id )annotation; + +/** + * @brief 向地图窗口添加一组标注，需要实现MAMapViewDelegate的-mapView:viewForAnnotation:函数来生成标注对应的View + * @param annotations 要添加的标注数组 + */ +- (void)addAnnotations:(NSArray *)annotations; + +/** + * @brief 移除标注 + * @param annotation 要移除的标注 + */ +- (void)removeAnnotation:(id )annotation; + +/** + * @brief 移除一组标注 + * @param annotations 要移除的标注数组 + */ +- (void)removeAnnotations:(NSArray *)annotations; + +/** + * @brief 获取指定投影矩形范围内的标注 + * @param mapRect 投影矩形范围 + * @return 标注集合 + */ +- (NSSet *)annotationsInMapRect:(MAMapRect)mapRect; + +/** + * @brief 根据标注数据获取标注view + * @param annotation 标注数据 + * @return 对应的标注view + */ +- (MAAnnotationView *)viewForAnnotation:(id )annotation; + +/** + * @brief 从复用内存池中获取制定复用标识的annotation view + * @param identifier 复用标识 + * @return annotation view + */ +- (MAAnnotationView *)dequeueReusableAnnotationViewWithIdentifier:(NSString *)identifier; + +/** + * @brief 选中标注数据对应的view。注意：如果annotation对应的annotationView因不在屏幕范围内而被移入复用池，为了完成选中操作，会将对应的annotationView添加到地图上，并将地图中心点移至annotation.coordinate的位置。 + * @param annotation 标注数据 + * @param animated 是否有动画效果 + */ +- (void)selectAnnotation:(id )annotation animated:(BOOL)animated; + +/** + * @brief 取消选中标注数据对应的view + * @param annotation 标注数据 + * @param animated 是否有动画效果 + */ +- (void)deselectAnnotation:(id )annotation animated:(BOOL)animated; + +/** + * @brief 设置地图使其可以显示数组中所有的annotation, 如果数组中只有一个则直接设置地图中心为annotation的位置。 + * @param annotations 需要显示的annotation + * @param animated 是否执行动画 + */ +- (void)showAnnotations:(NSArray *)annotations animated:(BOOL)animated; + +/** + * @brief 设置地图使其可以显示数组中所有的annotation, 如果数组中只有一个则直接设置地图中心为annotation的位置。 + * @param annotations 需要显示的annotation + * @param insets insets 嵌入边界 + * @param animated 是否执行动画 + */ +- (void)showAnnotations:(NSArray *)annotations edgePadding:(UIEdgeInsets)insets animated:(BOOL)animated; + +@end + + +@interface MAMapView (UserLocation) + +///是否显示用户位置 +@property (nonatomic) BOOL showsUserLocation; + +///当前的位置数据 +@property (nonatomic, readonly) MAUserLocation *userLocation; + +///是否自定义用户位置精度圈(userLocationAccuracyCircle)对应的 view, 默认为 NO.\n 如果为YES: 会调用 - (MAOverlayRenderer *)mapView (MAMapView *)mapView rendererForOverlay:(id )overlay 若返回nil, 则不加载.\n 如果为NO : 会使用默认的样式. +@property (nonatomic) BOOL customizeUserLocationAccuracyCircleRepresentation; + +///用户位置精度圈 对应的overlay +@property (nonatomic, readonly) MACircle *userLocationAccuracyCircle; + +///定位用户位置的模式, 注意：在follow模式下，设置地图中心点、设置可见区域、滑动手势、选择annotation操作会取消follow模式，并触发 - (void)mapView:(MAMapView *)mapView didChangeUserTrackingMode:(MAUserTrackingMode)mode animated:(BOOL)animated; +@property (nonatomic) MAUserTrackingMode userTrackingMode; + +///当前位置再地图中是否可见 +@property (nonatomic, readonly, getter=isUserLocationVisible) BOOL userLocationVisible; + +///设定定位的最小更新距离。默认为kCLDistanceFilterNone，会提示任何移动 +@property (nonatomic) CLLocationDistance distanceFilter; + +///设定定位精度。默认为kCLLocationAccuracyBest +@property (nonatomic) CLLocationAccuracy desiredAccuracy; + +///设定最小更新角度。默认为1度，设定为kCLHeadingFilterNone会提示任何角度改变 +@property (nonatomic) CLLocationDegrees headingFilter; + +///指定定位是否会被系统自动暂停 +@property (nonatomic) BOOL pausesLocationUpdatesAutomatically; + +///是否允许后台定位。默认为NO。只在iOS 9.0之后起作用。\n 设置为YES的时候必须保证 Background Modes 中的 Location updates处于选中状态，否则会抛出异常。\n 注意：定位必须在停止的状态下设置（showsUserLocation = NO），否则无效 +@property (nonatomic) BOOL allowsBackgroundLocationUpdates; + +/** + * @brief 设置定位用户位置的模式 + * @param mode 要设置的模式 + * @param animated 是否动画设置 + */ +- (void)setUserTrackingMode:(MAUserTrackingMode)mode animated:(BOOL)animated; + +/** + * @brief 设定UserLocationView样式。如果用户自定义了userlocation的annotationView，或者该annotationView还未添加到地图上，此方法将不起作用 + * @param representation 样式信息对象 + */ +- (void)updateUserLocationRepresentation:(MAUserLocationRepresentation *)representation; + +@end + +@interface MAMapView (Overlay) + +///所有添加的Overlay +@property (nonatomic, readonly) NSArray *overlays; + +/** + * @brief 取位于level下的overlays + * @param level 层级 + */ +- (NSArray *)overlaysInLevel:(MAOverlayLevel)level; + +/** + * @brief 向地图窗口添加Overlay。 + * 需要实现MAMapViewDelegate的-mapView:rendererForOverlay:函数来生成标注对应的Renderer。 + * 默认添加层级：MAGroundOverlay默认层级为MAOverlayLevelAboveRoads，其余overlay类型默认层级为MAOverlayLevelAboveLabels + * @param overlay 要添加的overlay + */ +- (void)addOverlay:(id )overlay; + +/** + * @brief 向地图窗口添加一组Overlay，需要实现MAMapViewDelegate的-mapView:rendererForOverlay:函数来生成标注对应的Renderer + * 默认添加层级：MAOverlayLevelAboveLabels + * @param overlays 要添加的overlay数组 + */ +- (void)addOverlays:(NSArray *)overlays; + +/** + * @brief 向地图窗口添加Overlay，需要实现MAMapViewDelegate的-mapView:rendererForOverlay:函数来生成标注对应的Renderer + * @param overlay 要添加的overlay + * @param level 添加的overlay所在层级 + */ +- (void)addOverlay:(id )overlay level:(MAOverlayLevel)level; + +/** + * @brief 向地图窗口添加一组Overlay，需要实现MAMapViewDelegate的-mapView:rendererForOverlay:函数来生成标注对应的Renderer + * @param overlays 要添加的overlay数组 + * @param level 添加的overlay所在层级 + */ +- (void)addOverlays:(NSArray *)overlays level:(MAOverlayLevel)level; + +/** + * @brief 移除Overlay + * @param overlay 要移除的overlay + */ +- (void)removeOverlay:(id )overlay; + +/** + * @brief 移除一组Overlay + * @param overlays 要移除的overlay数组 + */ +- (void)removeOverlays:(NSArray *)overlays; + +/** + * @brief 在指定层级的指定的索引处添加一个Overlay + * @param overlay 要添加的overlay + * @param index 指定的索引 + * @param level 指定的层级 + + * 注：各个层级的索引分开计数； + * 若index大于level层级的最大索引，则添加至level层级的最大索引之后。 + */ +- (void)insertOverlay:(id )overlay atIndex:(NSUInteger)index level:(MAOverlayLevel)level; + +/** + * @brief 在指定的Overlay之上插入一个overlay + * @param overlay 带添加的Overlay + * @param sibling 用于指定相对位置的Overlay + */ +- (void)insertOverlay:(id )overlay aboveOverlay:(id )sibling; + +/** + * @brief 在指定的Overlay之下插入一个overlay + * @param overlay 带添加的Overlay + * @param sibling 用于指定相对位置的Overlay + */ +- (void)insertOverlay:(id )overlay belowOverlay:(id )sibling; + +/** + * @brief 在指定的索引处添加一个Overlay + * @param overlay 要添加的overlay + * @param index 指定的索引 + */ +- (void)insertOverlay:(id )overlay atIndex:(NSUInteger)index; + +/** + * @brief 在MAOverlayLevelAboveLabels上交换指定索引处的Overlay + * @param index1 索引1 + * @param index2 索引2 + */ +- (void)exchangeOverlayAtIndex:(NSUInteger)index1 withOverlayAtIndex:(NSUInteger)index2; + +/** + * @brief 交换指定索引处的Overlay + * @param index1 索引1 + * @param index2 索引2 + * @param level 所处层级 + */ +- (void)exchangeOverlayAtIndex:(NSUInteger)index1 withOverlayAtIndex:(NSUInteger)index2 atLevel:(MAOverlayLevel)level; + +/** + * @brief 交换两个overlay + * @param overlay1 overlay1 + * @param overlay2 overlay2 + */ +- (void)exchangeOverlay:(id )overlay1 withOverlay:(id )overlay2; + +/** + * @brief 查找指定overlay对应的Renderer，如果该View尚未创建，返回nil + * @param overlay 指定的overlay + * @return 指定overlay对应的Renderer + */ +- (MAOverlayRenderer *)rendererForOverlay:(id )overlay; + +/** + * @brief 设置地图使其可以显示数组中所有的overlay, 如果数组中只有一个则直接设置地图中心为overlay的位置。 + * @param overlays 需要显示的overlays + * @param animated 是否执行动画 + */ +- (void)showOverlays:(NSArray *)overlays animated:(BOOL)animated; + +/** + * @brief 设置地图使其可以显示数组中所有的overlay, 如果数组中只有一个则直接设置地图中心为overlay的位置。 + * @param overlays 需要显示的overlays + * @param insets insets 嵌入边界 + * @param animated 是否执行动画 + */ +- (void)showOverlays:(NSArray *)overlays edgePadding:(UIEdgeInsets)insets animated:(BOOL)animated; + +/** + * @brief 获取点击选中的polylineRenderer, 注意：开启polylineRenderer的点击选中功能，需设置userInteractionEnabled=YES。since 7.1.0 + * @param tappedCoord 点击点的坐标 + * @param traverseAll 如果有polyline重合情况，是否返回多个。NO: 只返回最上面的 YES:返回所有 + * @return 返回选中的polylineRenderer数组，最上面的在第一个 + * */ +- (NSArray*)getHittedPolylinesWith:(CLLocationCoordinate2D)tappedCoord traverseAll:(BOOL)traverseAll; + +@end + +#if MA_INCLUDE_INDOOR +@interface MAMapView (Indoor) + +///是否显示室内地图, 默认NO +@property (nonatomic, getter = isShowsIndoorMap) BOOL showsIndoorMap; + +///是否显示室内地图默认控件, 默认YES +@property (nonatomic, getter = isShowsIndoorMapControl) BOOL showsIndoorMapControl; + +///默认室内地图控件的最大宽高 +@property (nonatomic, readonly) CGSize indoorMapControlSize; + +/** + * @brief 设置默认室内地图控件位置 + * @param origin 左上角点位置 + */ +- (void)setIndoorMapControlOrigin:(CGPoint)origin; + +/** + * @brief 设置当前室内地图楼层数 + * @param floorIndex 要设置的楼层数 + */ +- (void)setCurrentIndoorMapFloorIndex:(NSInteger)floorIndex; + +/** + * @brief 清空室内地图缓存 + */ +- (void)clearIndoorMapCache; + +@end +#endif + +///自定义样式 +@interface MAMapView (CustomMapStyle) + +///是否开启自定义样式, 默认NO. since 5.0.0 +@property (nonatomic, assign) BOOL customMapStyleEnabled; + +/** + * @brief 根据web导出数据设置地图样式, 目前仅支持自定义标准类型. 默认不生效，调用customMapStyleEnabled=YES使生效. since 5.2.0 + * @param data 高德web端工具导出的地图样式数据. + */ +- (void)setCustomMapStyleWithWebData:(NSData *)data __attribute((deprecated("已废弃, 请使用 setCustomMapStyleOptions: since 6.6.0"))); + +/** + * @brief 设置自定义纹理. since 5.7.0 + * @param customTextureResourcePath 自定义纹理文件路径. + */ +- (void)setCustomTextureResourcePath:(NSString *)customTextureResourcePath __attribute((deprecated("已废弃, 请使用 setCustomMapStyleOptions: since 6.6.0"))); + +/** + * @brief 自定义地图样式id, 官网发布后下次开启自定义样式便可生效，目前仅支持自定义标准类型. 默认不生效，调用customMapStyleEnabled=YES使生效. since 6.0.0 + * @param customMapStyleID 自定义样式ID，从官网获取 + */ +- (void)setCustomMapStyleID:(NSString *)customMapStyleID __attribute((deprecated("已废弃, 请使用 setCustomMapStyleOptions: since 6.6.0"))); + +/** + * @brief 自定义地图样式设置,可以支持分级样式配置，如控制不同级别显示不同的颜色(自7.0.0开始样式有更新，旧的样式文件不能继续使用，必须到官网重新导出新样式文件。 自6.6.0开始使用新版样式，旧版样式无法在新版接口setCustomMapStyleOptions:(MAMapCustomStyleOptions *)styleOptions中使用，请到官网(lbs.amap.com)更新新版样式文件.) + * @param styleOptions 自定义样式options. since 6.6.0 + */ +- (void)setCustomMapStyleOptions:(MAMapCustomStyleOptions *)styleOptions; + +@end + +#pragma mark - MAMapViewDelegate +@protocol MAMapViewDelegate + +@optional + +/** + * @brief 地图区域改变过程中会调用此接口 since 4.6.0 + * @param mapView 地图View + */ +- (void)mapViewRegionChanged:(MAMapView *)mapView; + +/** + * @brief 地图区域即将改变时会调用此接口 + * @param mapView 地图View + * @param animated 是否动画 + */ +- (void)mapView:(MAMapView *)mapView regionWillChangeAnimated:(BOOL)animated; + +/** + * @brief 地图区域改变完成后会调用此接口 + * @param mapView 地图View + * @param animated 是否动画 + */ +- (void)mapView:(MAMapView *)mapView regionDidChangeAnimated:(BOOL)animated; + +/** + * @brief 地图区域即将改变时会调用此接口，如实现此接口则不会触发回掉mapView:regionWillChangeAnimated: + * @param mapView 地图View + * @param animated 是否动画 +* @param wasUserAction 标识是否是用户动作 + */ +- (void)mapView:(MAMapView *)mapView regionWillChangeAnimated:(BOOL)animated wasUserAction:(BOOL)wasUserAction; + +/** + * @brief 地图区域改变完成后会调用此接口，如实现此接口则不会触发回掉mapView:regionDidChangeAnimated: + * @param mapView 地图View + * @param animated 是否动画 + * @param wasUserAction 标识是否是用户动作 + */ +- (void)mapView:(MAMapView *)mapView regionDidChangeAnimated:(BOOL)animated wasUserAction:(BOOL)wasUserAction; + +/** + * @brief 地图将要发生移动时调用此接口 + * @param mapView 地图view + * @param wasUserAction 标识是否是用户动作 + */ +- (void)mapView:(MAMapView *)mapView mapWillMoveByUser:(BOOL)wasUserAction; + +/** + * @brief 地图移动结束后调用此接口 + * @param mapView 地图view + * @param wasUserAction 标识是否是用户动作 + */ +- (void)mapView:(MAMapView *)mapView mapDidMoveByUser:(BOOL)wasUserAction; + +/** + * @brief 地图将要发生缩放时调用此接口 + * @param mapView 地图view + * @param wasUserAction 标识是否是用户动作 + */ +- (void)mapView:(MAMapView *)mapView mapWillZoomByUser:(BOOL)wasUserAction; + +/** + * @brief 地图缩放结束后调用此接口 + * @param mapView 地图view + * @param wasUserAction 标识是否是用户动作 + */ +- (void)mapView:(MAMapView *)mapView mapDidZoomByUser:(BOOL)wasUserAction; + +/** + * @brief 地图开始加载 + * @param mapView 地图View + */ +- (void)mapViewWillStartLoadingMap:(MAMapView *)mapView; + +/** + * @brief 地图加载成功 + * @param mapView 地图View + */ +- (void)mapViewDidFinishLoadingMap:(MAMapView *)mapView; + +/** + * @brief 地图加载失败 + * @param mapView 地图View + * @param error 错误信息 + */ +- (void)mapViewDidFailLoadingMap:(MAMapView *)mapView withError:(NSError *)error; + +/** + * @brief 根据anntation生成对应的View。 + + 注意： + 1、5.1.0后由于定位蓝点增加了平滑移动功能，如果在开启定位的情况先添加annotation，需要在此回调方法中判断annotation是否为MAUserLocation，从而返回正确的View。 + if ([annotation isKindOfClass:[MAUserLocation class]]) { + return nil; + } + + 2、请不要在此回调中对annotation进行select和deselect操作，此时annotationView还未添加到mapview。 + + * @param mapView 地图View + * @param annotation 指定的标注 + * @return 生成的标注View + */ +- (MAAnnotationView *)mapView:(MAMapView *)mapView viewForAnnotation:(id )annotation; + +/** + * @brief 当mapView新添加annotation views时，调用此接口 + * @param mapView 地图View + * @param views 新添加的annotation views + */ +- (void)mapView:(MAMapView *)mapView didAddAnnotationViews:(NSArray *)views; + +/** + * @brief 当选中一个annotation view时，调用此接口. 注意如果已经是选中状态，再次点击不会触发此回调。取消选中需调用-(void)deselectAnnotation:animated: + * @param mapView 地图View + * @param view 选中的annotation view + */ +- (void)mapView:(MAMapView *)mapView didSelectAnnotationView:(MAAnnotationView *)view; + +/** + * @brief 当取消选中一个annotation view时，调用此接口 + * @param mapView 地图View + * @param view 取消选中的annotation view + */ +- (void)mapView:(MAMapView *)mapView didDeselectAnnotationView:(MAAnnotationView *)view; + +/** + * @brief 在地图View将要启动定位时，会调用此函数 + * @param mapView 地图View + */ +- (void)mapViewWillStartLocatingUser:(MAMapView *)mapView; + +/** + * @brief 在地图View停止定位后，会调用此函数 + * @param mapView 地图View + */ +- (void)mapViewDidStopLocatingUser:(MAMapView *)mapView; + +/** + * @brief 位置或者设备方向更新后，会调用此函数 + * @param mapView 地图View + * @param userLocation 用户定位信息(包括位置与设备方向等数据) + * @param updatingLocation 标示是否是location数据更新, YES:location数据更新 NO:heading数据更新 + */ +- (void)mapView:(MAMapView *)mapView didUpdateUserLocation:(MAUserLocation *)userLocation updatingLocation:(BOOL)updatingLocation; + +/** + * @brief 当plist配置NSLocationAlwaysUsageDescription或者NSLocationAlwaysAndWhenInUseUsageDescription，并且[CLLocationManager authorizationStatus] == kCLAuthorizationStatusNotDetermined，会调用代理的此方法。 + 此方法实现调用后台权限API即可（ 该回调必须实现 [locationManager requestAlwaysAuthorization] ）; since 6.8.0 + * @param locationManager 地图的CLLocationManager。 + */ +- (void)mapViewRequireLocationAuth:(CLLocationManager *)locationManager; + +/** + * @brief 定位失败后，会调用此函数 + * @param mapView 地图View + * @param error 错误号，参考CLError.h中定义的错误号 + */ +- (void)mapView:(MAMapView *)mapView didFailToLocateUserWithError:(NSError *)error; + +/** + * @brief 拖动annotation view时view的状态变化 + * @param mapView 地图View + * @param view annotation view + * @param newState 新状态 + * @param oldState 旧状态 + */ +- (void)mapView:(MAMapView *)mapView annotationView:(MAAnnotationView *)view didChangeDragState:(MAAnnotationViewDragState)newState + fromOldState:(MAAnnotationViewDragState)oldState; + +/** + * @brief 根据overlay生成对应的Renderer + * @param mapView 地图View + * @param overlay 指定的overlay + * @return 生成的覆盖物Renderer + */ +- (MAOverlayRenderer *)mapView:(MAMapView *)mapView rendererForOverlay:(id )overlay; + +/** + * @brief 当mapView新添加overlay renderers时，调用此接口 + * @param mapView 地图View + * @param overlayRenderers 新添加的overlay renderers + */ +- (void)mapView:(MAMapView *)mapView didAddOverlayRenderers:(NSArray *)overlayRenderers; + +/** + * @brief 标注view的accessory view(必须继承自UIControl)被点击时，触发该回调 + * @param mapView 地图View + * @param view callout所属的标注view + * @param control 对应的control + */ +- (void)mapView:(MAMapView *)mapView annotationView:(MAAnnotationView *)view calloutAccessoryControlTapped:(UIControl *)control; + +/** + * @brief 标注view的calloutview整体点击时，触发该回调。只有使用默认calloutview时才生效。 + * @param mapView 地图的view + * @param view calloutView所属的annotationView + */ +- (void)mapView:(MAMapView *)mapView didAnnotationViewCalloutTapped:(MAAnnotationView *)view; + +/** + * @brief 标注view被点击时，触发该回调。（since 5.7.0） + * @param mapView 地图的view + * @param view annotationView + */ +- (void)mapView:(MAMapView *)mapView didAnnotationViewTapped:(MAAnnotationView *)view; + +/** + * @brief 当userTrackingMode改变时，调用此接口 + * @param mapView 地图View + * @param mode 改变后的mode + * @param animated 动画 + */ +- (void)mapView:(MAMapView *)mapView didChangeUserTrackingMode:(MAUserTrackingMode)mode animated:(BOOL)animated; + +/** + * @brief 当openGLESDisabled变量改变时，调用此接口 + * @param mapView 地图View + * @param openGLESDisabled 改变后的openGLESDisabled + */ +- (void)mapView:(MAMapView *)mapView didChangeOpenGLESDisabled:(BOOL)openGLESDisabled; + +/** + * @brief 当touchPOIEnabled == YES时，单击地图使用该回调获取POI信息 + * @param mapView 地图View + * @param pois 获取到的poi数组(由MATouchPoi组成) + */ +- (void)mapView:(MAMapView *)mapView didTouchPois:(NSArray *)pois; + +/** + * @brief 单击地图回调，返回经纬度 + * @param mapView 地图View + * @param coordinate 经纬度 + */ +- (void)mapView:(MAMapView *)mapView didSingleTappedAtCoordinate:(CLLocationCoordinate2D)coordinate; + +/** + * @brief 长按地图，返回经纬度 + * @param mapView 地图View + * @param coordinate 经纬度 + */ +- (void)mapView:(MAMapView *)mapView didLongPressedAtCoordinate:(CLLocationCoordinate2D)coordinate; + +/** + * @brief 地图初始化完成（在此之后，可以进行坐标计算） + * @param mapView 地图View + */ +- (void)mapInitComplete:(MAMapView *)mapView; + +#if MA_INCLUDE_INDOOR +/** + * @brief 室内地图出现,返回室内地图信息 + * + * @param mapView 地图View + * @param indoorInfo 室内地图信息 + */ +- (void)mapView:(MAMapView *)mapView didIndoorMapShowed:(MAIndoorInfo *)indoorInfo; + +/** + * @brief 室内地图楼层发生变化,返回变化的楼层 + * + * @param mapView 地图View + * @param indoorInfo 变化的楼层 + */ +- (void)mapView:(MAMapView *)mapView didIndoorMapFloorIndexChanged:(MAIndoorInfo *)indoorInfo; + +/** + * @brief 室内地图消失后,返回室内地图信息 + * + * @param mapView 地图View + * @param indoorInfo 室内地图信息 + */ +- (void)mapView:(MAMapView *)mapView didIndoorMapHidden:(MAIndoorInfo *)indoorInfo; +#endif //end of MA_INCLUDE_INDOOR + +/** + * @brief 离线地图数据将要被加载, 调用reloadMap会触发该回调，离线数据生效前的回调. + * @param mapView 地图View + */ +- (void)offlineDataWillReload:(MAMapView *)mapView; + +/** + * @brief 离线地图数据加载完成, 调用reloadMap会触发该回调，离线数据生效后的回调. + * @param mapView 地图View + */ +- (void)offlineDataDidReload:(MAMapView *)mapView; + +@end + diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiColoredPolylineRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiColoredPolylineRenderer.h new file mode 100644 index 00000000..f8cceba5 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiColoredPolylineRenderer.h @@ -0,0 +1,36 @@ +// +// MAMultiColoredPolylineRenderer.h +// MapKit_static +// +// Created by yi chen on 12/11/15. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_MAMultiPolyline + +#import "MAPolylineRenderer.h" +#import "MAMultiPolyline.h" + +///此类用于绘制 MAMultiPolyline 对应的多彩线，支持分段颜色绘制 +@interface MAMultiColoredPolylineRenderer : MAPolylineRenderer + +///关联的MAMultiPolyline model +@property (nonatomic, readonly) MAMultiPolyline *multiPolyline; + +///分段绘制的颜色,需要分段颜色绘制时，必须设置（内容必须为UIColor）。根据multiPolyline.drawStyleIndexes属性指示的索引进行渲染。 +@property (nonatomic, strong) NSArray *strokeColors; + +///颜色是否渐变, 默认为NO。如果设置为YES，则为多彩渐变线。 +@property (nonatomic, getter=isGradient) BOOL gradient; + +/** + * @brief 根据指定的MAPolyline生成一个多段线Renderer + * @param multiPolyline 指定MAMultiPolyline + * @return 新生成的多段线Renderer +*/ +- (instancetype)initWithMultiPolyline:(MAMultiPolyline *)multiPolyline; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPoint.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPoint.h new file mode 100755 index 00000000..6274d24d --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPoint.h @@ -0,0 +1,38 @@ +// +// MAMultiPoint.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MAShape.h" +#import "MAGeometry.h" + +///该类是个由多个点组成的虚基类, 不能直接实例化对象, 要使用其子类MAPolyline,MAPolygon来实例化 +@interface MAMultiPoint : MAShape { + @package + MAMapPoint *_points; + NSUInteger _pointCount; + MAMapRect _boundingRect; +} + +///坐标点数组 +@property (nonatomic, readonly) MAMapPoint *points; + +///坐标点的个数 +@property (nonatomic, readonly) NSUInteger pointCount; + +///是否跨越180度经度线，默认NO since 6.4.0 +@property (nonatomic, assign, readonly) BOOL cross180Longitude; + +/** + * @brief 将内部的坐标点数据转化为经纬度坐标并拷贝到coords内存中 + * @param coords 调用者提供的内存空间, 该空间长度必须大于等于要拷贝的坐标点的个数（range.length） + * @param range 要拷贝的数据范围 + */ +- (void)getCoordinates:(CLLocationCoordinate2D *)coords range:(NSRange)range; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPointOverlay.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPointOverlay.h new file mode 100644 index 00000000..cbbd5f20 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPointOverlay.h @@ -0,0 +1,44 @@ +// +// MAMultiPointOverlay.h +// MAMapKit +// +// Created by hanxiaoming on 2017/4/11. +// Copyright © 2017年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_MAMultiPoint + +#import "MAShape.h" +#import "MAOverlay.h" + +///海量点overlay单个点对象（since 5.1.0） +@interface MAMultiPointItem : NSObject + +///经纬度 +@property (nonatomic, assign) CLLocationCoordinate2D coordinate; + +///唯一标识，默认为nil。 +@property (nonatomic, copy) NSString *customID; + +///标题 +@property (nonatomic, copy) NSString *title; + +///副标题 +@property (nonatomic, copy) NSString *subtitle; + +@end + + +///海量点overlay（since 5.1.0） +@interface MAMultiPointOverlay : MAShape + +///点对象集合 +@property (nonatomic, readonly) NSArray *items; + +///初始化方法 +- (instancetype)initWithMultiPointItems:(NSArray *)items; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPointOverlayRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPointOverlayRenderer.h new file mode 100644 index 00000000..a53a2029 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPointOverlayRenderer.h @@ -0,0 +1,54 @@ +// +// MAMultiPointOverlayRenderer.h +// MAMapKit +// +// Created by hanxiaoming on 2017/4/11. +// Copyright © 2017年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_MAMultiPoint + +#import "MAMultiPointOverlay.h" +#import "MAOverlayRenderer.h" + +@class MAMultiPointOverlayRenderer; + +///MAMultiPointOverlayRenderer代理（since 5.1.0） +@protocol MAMultiPointOverlayRendererDelegate +@optional + +/** + @brief 点击海量点图层回调 + + @param renderer 海量点图层渲染器 + @param item 被点击的单个点对象 + */ +- (void)multiPointOverlayRenderer:(MAMultiPointOverlayRenderer *)renderer didItemTapped:(MAMultiPointItem *)item; + +@end + +///海量点渲染renderer（since 5.1.0）。 注意：为了保证渲染效率，纹理不受alpha参数影响，如果需要设置透明度，请更换icon。 +@interface MAMultiPointOverlayRenderer : MAOverlayRenderer + +///MAMultiPointOverlayRendererDelegate代理对象 +@property (nonatomic, weak) id delegate; + +///标注纹理图片 +@property (nonatomic, strong) UIImage *icon; + +///纹理渲染大小，默认为icon图片大小 +@property (nonatomic, assign) CGSize pointSize; + +///经纬度对应图片中的位置，默认为(0.5,0.5)，范围[0-1] 负值自动取其绝对值 左上角为 (0,0) 右下角为 (1,1) +@property (nonatomic, assign) CGPoint anchor; + +///对应的overlay +@property (nonatomic, readonly) MAMultiPointOverlay *multiPointOverlay; + +///初始化方法 +- (instancetype)initWithMultiPointOverlay:(MAMultiPointOverlay *)multiPointOverlay; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPolyline.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPolyline.h new file mode 100644 index 00000000..d830f569 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiPolyline.h @@ -0,0 +1,77 @@ +// +// MAMultiPolyline.h +// MapKit_static +// +// Created by yi chen on 12/11/15. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_MAMultiPolyline + +#import "MAPolyline.h" + +///多彩线model类。此类用于定义一个由多个点相连的多段线，绘制时支持分段采用不同颜色（纹理）绘制，点与点之间尾部相连但第一点与最后一个点不相连, 通常MAMultiPolyline是MAMultiColoredPolylineRenderer（分段颜色绘制）或MAMultiTexturePolylineRenderer（分段纹理绘制）的model +@interface MAMultiPolyline : MAPolyline + +/** + 绘制索引数组(纹理、颜色索引数组), 成员为NSNumber, 且为非负数。 + 例子：[1,3,6] 表示 0-1使用第一种颜色\纹理，1-3使用第二种，3-6使用第三种，6-最后使用第四种。 + 在渐变模式下（MAMultiColoredPolylineRenderer.gradient = YES），0-1使用第一种颜色，3使用第二种，6-最后使用第四种，1-3，3-6使用渐变色进行填充。 + + 注意：polyline在渲染时会进行抽稀以提高渲染效率，但是如果是设置为drawIndex的点，则不会被抽稀。 + 在每一个点都是索引点的极端情况下，则抽稀过程不会生效，点数量很多时会极大的影响渲染效率。所以请尽量少的设置索引点的数量。 + */ +@property (nonatomic, strong) NSArray *drawStyleIndexes; + +/** + * @brief 多彩线，根据MAMapPoint数据生成多彩线 + * + * 分段纹理绘制：其对应的MAMultiTexturePolylineRenderer必须设置strokeTextureImages属性; 否则使用默认的灰色纹理绘制。 + * 分段颜色绘制：其对应的MAMultiColoredPolylineRenderer必须设置strokeColors属性 + * + * @param points 指定的直角坐标点数组，注意：如果有连续重复点，需要去重处理，只保留一个，否则会导致绘制有问题。 + * @param count 坐标点的个数 + * @param drawStyleIndexes 纹理索引数组(颜色索引数组) + * @return 生成的折线对象 + */ ++ (instancetype)polylineWithPoints:(MAMapPoint *)points count:(NSUInteger)count drawStyleIndexes:(NSArray *) drawStyleIndexes; + +/** + * @brief 多彩线，根据经纬度坐标数据生成多彩线 + * + * 分段纹理绘制：其对应的MAMultiTexturePolylineRenderer必须设置strokeTextureImages属性; 否则使用默认的灰色纹理绘制。 + * 分段颜色绘制：其对应的MAMultiColoredPolylineRenderer必须设置strokeColors属性。 + * + * @param coords 指定的经纬度坐标点数组，注意：如果有连续重复点，需要去重处理，只保留一个，否则会导致绘制有问题。 + * @param count 坐标点的个数 + * @param drawStyleIndexes 纹理索引数组(颜色索引数组), 成员为NSNumber, 且为非负数。 + * @return 生成的折线对象 + */ ++ (instancetype)polylineWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count drawStyleIndexes:(NSArray *) drawStyleIndexes; + +/** + * @brief 重新设置坐标点. since 5.0.0 + * @param points 指定的直角坐标点数组,C数组，内部会做copy，调用者负责内存管理。注意：如果有连续重复点，需要去重处理，只保留一个，否则会导致绘制有问题。 + * @param count 坐标点的个数 + * @param drawStyleIndexes 纹理索引数组(颜色索引数组), 成员为NSNumber, 且为非负数。 + * @return 是否设置成功 + */ +- (BOOL)setPolylineWithPoints:(MAMapPoint *)points + count:(NSUInteger)count + drawStyleIndexes:(NSArray *)drawStyleIndexes; + +/** + * @brief 重新设置坐标点. since 5.0.0 + * @param coords 指定的经纬度坐标点数组,C数组，内部会做copy，调用者负责内存管理。注意：如果有连续重复点，需要去重处理，只保留一个，否则会导致绘制有问题。 + * @param count 坐标点的个数 + * @param drawStyleIndexes 纹理索引数组(颜色索引数组), 成员为NSNumber, 且为非负数。 + * @return 是否设置成功 + */ +- (BOOL)setPolylineWithCoordinates:(CLLocationCoordinate2D *)coords + count:(NSUInteger)count + drawStyleIndexes:(NSArray *)drawStyleIndexes; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiTexturePolylineRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiTexturePolylineRenderer.h new file mode 100644 index 00000000..0fe357ad --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAMultiTexturePolylineRenderer.h @@ -0,0 +1,43 @@ +// +// MAMultiTexturePolylineRenderer.h +// MapKit_static +// +// Created by yi chen on 12/11/15. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_MAMultiPolyline + +#import "MAPolylineRenderer.h" +#import "MAMultiPolyline.h" + +///此类用于绘制MAMultiPolyline对应的多彩线，支持分段纹理绘制 +@interface MAMultiTexturePolylineRenderer : MAPolylineRenderer + +///关联的MAMultiPolyline model +@property (nonatomic, readonly) MAMultiPolyline *multiPolyline; + +///分段纹理图片数组, 支持非PowerOfTwo图片 +@property (nonatomic, strong) NSArray *strokeTextureImages; + +///取分段纹理id,返回分段纹理id数组, 如果strokeTextureImages未指定、尚未加载或加载失败，返回值可能包含0 +@property (nonatomic, strong, readonly) NSArray *strokeTextureIDs; + +/** + * @brief 根据指定的MAMultiPolyline生成一个多段线Renderer + * @param multiPolyline 指定MAMultiPolyline + * @return 新生成的多段线Renderer + */ +- (instancetype)initWithMultiPolyline:(MAMultiPolyline *)multiPolyline; + +/** + * @brief 加载分段绘制的纹理图片. 需要分段纹理绘制时，必须设置。否则使用默认纹理绘制 + * @param textureImages 必须为UIImage数组，支持非PowerOfTwo图片。若为nil，则清空原有纹理 + * @return 是否成功，若纹理加载失败返回0 + */ +- (BOOL)loadStrokeTextureImages:(NSArray *)textureImages __attribute__((deprecated("已废弃, 请通过属性strokeTextureImages设置"))); + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineCity.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineCity.h new file mode 100644 index 00000000..680709ca --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineCity.h @@ -0,0 +1,39 @@ +// +// MAOfflineCity.h +// +// Copyright (c) 2013年 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#if MA_INCLUDE_OFFLINE + +#import +#import "MAOfflineItem.h" + +///离线地图城市状态，deprecated +typedef enum{ + MAOfflineCityStatusNone __attribute__((deprecated("use MAOfflineItemStatusNone instead"))) = MAOfflineItemStatusNone, ///< 不存在,deprecated + MAOfflineCityStatusCached __attribute__((deprecated("use MAOfflineItemStatusCached instead"))) = MAOfflineItemStatusCached, ///< 缓存状态,deprecated + MAOfflineCityStatusInstalled __attribute__((deprecated("use MAOfflineItemStatusInstalled instead"))) = MAOfflineItemStatusInstalled, ///< 已安装,deprecated + MAOfflineCityStatusExpired __attribute__((deprecated("use MAOfflineItemStatusExpired instead"))) = MAOfflineItemStatusExpired ///< 已过期,deprecated +}MAOfflineCityStatus; + +///离线地图，城市信息 +@interface MAOfflineCity : MAOfflineItem + +///城市编码 +@property (nonatomic, copy, readonly) NSString *cityCode; + +///城市名称,deprecated,请使用name +@property (nonatomic, copy, readonly) NSString *cityName __attribute__((deprecated("use name instead"))); + +///下载地址,deprecated +@property (nonatomic, copy, readonly) NSString *urlString __attribute__((deprecated("Not supported in future version"))); + +///离线数据状态,deprecated,请使用itemStatus +@property (nonatomic, assign, readonly) MAOfflineCityStatus status __attribute__((deprecated("use itemStatus instead"))); + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItem.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItem.h new file mode 100644 index 00000000..56c08859 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItem.h @@ -0,0 +1,51 @@ +// +// MAOfflineItem.h +// MapKit_static +// +// Created by songjian on 14-4-23. +// Copyright © 2016 Amap. All rights reserved. +// + + + +#import "MAConfig.h" + +#if MA_INCLUDE_OFFLINE + +#import + +///离线地图item状态 +typedef NS_ENUM(NSInteger, MAOfflineItemStatus) +{ + MAOfflineItemStatusNone = 0, ///<不存在 + MAOfflineItemStatusCached, ///<缓存状态 + MAOfflineItemStatusInstalled, ///<已安装 + MAOfflineItemStatusExpired ///<已过期 +}; + +@interface MAOfflineItem : NSObject + +///名字 +@property (nonatomic, copy, readonly) NSString *name; + +///简拼 +@property (nonatomic, copy, readonly) NSString *jianpin; + +///拼音 +@property (nonatomic, copy, readonly) NSString *pinyin; + +///区域编码 +@property (nonatomic, copy, readonly) NSString *adcode; + +///离线数据大小 +@property (nonatomic, assign, readonly) long long size; + +///状态 +@property (nonatomic, assign, readonly) MAOfflineItemStatus itemStatus; + +///已下载大小(当itemStatus == MAOfflineItemStatusCached 时有效) +@property (nonatomic, assign, readonly) long long downloadedSize; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemCommonCity.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemCommonCity.h new file mode 100644 index 00000000..fea25963 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemCommonCity.h @@ -0,0 +1,23 @@ +// +// MAOfflineItemCommonCity.h +// MapKit_static +// +// Created by songjian on 14-4-23. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#if MA_INCLUDE_OFFLINE + +#import "MAOfflineCity.h" + +///普通城市 +@interface MAOfflineItemCommonCity : MAOfflineCity + +///所属省份 +@property (nonatomic, weak) MAOfflineItem *province; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemMunicipality.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemMunicipality.h new file mode 100644 index 00000000..37acf51e --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemMunicipality.h @@ -0,0 +1,20 @@ +// +// MAOfflineItemMunicipality.h +// MapKit_static +// +// Created by songjian on 14-4-23. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#if MA_INCLUDE_OFFLINE + +#import "MAOfflineCity.h" + +///直辖市 +@interface MAOfflineItemMunicipality : MAOfflineCity + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemNationWide.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemNationWide.h new file mode 100644 index 00000000..22dc2e35 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineItemNationWide.h @@ -0,0 +1,20 @@ +// +// MAOfflineItemNationWide.h +// MapKit_static +// +// Created by songjian on 14-4-23. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#if MA_INCLUDE_OFFLINE + +#import "MAOfflineCity.h" + +///全国概要 +@interface MAOfflineItemNationWide : MAOfflineCity + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineMap.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineMap.h new file mode 100644 index 00000000..d00891ce --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineMap.h @@ -0,0 +1,162 @@ +// +// MAOfflineMap.h +// +// Copyright (c) 2013年 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#if MA_INCLUDE_OFFLINE + +#import +#import "MAOfflineProvince.h" +#import "MAOfflineItemNationWide.h" +#import "MAOfflineItemMunicipality.h" + +///离线地图下载状态 +typedef NS_ENUM(NSInteger, MAOfflineMapDownloadStatus) +{ + MAOfflineMapDownloadStatusWaiting = 0, //!< 以插入队列，等待中 + MAOfflineMapDownloadStatusStart, //!< 开始下载 + MAOfflineMapDownloadStatusProgress, //!< 下载过程中 + MAOfflineMapDownloadStatusCompleted, //!< 下载成功 + MAOfflineMapDownloadStatusCancelled, //!< 取消 + MAOfflineMapDownloadStatusUnzip, //!< 解压缩 + MAOfflineMapDownloadStatusFinished, //!< 全部顺利完成 + MAOfflineMapDownloadStatusError //!< 发生错误 +}; + +///离线下载错误domain +extern NSString * const MAOfflineMapErrorDomain; + +///离线地图下载错误类型 +typedef NS_ENUM(NSInteger, MAOfflineMapError) +{ + MAOfflineMapErrorUnknown = -1, //!< 未知的错误 + MAOfflineMapErrorCannotWriteToTmp = -2, //!< 写入临时目录失败 + MAOfflineMapErrorCannotOpenZipFile = -3, //!< 打开归档文件失败 + MAOfflineMapErrorCannotExpand = -4 //!< 解归档文件失败 +}; + +/** + * 当downloadStatus == MAOfflineMapDownloadStatusProgress 时, info参数是个NSDictionary, + * 如下两个key用来获取已下载和总和的数据大小(单位byte), 对应的是NSNumber(long long) 类型. + * 当downloadStatus == MAOfflineMapDownloadStatusError 时, info参数是NSError + */ + +///下载过程info的key，表示已下载数据大小 +extern NSString * const MAOfflineMapDownloadReceivedSizeKey; + +///下载过程info的key，表示总的数据大小 +extern NSString * const MAOfflineMapDownloadExpectedSizeKey; + +/** + * @brief 离线地图下载过程回调block + * @param downloadItem 下载的item + * @param downloadStatus 下载状态 + * @param info 下载过程中的附加信息 + */ +typedef void(^MAOfflineMapDownloadBlock)(MAOfflineItem * downloadItem, MAOfflineMapDownloadStatus downloadStatus, id info); + +/** + * @brief 离线地图检查更新回调block + * @param hasNewestVersion 是否有新版本的布尔值 + */ +typedef void(^MAOfflineMapNewestVersionBlock)(BOOL hasNewestVersion); + +///离线地图管理类 +@interface MAOfflineMap : NSObject + +/** + * @brief 获取MAOfflineMap 单例 + * @return MAOfflineMap + */ ++ (MAOfflineMap *)sharedOfflineMap; + +///省份数组(每个元素均是MAOfflineProvince类型) +@property (nonatomic, readonly) NSArray *provinces; + +///直辖市数组(每个元素均是MAOfflineItemMunicipality类型) +@property (nonatomic, readonly) NSArray *municipalities; + +///全国概要图 +@property (nonatomic, readonly) MAOfflineItemNationWide *nationWide; + +///城市数组, 包括普通城市与直辖市 +@property (nonatomic, readonly) NSArray *cities; + +///离线数据的版本号(由年月日组成, 如@"20130715") +@property (nonatomic, readonly) NSString *version; + +/** + * @brief 初始化离线地图数据，如果第一次运行且offlinePackage.plist文件不存在，则需要首先执行此方法。否则MAOfflineMap中的省、市、版本号等数据都为空。 + * @param block 初始化完成回调 + */ +- (void)setupWithCompletionBlock:(void(^)(BOOL setupSuccess))block; + +/** + * @brief 启动下载 + * @param item 数据 + * @param shouldContinueWhenAppEntersBackground 进入后台是否允许继续下载 + * @param downloadBlock 下载过程block + */ +- (void)downloadItem:(MAOfflineItem *)item shouldContinueWhenAppEntersBackground:(BOOL)shouldContinueWhenAppEntersBackground downloadBlock:(MAOfflineMapDownloadBlock)downloadBlock; + +/** + * @brief 监测是否正在下载 + * @param item 条目 + * @return 是否在下载 + */ +- (BOOL)isDownloadingForItem:(MAOfflineItem *)item; + +/** + * @brief 暂停下载 + * @param item 条目 + * @return 是否在执行了cancel，如果该item并未在下载中，则返回NO + */ +- (BOOL)pauseItem:(MAOfflineItem *)item; + +/** + * @brief 删除item对应离线地图数据 + * @param item 条目 + */ +- (void)deleteItem:(MAOfflineItem *)item; + +/** + * @brief 取消全部下载 + */ +- (void)cancelAll; + +/** + * @brief 清除所有在磁盘上的离线地图数据, 之后调用[mapView reloadMap]会使其立即生效 + */ +- (void)clearDisk; + +/** + * @brief 监测新版本。注意：如果有新版本，会重建所有的数据，包括provinces、municipalities、nationWide、cities，外部使用应当在newestVersionBlock中更新所持有的对象。 + * @param newestVersionBlock 回调block + */ +- (void)checkNewestVersion:(MAOfflineMapNewestVersionBlock)newestVersionBlock; + +@end + +@interface MAOfflineMap (Deprecated) + +///deprecated +@property (nonatomic, readonly) NSArray *offlineCities __attribute__ ((deprecated("use cities instead"))); + +///deprecated +- (void)downloadCity:(MAOfflineCity *)city downloadBlock:(MAOfflineMapDownloadBlock)downloadBlock __attribute__ ((deprecated("use - (void)downloadItem:(MAOfflineItem *)item shouldContinueWhenAppEntersBackground:(BOOL)shouldContinueWhenAppEntersBackground downloadBlock:(MAOfflineMapDownloadBlock)downloadBlock instead"))); + +///deprecated +- (void)downloadCity:(MAOfflineCity *)city shouldContinueWhenAppEntersBackground:(BOOL)shouldContinueWhenAppEntersBackground downloadBlock:(MAOfflineMapDownloadBlock)downloadBlock __attribute__ ((deprecated("use - (void)downloadItem:(MAOfflineItem *)item shouldContinueWhenAppEntersBackground:(BOOL)shouldContinueWhenAppEntersBackground downloadBlock:(MAOfflineMapDownloadBlock)downloadBlock instead"))); + +///deprecated +- (BOOL)isDownloadingForCity:(MAOfflineCity *)city __attribute__ ((deprecated("use - (BOOL)isDownloadingForItem:(MAOfflineItem *)item instead"))); + +///deprecated +- (void)pause:(MAOfflineCity *)city __attribute__ ((deprecated("use - (void)pauseItem:(MAOfflineItem *)item instead"))); + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineMapViewController.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineMapViewController.h new file mode 100644 index 00000000..d02a9519 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineMapViewController.h @@ -0,0 +1,26 @@ +// +// MAOfflineMapViewController.h +// MAMapKit +// +// Created by hanxiaoming on 2017/12/14. +// Copyright © 2017年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OFFLINE + +#import +#import "MAOfflineMap.h" + +///离线地图ViewController（since 5.7.0） +@interface MAOfflineMapViewController : UIViewController + +/// MAOfflineMapViewController单例，请使用单例以保证离线地图状态正确同步。 ++ (instancetype)sharedInstance; + +///MAOfflineMap实例 +@property (nonatomic, readonly) MAOfflineMap *offlineMap; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineProvince.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineProvince.h new file mode 100644 index 00000000..fe992ef5 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOfflineProvince.h @@ -0,0 +1,24 @@ +// +// MAOfflineProvince.h +// MapKit_static +// +// Created by songjian on 14-4-24. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" + +#if MA_INCLUDE_OFFLINE + +#import "MAOfflineItem.h" +#import "MAOfflineItemCommonCity.h" + +///离线地图，省地图信息 +@interface MAOfflineProvince : MAOfflineItem + +///包含的城市数组(都是MAOfflineItemCommonCity类型) +@property (nonatomic, strong, readonly) NSArray *cities; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlay.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlay.h new file mode 100755 index 00000000..11b82520 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlay.h @@ -0,0 +1,23 @@ +// +// MAOverlay.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import "MAAnnotation.h" +#import "MAGeometry.h" + +///该类是地图覆盖物的基类，所有地图的覆盖物需要继承自此类 +@protocol MAOverlay +@required + +///返回区域中心坐标 +@property (nonatomic, readonly) CLLocationCoordinate2D coordinate; + +///区域外接矩形 +@property (nonatomic, readonly) MAMapRect boundingMapRect; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlayPathRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlayPathRenderer.h new file mode 100755 index 00000000..d4cf0c6f --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlayPathRenderer.h @@ -0,0 +1,41 @@ +// +// MAOverlayPathRenderer.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MAOverlayRenderer.h" +#import "MAPathShowRange.h" + +///该类设置overlay绘制的属性，可以使用该类的子类MACircleRenderer, MAPolylineRenderer, MAPolygonRenderer或者继承该类 +@interface MAOverlayPathRenderer : MAOverlayRenderer + +///填充颜色,默认是kMAOverlayRendererDefaultFillColor +@property (nonatomic, retain) UIColor *fillColor; + +///笔触颜色,默认是kMAOverlayRendererDefaultStrokeColor +@property (nonatomic, retain) UIColor *strokeColor; + +///笔触宽度, 单位屏幕点坐标，默认是0 +@property (nonatomic, assign) CGFloat lineWidth; + +///LineJoin,默认是kMALineJoinBevel +@property (nonatomic, assign) MALineJoinType lineJoinType; + +///LineCap,默认是kMALineCapButt +@property (nonatomic, assign) MALineCapType lineCapType; + +///MiterLimit,默认是2.f +@property (nonatomic, assign) CGFloat miterLimit; + +///是否绘制成虚线, 默认是NO +@property (nonatomic, assign) BOOL lineDash __deprecated_msg("已废弃，请使用lineDashType"); + +///虚线类型, since 5.5.0 +@property (nonatomic, assign) MALineDashType lineDashType; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlayRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlayRenderer.h new file mode 100755 index 00000000..0c1375ed --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAOverlayRenderer.h @@ -0,0 +1,283 @@ +// +// MAOverlayRenderer.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MAOverlay.h" +#import "MALineDrawType.h" + +#define kMAOverlayRendererDefaultStrokeColor [UIColor colorWithRed:0.3 green:0.63 blue:0.89 alpha:0.8] +#define kMAOverlayRendererDefaultFillColor [UIColor colorWithRed:0.77 green:0.88 blue:0.94 alpha:0.8] + +@protocol MAOverlayRenderDelegate; + +///该类是地图覆盖物Renderer的基类, 提供绘制overlay的接口但并无实际的实现（render相关方法只能在重写后的glRender方法中使用） +@interface MAOverlayRenderer : NSObject { + @protected + GLuint _strokeTextureID; + CGSize _strokeTextureSize; + BOOL _needsUpdate; + BOOL _needsLoadStrokeTexture; +} + +///由地图添加时，不要手动设置。如果不是使用mapview进行添加，则需要手动设置。（since 5.1.0） +@property (nonatomic, weak) id rendererDelegate; + +///关联的overlay对象 +@property (nonatomic, readonly, retain) id overlay; + +///用于生成笔触纹理id的图片（支持非PowerOfTwo图片; 如果您需要减轻绘制产生的锯齿,您可以参考AMap.bundle中的traffic_texture_blue.png的方式,在image两边增加部分透明像素.)。（since 5.3.0） +@property (nonatomic, strong) UIImage *strokeImage; + +///笔触纹理id, 修改纹理id参考, 如果strokeImage未指定、尚未加载或加载失败返回0 +@property (nonatomic, readonly) GLuint strokeTextureID; + +///透明度[0，1]，默认为1. 使用MAOverlayRenderer类提供的渲染接口会自动应用此属性。（since 5.1.0） +@property (nonatomic, assign) CGFloat alpha; + +///overlay渲染的scale。（since 5.1.0） +@property (nonatomic, readonly) CGFloat contentScale; + +/** + * @brief 初始化并返回一个Overlay Renderer + * @param overlay 关联的overlay对象 + * @return 初始化成功则返回overlay view,否则返回nil + */ +- (instancetype)initWithOverlay:(id)overlay; + +/** + * @brief 获取当前地图view矩阵，数组长度为16，无需外界释放. 需要添加至地图后，才能获取有效矩阵数据，否则返回NULL + * @return 矩阵数组 + */ +- (float *)getViewMatrix; + +/** + * @brief 获取当前地图projection矩阵，数组长度为16，无需外界释放. 需要添加至地图后，才能获取有效矩阵数据，否则返回NULL + * @return 矩阵数组 + */ +- (float *)getProjectionMatrix; + +/** + * @brief 获取当前地图中心点偏移，用以把地图坐标转换为gl坐标。需要添加到地图获取才有效。（since 5.1.0） + * @return 偏移 + */ +- (MAMapPoint)getOffsetPoint; + +/** + * @brief 获取当前地图缩放级别，需要添加到地图获取才有效。（since 5.1.0） + * @return 缩放级别 + */ +- (CGFloat)getMapZoomLevel; + +/** + * @brief 将MAMapPoint转换为opengles可以直接使用的坐标 + * @param mapPoint MAMapPoint坐标 + * @return 直接支持的坐标 + */ +- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint; + +/** + * @brief 批量将MAMapPoint转换为opengles可以直接使用的坐标 + * @param mapPoints MAMapPoint坐标数据指针 + * @param count 个数 + * @return 直接支持的坐标数据指针(需要调用者手动释放) + */ +- (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count; + +/** + * @brief 将屏幕尺寸转换为OpenGLES尺寸 + * @param windowWidth 屏幕尺寸 + * @return OpenGLES尺寸 + */ +- (CGFloat)glWidthForWindowWidth:(CGFloat)windowWidth; + +/** + * @brief 使用OpenGLES 绘制线 + * @param points OpenGLES坐标系点指针, 参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param pointCount 点个数 + * @param strokeColor 线颜色 + * @param lineWidth OpenGLES支持线宽尺寸, 参考 - (CGFloat)glWidthForWindowWidth:(CGFloat)windowWidth + * @param looped 是否闭合, 如polyline会设置NO, polygon会设置YES + */ +- (void)renderLinesWithPoints:(CGPoint *)points + pointCount:(NSUInteger)pointCount + strokeColor:(UIColor *)strokeColor + lineWidth:(CGFloat)lineWidth + looped:(BOOL)looped __attribute__((deprecated("已废弃")));; + +/** + * @brief 使用OpenGLES 绘制线 + * @param points OpenGLES坐标系点指针, 参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param pointCount 点个数 + * @param strokeColor 线颜色 + * @param lineWidth OpenGLES支持线宽尺寸, 参考 - (CGFloat)glWidthForWindowWidth:(CGFloat)windowWidth + * @param looped 是否闭合, 如polyline会设置NO, polygon会设置YES + * @param lineJoinType 线连接点样式 + * @param lineCapType 线端点样式 + * @param lineDash 虚线类型 + */ +- (void)renderLinesWithPoints:(CGPoint *)points + pointCount:(NSUInteger)pointCount + strokeColor:(UIColor *)strokeColor + lineWidth:(CGFloat)lineWidth + looped:(BOOL)looped + LineJoinType:(MALineJoinType)lineJoinType + LineCapType:(MALineCapType)lineCapType + lineDash:(MALineDashType)lineDash __attribute__((deprecated("已废弃"))); + +/** + * @brief 使用OpenGLES 按指定纹理绘制线 + * @param points OpenGLES坐标系点指针, 参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param pointCount 点个数 + * @param lineWidth 线OpenGLES支持线宽尺寸, 参考 - (CGFloat)glWidthForWindowWidth:(CGFloat)windowWidth + * @param textureID 指定的纹理 + * @param looped 是否闭合, 如polyline会设置NO, polygon会设置YES + */ +- (void)renderTexturedLinesWithPoints:(CGPoint *)points + pointCount:(NSUInteger)pointCount + lineWidth:(CGFloat)lineWidth + textureID:(GLuint)textureID + looped:(BOOL)looped __attribute__((deprecated("已废弃"))); + +/** + * @brief 使用OpenGLES 绘制多纹理线 + * @param points OpenGLES坐标系点指针, 参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param pointCount 点个数 + * @param lineWidth 线OpenGLES支持线宽尺寸, 参考 - (CGFloat)glWidthForWindowWidth:(CGFloat)windowWidth + * @param textureIDs 各段指定的纹理 使用- (BOOL)loadStrokeTextureImages:(NSArray *)textureImages;加载,在strokeTextureIDs属性中获取 + * @param drawStyleIndexes 纹理索引数组，成员为NSNumber,且为非负数，负数按0处理 + * @param looped 是否闭合, 如polyline会设置NO, polygon会设置YES + */ +- (void)renderTexturedLinesWithPoints:(CGPoint *)points + pointCount:(NSUInteger)pointCount + lineWidth:(CGFloat)lineWidth + textureIDs:(NSArray *)textureIDs + drawStyleIndexes:(NSArray *)drawStyleIndexes + looped:(BOOL)looped __attribute__((deprecated("已废弃"))); + + +/** + * @brief 使用OpenGLES 绘制多段颜色线 + * @param points OpenGLES坐标系点指针, 参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param pointCount 点个数 + * @param strokeColors 各段指定的颜色 + * @param drawStyleIndexes 颜色索引数组，成员为NSNumber,且为非负数，负数按0处理 + * @param isGradient 颜色是否渐变 + * @param lineWidth 线OpenGLES支持线宽尺寸, 参考 - (CGFloat)glWidthForWindowWidth:(CGFloat)windowWidth + * @param looped 是否闭合, 如polyline会设置NO, polygon会设置YES + * @param lineJoinType 线连接点样式 + * @param lineCapType 线端点样式 + * @param lineDash 虚线类型 + */ +- (void)renderLinesWithPoints:(CGPoint *)points + pointCount:(NSUInteger)pointCount + strokeColors:(NSArray *)strokeColors + drawStyleIndexes:(NSArray *)drawStyleIndexes + isGradient:(BOOL)isGradient + lineWidth:(CGFloat)lineWidth + looped:(BOOL)looped + LineJoinType:(MALineJoinType)lineJoinType + LineCapType:(MALineCapType)lineCapType + lineDash:(MALineDashType)lineDash __attribute__((deprecated("已废弃"))); + + +/** + * @brief 使用OpenGLES 绘制区域 + * @param points OpenGLES坐标系点指针, 参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param pointCount 点个数 + * @param fillColor 填充颜色 + * @param usingTriangleFan 若必为凸多边形输入YES，可能为凹多边形输入NO + */ +- (void)renderRegionWithPoints:(CGPoint *)points + pointCount:(NSUInteger)pointCount + fillColor:(UIColor *)fillColor + usingTriangleFan:(BOOL)usingTriangleFan __attribute__((deprecated("已废弃"))); + + +/** + * @brief 使用OpenGLES 绘制区域(带轮廓线) \n注意：strokeLineWidth为0 或 strokeColor为nil 时不绘制轮廓线。 + * @param points OpenGLES坐标系点指针, 参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param pointCount 点个数 + * @param fillColor 填充颜色 + * @param strokeColor 轮廓线颜色 + * @param strokeLineWidth 轮廓线宽。OpenGLES支持线宽尺寸, 参考 - (CGFloat)glWidthForWindowWidth:(CGFloat)windowWidth + * @param strokeLineJoinType 轮廓线连接点样式 + * @param strokeLineDash 轮廓虚线类型 + * @param usingTriangleFan 若必为凸多边形输入YES，可能为凹多边形输入NO + */ +- (void)renderStrokedRegionWithPoints:(CGPoint *)points pointCount:(NSUInteger)pointCount + fillColor:(UIColor *)fillColor + strokeColor:(UIColor *)strokeColor + strokeLineWidth:(CGFloat)strokeLineWidth + strokeLineJoinType:(MALineJoinType)strokeLineJoinType + strokeLineDash:(MALineDashType)strokeLineDash + usingTriangleFan:(BOOL)usingTriangleFan __attribute__((deprecated("已废弃"))); + + +/** + * @brief 使用OpenGLES 绘制区域(带纹理轮廓线) \n注意：strokeLineWidth为0 或 strokeTexture为0 时不绘制轮廓线。 + * @param points OpenGLES坐标系点指针, 参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param pointCount 点个数 + * @param fillColor 填充颜色 + * @param strokeLineWidth 轮廓线宽。OpenGLES支持线宽尺寸, 参考 - (CGFloat)glWidthForWindowWidth:(CGFloat)windowWidth + * @param strokeTexture 轮廓线纹理。使用- (void)loadStrokeTextureImage:(UIImage *)textureImage;加载 + * @param usingTriangleFan 若必为凸多边形输入YES，可能为凹多边形输入NO + */ +- (void)renderTextureStrokedRegionWithPoints:(CGPoint *)points + pointCount:(NSUInteger)pointCount + fillColor:(UIColor *)fillColor + strokeTineWidth:(CGFloat)strokeLineWidth + strokeTextureID:(GLuint)strokeTexture + usingTriangleFan:(BOOL)usingTriangleFan __attribute__((deprecated("已废弃"))); + +/** + * @brief 使用OpenGLES 绘制图片 + * @param textureID OpenGLES纹理ID + * @param points OpenGLES坐标系点指针,纹理矩形的四个顶点坐标,其第一个坐标为图片左上角，依次顺时针传入其他顶点 ,参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + */ +- (void)renderIconWithTextureID:(GLuint)textureID points:(CGPoint *)points __attribute__((deprecated("已废弃"))); + +/** + * @brief 使用OpenGLES 绘制图片 + * @param textureID OpenGLES纹理ID + * @param points OpenGLES坐标系点指针,纹理矩形的四个顶点坐标,其第一个坐标为图片左上角，依次顺时针传入其他顶点 ,参考- (CGPoint)glPointForMapPoint:(MAMapPoint)mapPoint, - (CGPoint *)glPointsForMapPoints:(MAMapPoint *)mapPoints count:(NSUInteger)count + * @param modulateColor 调节颜色值, 最终颜色 = 纹理色 * modulateColor. 如只需要调节alpha的话就设置为[red=1, green=1, blue=1, alpha=0.5] + */ +- (void)renderIconWithTextureID:(GLuint)textureID points:(CGPoint *)points modulateColor:(UIColor *)modulateColor __attribute__((deprecated("已废弃"))); + +/** + * @brief 绘制函数(子类需要重载来实现) + */ +- (void)glRender; + +/** + * @brief 加载纹理图片，纹理ID存储在成员strokeTextureID中。纹理图片为nil时，清空原有纹理 + * @param textureImage 纹理图片（需满足：长宽相等，且宽度值为2的次幂）。若为nil，则清空原有纹理 + * @return openGL纹理ID, 若纹理加载失败返回0 + */ +- (GLuint)loadStrokeTextureImage:(UIImage *)textureImage __attribute__((deprecated("已废弃, 请通过属性strokeImage设置"))); + +/** + * @brief 加载纹理图片（since 5.1.0） + * @param textureImage 纹理图片（需满足：长宽相等，且宽度值为2的次幂) + * @return openGL纹理ID, 若纹理加载失败返回0 + */ +- (GLuint)loadTexture:(UIImage *)textureImage; + +/** + @brief 删除纹理（since 5.1.0） + @param textureId 纹理ID + */ +- (void)deleteTexture:(GLuint)textureId; + +/** + * @brief 当关联overlay对象有更新时，调用此接口刷新. since 5.0.0 + */ +- (void)setNeedsUpdate; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlay.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlay.h new file mode 100644 index 00000000..48ef2490 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlay.h @@ -0,0 +1,39 @@ +// +// MAParticleOverlay.h +// MAMapKit +// +// Created by liubo on 2018/9/19. +// Copyright © 2018年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_ParticleSystem + +#import "MAShape.h" +#import "MAOverlay.h" +#import "MAParticleOverlayOptions.h" + +#pragma mark - MAParticleOverlay + +///该类用于定义一个粒子MAParticleOverlay, 通常MAParticleOverlay是MAParticleOverlayRenderer的model. since 6.5.0 +@interface MAParticleOverlay : MAShape + +/** + * @brief 根据粒子覆盖物选项option生成MAParticleOverlay + * @param option 粒子覆盖物选项option + * @return 新生成的粒子覆盖物MAParticleOverlay + */ ++ (instancetype)particleOverlayWithOption:(MAParticleOverlayOptions *)option; + +///当前粒子覆盖物的option，如果需要修改option的配置，需要修改后重新调用setOverlayOption:方法。 +@property (nonatomic, strong, readonly) MAParticleOverlayOptions *overlayOption; + +/** + * @brief 更新粒子覆盖物选项option + * @param overlayOption 要更新的粒子覆盖物选项 + */ +- (void)updateOverlayOption:(MAParticleOverlayOptions *)overlayOption; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlayOptions.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlayOptions.h new file mode 100644 index 00000000..10404c67 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlayOptions.h @@ -0,0 +1,297 @@ +// +// MAParticleOverlayOptions.h +// MAMapKit +// +// Created by liubo on 2018/9/18. +// Copyright © 2018年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_ParticleSystem + +#import "MAShape.h" +#import "MAOverlay.h" + +#pragma mark - MAParticleOverlayType + +///天气类型 +typedef NS_ENUM(NSInteger, MAParticleOverlayType) +{ + MAParticleOverlayTypeSunny = 1, ///<晴天 + MAParticleOverlayTypeRain, ///<雨天 + MAParticleOverlayTypeSnowy, ///<雪天 + MAParticleOverlayTypeHaze, ///<雾霾 +}; + +#pragma mark - MAParticleVelocityGenerate + +///粒子的速度生成类. since 6.5.0 +@protocol MAParticleVelocityGenerate +@required + +///X轴方向上的速度变化率 +- (CGFloat)getX; + +///Y轴方向上的速度变化率 +- (CGFloat)getY; + +///Z轴方向上的速度变化率 +- (CGFloat)getZ; +@end + +#pragma mark - MAParticleRandomVelocityGenerate + +///粒子的随机速度生成类. since 6.5.0 +@interface MAParticleRandomVelocityGenerate : NSObject + +/** + * @brief 根据速度范围值生成粒子的速度变化类 + * @param x1 起始的速度x值 + * @param y1 起始的速度y值 + * @param z1 起始的速度z值 + * @param x2 结束的速度x值 + * @param y2 结束的速度y值 + * @param z2 结束的速度z值 + * @return 生成粒子的颜色变化类 + */ +- (instancetype)initWithBoundaryValueX1:(float)x1 Y1:(float)y1 Z1:(float)z1 X2:(float)x2 Y2:(float)y2 Z2:(float)z2; + +@end + +#pragma mark - MAParticleColorGenerate + +///粒子的颜色生成类. since 6.5.0 +@protocol MAParticleColorGenerate +@required +///生成的颜色值，需为包含四个float值的数组。 +- (float *)getColor; +@end + +#pragma mark - MAParticleRandomColorGenerate + +///粒子的随机颜色生成类. since 6.5.0 +@interface MAParticleRandomColorGenerate : NSObject + +/** + * @brief 根据颜色范围值生成粒子的颜色变化类 + * @param r1 起始的颜色r值 + * @param g1 起始的颜色g值 + * @param b1 起始的颜色b值 + * @param a1 起始的颜色a值 + * @param r2 结束的颜色r值 + * @param g2 结束的颜色g值 + * @param b2 结束的颜色b值 + * @param a2 结束的颜色a值 + * @return 生成粒子的颜色变化类 + */ +- (instancetype)initWithBoundaryColorR1:(float)r1 G1:(float)g1 B1:(float)b1 A1:(float)a1 R2:(float)r2 G2:(float)g2 B2:(float)b2 A2:(float)a2; + +@end + +#pragma mark - MAParticleRotationGenerate + +///粒子的角度生成类. since 6.5.0 +@protocol MAParticleRotationGenerate +@required +///生成的角度值 +- (float)getRotate; +@end + +#pragma mark - MAParticleConstantRotationGenerate + +///粒子的固定角度生成类. since 6.5.0 +@interface MAParticleConstantRotationGenerate : NSObject + +/** + * @brief 根据角度生成粒子的角度变化类 + * @param rotate 固定的角度 + * @return 生成粒子的角度变化类 + */ +- (instancetype)initWithRotate:(float)rotate; + +@end + +#pragma mark - MAParticleSizeGenerate + +///粒子的大小生成类. since 6.5.0 +@protocol MAParticleSizeGenerate +@required + +///X轴上变化比例 +- (float)getSizeX:(float)timeFrame; + +///Y轴上变化比例 +- (float)getSizeY:(float)timeFrame; + +///Z轴上变化比例 +- (float)getSizeZ:(float)timeFrame; +@end + +#pragma mark - MAParticleCurveSizeGenerate + +///粒子的大小变化类. since 6.5.0 +@interface MAParticleCurveSizeGenerate : NSObject + +/** + * @brief 根据三个轴上的变化比例生成粒子的大小变化类 + * @param x X轴上变化比例 + * @param y Y轴上变化比例 + * @param z Z轴上变化比例 + * @return 生成粒子的大小变化类 + */ +- (instancetype)initWithCurveX:(float)x Y:(float)y Z:(float)z; + +@end + +#pragma mark - MAParticleEmissionModule + +///粒子的发射率类，每隔多少时间发射粒子数量，越多会越密集. since 6.5.0 +@interface MAParticleEmissionModule : NSObject + +/** + * @brief 根据发射数量和发射间隔生成粒子的发射率类。关系为:"发射数量为rate粒子->等待rateTime间隔->发射数量为rate粒子->等待rateTime间隔"循环 + * @param rate 发射数量(不能为0) + * @param rateTime 发射间隔 + * @return 生成粒子的发射率类 + */ +- (instancetype)initWithEmissionRate:(int)rate rateTime:(int)rateTime; + +@end + +#pragma mark - MAParticleShapeModule + +///粒子的发射区域模型协议. since 6.5.0 +@protocol MAParticleShapeModule +@required + +///新生成的发射点坐标，需为包含三个float值的数组。 +- (float *)getPoint; + +///坐标是否按比例生成 +- (BOOL)isRatioEnable; +@end + +#pragma mark - MAParticleSinglePointShapeModule + +///粒子的发射单个点区域模型. since 6.5.0 +@interface MAParticleSinglePointShapeModule : NSObject + +/** + * @brief 生成粒子的发射矩形区域模型，以比例的形式设置发射区域 + * @param x x坐标比例 + * @param y y坐标比例 + * @param z z坐标比例 + * @param isUseRatio 是否按比例 + * @return 新生成的粒子发射单个点区域模型 + */ +- (instancetype)initWithShapeX:(float)x Y:(float)y Z:(float)z useRatio:(BOOL)isUseRatio; + +@end + +#pragma mark - MAParticleRectShapeModule + +///粒子的发射矩形区域模型. since 6.5.0 +@interface MAParticleRectShapeModule : NSObject + +/** + * @brief 生成粒子的发射矩形区域模型，以比例的形式设置发射区域。 + * @param left 左边距比例 + * @param top 上边距比例 + * @param right 右边距比例 + * @param bottom 下边距比例 + * @param isUseRatio 是否按比例 + * @return 新生成的粒子发射矩形区域模型 + */ +- (instancetype)initWithLeft:(float)left top:(float)top right:(float)right bottom:(float)bottom useRatio:(BOOL)isUseRatio; + +@end + +#pragma mark - MAParticleOverLifeModule + +///粒子生命周期过程中状态变化，包含速度、旋转和颜色的变化. since 6.5.0 +@interface MAParticleOverLifeModule : NSObject + +/** + * @brief 设置粒子生命周期过程中速度的变化 + * @param velocity 遵循MAParticleVelocityGenerate协议的速度生成类 + */ +- (void)setVelocityOverLife:(id)velocity; + +/** + * @brief 设置粒子生命周期过程中角度的变化 + * @param rotation 遵循MAParticleRotationGenerate协议的角度生成类 + */ +- (void)setRotationOverLife:(id)rotation; + +/** + * @brief 设置粒子生命周期过程中大小的变化 + * @param size 遵循MAParticleSizeGenerate协议的大小生成类 + */ +- (void)setSizeOverLife:(id)size; + +/** + * @brief 设置粒子生命周期过程中颜色的变化 + * @param color 遵循MAParticleColorGenerate协议的颜色生成类 + */ +- (void)setColorOverLife:(id)color; + +@end + +#pragma mark - MAParticleOverlayOptions + +///该类用于定义一个粒子覆盖物显示选项. since 6.5.0 +@interface MAParticleOverlayOptions : NSObject + +///option选项是否可见. (默认YES) +@property (nonatomic, assign) BOOL visibile; + +///粒子系统存活时间. (默认5000,单位毫秒) +@property (nonatomic, assign) NSTimeInterval duration; + +///粒子系统是否循环. (默认YES) +@property (nonatomic, assign) BOOL loop; + +///粒子系统的粒子最大数量. (默认100) +@property (nonatomic, assign) NSInteger maxParticles; + +///粒子系统的粒子图标. (默认nil) +@property (nonatomic, strong) UIImage *icon; + +///每个粒子的初始大小. (默认(32.f*[[UIScreen mainScreen] nativeScale], 32.f*[[UIScreen mainScreen] nativeScale]),单位:OpenGLESPixels数量，计算方式为: OpenGLESPixels = ScreenPoint数量 * [[UIScreen mainScreen] nativeScale]) +@property (nonatomic, assign) CGSize startParticleSize; + +///每个粒子的存活时间. (默认5000,单位毫秒) +@property (nonatomic, assign) NSTimeInterval particleLifeTime; + +///每个粒子的初始颜色. (默认nil) +@property (nonatomic, strong) id particleStartColor; + +///每个粒子的初始速度. (默认nil) +@property (nonatomic, strong) id particleStartSpeed; + +///粒子的发射率,参考 MAParticleEmissionModule 类. (默认nil) +@property (nonatomic, strong) MAParticleEmissionModule *particleEmissionModule; + +///粒子的发射区域模型. (默认nil) +@property (nonatomic, strong) id particleShapeModule; + +///粒子生命周期过程,参考 MAParticleOverLifeModule 类. (默认nil) +@property (nonatomic, strong) MAParticleOverLifeModule *particleOverLifeModule; + +@end + +#pragma mark - MAParticleOverlayOptionsFactory + +///该类用于根据指定的天气类型，生成SDK内置的天气粒子覆盖物显示选项option. since 6.5.0 +@interface MAParticleOverlayOptionsFactory : NSObject + +/** + * @brief 根据指定的天气类型生成粒子覆盖物显示选项option + * @param particleType 天气类型 + * @return 新生成的粒子覆盖物显示选项option + */ ++ (NSArray *)particleOverlayOptionsWithType:(MAParticleOverlayType)particleType; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlayRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlayRenderer.h new file mode 100644 index 00000000..00bb3667 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAParticleOverlayRenderer.h @@ -0,0 +1,31 @@ +// +// MAParticleOverlayRenderer.h +// MAMapKit +// +// Created by liubo on 2018/9/19. +// Copyright © 2018年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_ParticleSystem + +#import "MAOverlayRenderer.h" +#import "MAParticleOverlayOptions.h" +#import "MAParticleOverlay.h" + +///该类是MAParticleOverlay的显示Renderer. since 6.5.0 +@interface MAParticleOverlayRenderer : MAOverlayRenderer + +///关联的MAParticleOverlay model +@property (nonatomic, readonly) MAParticleOverlay *particleOverlay; + +/** + * @brief 根据指定MAParticleOverlay生成对应的Renderer + * @param particleOverlay 指定的MAParticleOverlay model + * @return 生成的Renderer + */ +- (instancetype)initWithParticleOverlay:(MAParticleOverlay *)particleOverlay; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPathShowRange.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPathShowRange.h new file mode 100644 index 00000000..b824849b --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPathShowRange.h @@ -0,0 +1,24 @@ +// +// MAPathShowRange.h +// MAMapKit +// +// Created by shaobin on 2019/12/31. +// Copyright © 2019 Amap. All rights reserved. +// + +#ifndef MAPathShowRange_h +#define MAPathShowRange_h + +struct MAPathShowRange { + float begin; ///<起点位置，整数部分表示起点索引，小数部分表示在线段上的位置 + float end; ///<终点位置，整数部分表示起点索引，小数部分表示在线段上的位置 +}; + +typedef struct MAPathShowRange MAPathShowRange; + +static inline MAPathShowRange MAPathShowRangeMake(float begin, float end) { + return (MAPathShowRange){begin, end}; +} + + +#endif /* MAPathShowRange_h */ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPinAnnotationView.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPinAnnotationView.h new file mode 100644 index 00000000..e6e866c8 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPinAnnotationView.h @@ -0,0 +1,29 @@ +// +// MAPinAnnotationView.h +// MAMapKitDemo +// +// Created by songjian on 13-1-7. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import "MAMapView.h" +#import "MAAnnotationView.h" + +///MAPinAnnotationColor +typedef NS_ENUM(NSInteger, MAPinAnnotationColor){ + MAPinAnnotationColorRed = 0, ///< 红色大头针 + MAPinAnnotationColorGreen, ///< 绿色大头针 + MAPinAnnotationColorPurple ///< 紫色大头针 +}; + +///提供类似大头针效果的annotation view +@interface MAPinAnnotationView : MAAnnotationView + +///大头针的颜色 +@property (nonatomic) MAPinAnnotationColor pinColor; + +///添加到地图时是否使用下落动画效果 +@property (nonatomic) BOOL animatesDrop; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPointAnnotation.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPointAnnotation.h new file mode 100644 index 00000000..207b7249 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPointAnnotation.h @@ -0,0 +1,25 @@ +// +// MAPointAnnotation.h +// MAMapKitDemo +// +// Created by songjian on 13-1-7. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import "MAShape.h" +#import + +///点标注数据 +@interface MAPointAnnotation : MAShape + +///经纬度 +@property (nonatomic, assign) CLLocationCoordinate2D coordinate; + +///是否固定在屏幕一点, 注意，拖动或者手动改变经纬度，都会导致设置失效 +@property (nonatomic, assign, getter = isLockedToScreen) BOOL lockedToScreen; + +///固定屏幕点的坐标 +@property (nonatomic, assign) CGPoint lockedScreenPoint; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolygon.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolygon.h new file mode 100755 index 00000000..409be609 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolygon.h @@ -0,0 +1,51 @@ +// +// MAPolygon.h +// MAMapKit +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MAMultiPoint.h" +#import "MAOverlay.h" + +///此类用于定义一个由多个点组成的闭合多边形, 点与点之间按顺序尾部相连, 第一个点与最后一个点相连, 通常MAPolygon是MAPolygonView的model +@interface MAPolygon : MAMultiPoint + +///设置中空区域，用来创建中间带空洞的复杂图形。注意：传入的overlay只支持MAPolgon类型和MACircle类型,不支持与polygon边相交或在polygon外部,不支持hollowShapes彼此间相交,和空洞顺序有关,不支持嵌套. since 5.5.0 +@property (nonatomic, strong) NSArray> *hollowShapes; + +/** + * @brief 根据经纬度坐标数据生成闭合多边形 + * @param coords 经纬度坐标点数据,coords对应的内存会拷贝,调用者负责该内存的释放 + * @param count 经纬度坐标点数组个数 + * @return 新生成的多边形 + */ ++ (instancetype)polygonWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count; + +/** + * @brief 根据map point数据生成多边形 + * @param points map point数据,points对应的内存会拷贝,调用者负责该内存的释放 + * @param count 点的个数 + * @return 新生成的多边形 + */ ++ (instancetype)polygonWithPoints:(MAMapPoint *)points count:(NSUInteger)count; + +/** + * @brief 重新设置多边形顶点. since 5.0.0 + * @param points 指定的直角坐标点数组, C数组，内部会做copy，调用者负责内存管理 + * @param count 坐标点的个数 + * @return 是否设置成功 + */ +- (BOOL)setPolygonWithPoints:(MAMapPoint *)points count:(NSInteger)count; + +/** + * @brief 重新设置多边形顶点. since 5.0.0 + * @param coords 指定的经纬度坐标点数组, C数组，内部会做copy，调用者负责内存管理 + * @param count 坐标点的个数 + * @return 是否设置成功 + */ +- (BOOL)setPolygonWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSInteger)count; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolygonRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolygonRenderer.h new file mode 100755 index 00000000..af97f82a --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolygonRenderer.h @@ -0,0 +1,27 @@ +// +// MAPolygonRenderer.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MAPolygon.h" +#import "MAOverlayPathRenderer.h" + +///此类用于绘制MAPolygon,可以通过MAOverlayPathRenderer修改其fill和stroke attributes +@interface MAPolygonRenderer : MAOverlayPathRenderer + +///关联的MAPolygon model +@property (nonatomic, readonly) MAPolygon *polygon; + +/** + * @brief 根据指定的多边形生成一个多边形Renderer + * @param polygon polygon 指定的多边形数据对象 + * @return 新生成的多边形Renderer + */ +- (instancetype)initWithPolygon:(MAPolygon *)polygon; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolyline.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolyline.h new file mode 100755 index 00000000..6772ddf6 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolyline.h @@ -0,0 +1,48 @@ +// +// MAPolyline.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import "MAMultiPoint.h" +#import "MAOverlay.h" + +///此类用于定义一个由多个点相连的多段线，点与点之间尾部相连但第一点与最后一个点不相连, 通常MAPolyline是MAPolylineView的model +@interface MAPolyline : MAMultiPoint + +/** + * @brief 根据map point数据生成多段线 + * @param points map point数据,points对应的内存会拷贝,调用者负责该内存的释放 + * @param count map point个数 + * @return 生成的多段线 + */ ++ (instancetype)polylineWithPoints:(MAMapPoint *)points count:(NSUInteger)count; + +/** + * @brief 根据经纬度坐标数据生成多段线 + * @param coords 经纬度坐标数据,coords对应的内存会拷贝,调用者负责该内存的释放 + * @param count 经纬度坐标个数 + * @return 生成的多段线 + */ ++ (instancetype)polylineWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count; + +/** + * @brief 重新设置折线坐标点. since 5.0.0 + * @param points 指定的直角坐标点数组, C数组，内部会做copy，调用者负责内存管理 + * @param count 坐标点的个数 + * @return 是否设置成功 + */ +- (BOOL)setPolylineWithPoints:(MAMapPoint *)points count:(NSInteger)count; + +/** + * @brief 重新设置折线坐标点. since 5.0.0 + * @param coords 指定的经纬度坐标点数组, C数组，内部会做copy，调用者负责内存管理 + * @param count 坐标点的个数 + * @return 是否设置成功 + */ +- (BOOL)setPolylineWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSInteger)count; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolylineRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolylineRenderer.h new file mode 100755 index 00000000..705db464 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAPolylineRenderer.h @@ -0,0 +1,46 @@ +// +// MAPolylineRenderer.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MAPolyline.h" +#import "MAOverlayPathRenderer.h" +#import "MAPathShowRange.h" + +///此类用于绘制MAPolyline,可以通过MAOverlayPathRenderer修改其fill和stroke attributes +@interface MAPolylineRenderer : MAOverlayPathRenderer + +///关联的MAPolyline model +@property (nonatomic, readonly) MAPolyline *polyline; + +///设置是否显示3d箭头线, 默认为NO。如果设置为YES，则为3d箭头线。since 6.7.0 +@property (nonatomic, assign) BOOL is3DArrowLine; + +///设置为立体3d箭头的侧边颜色（当is3DArrowLine为YES时有效)顶部颜色使用strokeColor。since 6.7.0 +@property (nonatomic, strong) UIColor *sideColor; + +///是否开启点击选中功能，默认NO. since 7.1.0 +@property (nonatomic, assign) BOOL userInteractionEnabled; + +///用于调整点击选中热区大小，默认为0. 负值增大热区，正值减小热区. since 7.1.0 +@property (nonatomic, assign) CGFloat hitTestInset; + +///是否启用显示范围，YES启用，不启用时展示全路径 since 7.5.0 +@property (nonatomic, assign) BOOL showRangeEnabled; + +///显示范围 since 7.5.0 +@property (nonatomic, assign) MAPathShowRange showRange; + +/** + * @brief 根据指定的MAPolyline生成一个多段线Renderer + * @param polyline 指定MAPolyline + * @return 新生成的多段线Renderer + */ +- (instancetype)initWithPolyline:(MAPolyline *)polyline; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAShape.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAShape.h new file mode 100755 index 00000000..0745a908 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAShape.h @@ -0,0 +1,26 @@ +// +// MAShape.h +// MAMapKit +// +// +// Copyright (c) 2011年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MAAnnotation.h" + +///该类为一个抽象类，定义了基于MAAnnotation的MAShape类的基本属性和行为，不能直接使用，必须子类化之后才能使用 +@interface MAShape : NSObject { + + NSString *_title; ///<标题 + NSString *_subtitle; ///<副标题 +} + +///标题 +@property (nonatomic, copy) NSString *title; + +///副标题 +@property (nonatomic, copy) NSString *subtitle; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATileOverlay.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATileOverlay.h new file mode 100644 index 00000000..7dfa701a --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATileOverlay.h @@ -0,0 +1,81 @@ +// +// MATileOverlay.h +// MapKit_static +// +// Created by Li Fei on 11/22/13. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_TILE + +#import "MAOverlay.h" + +///该类是覆盖在球面墨卡托投影上的图片tiles的数据源 +@interface MATileOverlay : NSObject + +///瓦片大小，默认是256x256, 最小支持64*64 +@property (nonatomic, assign) CGSize tileSize; + +///tileOverlay的可见最小Zoom值 +@property NSInteger minimumZ; + +///tileOverlay的可见最大Zoom值 +@property NSInteger maximumZ; + +///同initWithURLTemplate:中的URLTemplate +@property (readonly) NSString *URLTemplate; + +///暂未开放 +@property (nonatomic) BOOL canReplaceMapContent; + +///区域外接矩形，可用来设定tileOverlay的可渲染区域 +@property (nonatomic) MAMapRect boundingMapRect; + +///是否停止不在显示区域内的瓦片下载，默认NO. since 5.3.0 +@property (nonatomic, assign) BOOL disableOffScreenTileLoading; + +/** + * @brief 根据指定的URLTemplate生成tileOverlay + * @param URLTemplate URLTemplate是一个包含"{x}","{y}","{z}","{scale}"的字符串,"{x}","{y}","{z}","{scale}"会被tile path的值所替换，并生成用来加载tile图片数据的URL 。例如 http://server/path?x={x}&y={y}&z={z}&scale={scale} + * @return 以指定的URLTemplate字符串生成tileOverlay + */ +- (id)initWithURLTemplate:(NSString *)URLTemplate; + +@end + +///MATileOverlayPath +struct MATileOverlayPath{ + NSInteger x; ///< x坐标 + NSInteger y; ///< y坐标 + NSInteger z; ///< 缩放级别 + CGFloat contentScaleFactor; ///< 屏幕的scale factor +}; +typedef struct MATileOverlayPath MATileOverlayPath; + +///子类可覆盖CustomLoading中的方法来自定义加载MATileOverlay的行为。 +@interface MATileOverlay (CustomLoading) + +/** + * @brief 以tile path生成URL。用于加载tile,此方法默认填充URLTemplate + * @param path tile path + * @return 以tile path生成tileOverlay + */ +- (NSURL *)URLForTilePath:(MATileOverlayPath)path; + +/** + * @brief 加载被请求的tile,并以tile数据或加载tile失败error访问回调block;默认实现为首先用URLForTilePath去获取URL,然后用异步NSURLConnection加载tile + * @param path tile path + * @param result 用来传入tile数据或加载tile失败的error访问的回调block + */ +- (void)loadTileAtPath:(MATileOverlayPath)path result:(void (^)(NSData *tileData, NSError *error))result; + +/** + * @brief 取消请求瓦片，当地图显示区域发生变化时，会取消显示区域外的瓦片的下载, 当disableOffScreenTileLoading=YES时会被调用。since 5.3.0 + * @param path tile path + */ +- (void)cancelLoadOfTileAtPath:(MATileOverlayPath)path; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATileOverlayRenderer.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATileOverlayRenderer.h new file mode 100644 index 00000000..58a4f140 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATileOverlayRenderer.h @@ -0,0 +1,35 @@ +// +// MATileOverlayRenderer.h +// MapKit_static +// +// Created by Li Fei on 11/25/13. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#if MA_INCLUDE_OVERLAY_TILE + +#import "MAOverlayRenderer.h" +#import "MATileOverlay.h" + +///此类是将MAOverlayRenderer中的覆盖tiles显示在地图上的Renderer +@interface MATileOverlayRenderer : MAOverlayRenderer + +///覆盖在球面墨卡托投影上的图片tiles的数据源 +@property (nonatomic ,readonly) MATileOverlay *tileOverlay; + +/** + * @brief 根据指定的tileOverlay生成将tiles显示在地图上的Renderer + * @param tileOverlay 制定了覆盖图片 + * @return 以tileOverlay新生成Renderer + */ +- (instancetype)initWithTileOverlay:(MATileOverlay *)tileOverlay; + +/** + * @brief 清除所有tile的缓存，并刷新overlay + */ +- (void)reloadData; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATouchPoi.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATouchPoi.h new file mode 100644 index 00000000..eb7186ca --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATouchPoi.h @@ -0,0 +1,25 @@ +// +// MATouchPoi.h +// MapKit_static +// +// Created by songjian on 13-7-17. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import + +///MATouchPoi 定义 +@interface MATouchPoi : NSObject + +///名称 +@property (nonatomic, copy, readonly) NSString *name; + +///经纬度坐标 +@property (nonatomic, assign, readonly) CLLocationCoordinate2D coordinate; + +///poi的ID +@property (nonatomic, copy, readonly) NSString *uid; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATraceLocation.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATraceLocation.h new file mode 100644 index 00000000..1097a8de --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATraceLocation.h @@ -0,0 +1,42 @@ +// +// MATraceLocation.h +// MAMapKit +// +// Created by shaobin on 16/9/1. +// Copyright © 2016年 Amap. All rights reserved. +// + + + +#import "MAConfig.h" + +#if MA_INCLUDE_TRACE_CORRECT + +#import +#import + +///返回轨迹点定义 +@interface MATracePoint : NSObject + +///纬度坐标 +@property (nonatomic, assign) CLLocationDegrees latitude; +///经度坐标 +@property (nonatomic, assign) CLLocationDegrees longitude; + +@end + +///传入轨迹点定义 +@interface MATraceLocation : NSObject + +///经纬度坐标 +@property (nonatomic, assign) CLLocationCoordinate2D loc; +///角度, 标识移动方向，单位度 +@property (nonatomic, assign) double angle; +///速度，单位km/h +@property (nonatomic, assign) double speed; +///时间，单位毫秒 +@property (nonatomic, assign) double time; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATraceManager.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATraceManager.h new file mode 100644 index 00000000..e1a4e173 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MATraceManager.h @@ -0,0 +1,115 @@ +// +// MATraceManager.h +// MAMapKit +// +// Created by shaobin on 16/9/1. +// Copyright © 2016年 Amap. All rights reserved. +// + + + +#import "MAConfig.h" + +#if MA_INCLUDE_TRACE_CORRECT + +#import +#import +#import "MATraceLocation.h" + +@class MATraceManager; + +///处理中回调， index: 批次编号，0 based +typedef void(^MAProcessingCallback)(int index, NSArray *points); + +///成功回调，distance：距离，单位米 +typedef void(^MAFinishCallback)(NSArray *points, double distance); + +///失败回调 +typedef void(^MAFailedCallback)(int errorCode, NSString *errorDesc); + +///定位回调, locations: 原始定位点; tracePoints: 纠偏后的点，如果纠偏失败返回nil; distance:距离; error: 纠偏失败时的错误信息 +typedef void(^MATraceLocationCallback)(NSArray *locations, NSArray *tracePoints, double distance, NSError *error); + +/** + * @brief 轨迹定位的代理协议，since v6.2.0 +*/ +@protocol MATraceDelegate + +@required + +/** + * @brief 轨迹定位纠偏的回调方法，since v6.2.0 + * @param manager 轨迹定位管理对象 + * @param locations 已经完成纠偏的原始定位数据 + * @param tracePoints 已经完成纠偏处理后的轨迹点 + * @param distance 距离，单位米 + * @param error 如果成功的话为nil，否则为失败原因 + */ +- (void)traceManager:(MATraceManager *)manager + didTrace:(NSArray *)locations + correct:(NSArray *)tracePoints + distance:(double)distance + withError:(NSError *)error; + +@optional +/** + * @brief 当plist配置NSLocationAlwaysUsageDescription或者NSLocationAlwaysAndWhenInUseUsageDescription，并且[CLLocationManager authorizationStatus] == kCLAuthorizationStatusNotDetermined，会调用代理的此方法。 + 此方法实现调用后台权限API即可（ 该回调必须实现 [locationManager requestAlwaysAuthorization] ）; since 6.8.1 + * @param locationManager 地图的CLLocationManager。 + */ +- (void)mapViewRequireLocationAuth:(CLLocationManager *)locationManager; + +@end + +///轨迹纠偏管理类 +@interface MATraceManager : NSObject + +/** + * @brief 单例方法 + */ ++ (instancetype)sharedInstance; + +/** + * @brief 获取纠偏后的经纬度点集 + * @param locations 待纠偏处理的点集, 顺序即为传入的顺序 + * @param type loctions经纬度坐标的类型, 如果已经是高德坐标系，传 -1 + * @param processingCallback 如果一次传入点过多，内部会分批处理。每处理完一批就调用此回调 + * @param finishCallback 全部处理完毕调用此回调 + * @param failedCallback 失败调用此回调 + * @return 返回一个NSOperation对象，可调用cancel取消 + */ +- (NSOperation *)queryProcessedTraceWith:(NSArray*)locations + type:(AMapCoordinateType)type + processingCallback:(MAProcessingCallback)processingCallback + finishCallback:(MAFinishCallback)finishCallback + failedCallback:(MAFailedCallback)failedCallback; + +/** + * @brief 开始轨迹定位, 内部使用系统CLLocationManager，distanceFilter，desiredAccuracy均为系统默认值 + * @param locCallback 定位回调, 回调中返回坐标类型为AMapCoordinateTypeGPS + */ +- (void)startTraceWith:(MATraceLocationCallback)locCallback __attribute__((deprecated("use start instead"))); + +/** + * @brief 停止轨迹定位 + */ +- (void)stopTrace __attribute__((deprecated("use stop instead"))); + +/** + * @brief 轨迹定位的代理回调对象，配合start和stop方法使用，since v6.2.0 + */ +@property (nonatomic, weak) id delegate; + +/** + * @brief 开始轨迹定位, 内部使用系统CLLocationManager，distanceFilter，desiredAccuracy均为系统默认值，since v6.2.0 + */ +- (void)start; + +/** + * @brief 停止轨迹定位，since v6.2.0 + */ +- (void)stop; + +@end + +#endif diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAUserLocation.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAUserLocation.h new file mode 100755 index 00000000..42a1f05c --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAUserLocation.h @@ -0,0 +1,28 @@ +// +// MAUserLocation.h +// MAMapKit +// +// Created by yin cai on 12-1-4. +// Copyright © 2016 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import "MAAnimatedAnnotation.h" + +@class CLLocation; +@class CLHeading; + +///定位信息类 +@interface MAUserLocation : MAAnimatedAnnotation + +///位置更新状态，如果正在更新位置信息，则该值为YES +@property (readonly, nonatomic, getter = isUpdating) BOOL updating; + +///位置信息，如果MAMapView的showsUserLocation为NO，或者尚未定位成功，则该值为nil +@property (readonly, nonatomic, strong) CLLocation *location; + +///heading信息 +@property (readonly, nonatomic, strong) CLHeading *heading; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAUserLocationRepresentation.h b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAUserLocationRepresentation.h new file mode 100644 index 00000000..e9eb228d --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Headers/MAUserLocationRepresentation.h @@ -0,0 +1,38 @@ +// +// MAUserLocationRepresentation.h +// MAMapKit +// +// Created by shaobin on 16/12/27. +// Copyright © 2016年 Amap. All rights reserved. +// + +#import "MAConfig.h" +#import +#import + +#define kAccuracyCircleDefaultColor [UIColor colorWithRed:136/255.0 green:166/255.0 blue:227/255.0 alpha:.3] + +///用户位置显示样式控制 +@interface MAUserLocationRepresentation : NSObject + +///精度圈是否显示，默认YES +@property (nonatomic, assign) BOOL showsAccuracyRing; +///是否显示方向指示(MAUserTrackingModeFollowWithHeading模式开启)。默认为YES +@property (nonatomic, assign) BOOL showsHeadingIndicator; +///精度圈 填充颜色, 默认 kAccuracyCircleDefaultColor +@property (nonatomic, strong) UIColor *fillColor; +///精度圈 边线颜色, 默认 kAccuracyCircleDefaultColor +@property (nonatomic, strong) UIColor *strokeColor; +///精度圈 边线宽度，默认0 +@property (nonatomic, assign) CGFloat lineWidth; + +///定位点背景色，不设置默认白色 +@property (nonatomic, strong) UIColor *locationDotBgColor; +///定位点蓝色圆点颜色，不设置默认蓝色 +@property (nonatomic, strong) UIColor *locationDotFillColor; +///内部蓝色圆点是否使用律动效果, 默认YES +@property (nonatomic, assign) BOOL enablePulseAnnimation; +///定位图标, 与蓝色原点互斥 +@property (nonatomic, strong) UIImage* image; + +@end diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/MAMapKit b/ios/UniMPSDK/Libs/MAMapKit.framework/MAMapKit new file mode 100644 index 00000000..5290ddcf Binary files /dev/null and b/ios/UniMPSDK/Libs/MAMapKit.framework/MAMapKit differ diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/Modules/module.modulemap b/ios/UniMPSDK/Libs/MAMapKit.framework/Modules/module.modulemap new file mode 100644 index 00000000..05888e45 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module MAMapKit { + umbrella header "MAMapKit.h" + + export * + module * { export * } +} diff --git a/ios/UniMPSDK/Libs/MAMapKit.framework/version.txt b/ios/UniMPSDK/Libs/MAMapKit.framework/version.txt new file mode 100644 index 00000000..15e5c161 --- /dev/null +++ b/ios/UniMPSDK/Libs/MAMapKit.framework/version.txt @@ -0,0 +1 @@ +7.8.0+3dmap.df50d18d.1065 diff --git a/ios/UniMPSDK/Libs/libAMapLocationPlugin.a b/ios/UniMPSDK/Libs/libAMapLocationPlugin.a new file mode 100644 index 00000000..20f4e63f Binary files /dev/null and b/ios/UniMPSDK/Libs/libAMapLocationPlugin.a differ diff --git a/ios/UniMPSDK/Libs/libDCUniAmap.a b/ios/UniMPSDK/Libs/libDCUniAmap.a new file mode 100644 index 00000000..a3b3c1d2 Binary files /dev/null and b/ios/UniMPSDK/Libs/libDCUniAmap.a differ diff --git a/ios/UniMPSDK/Libs/libDCUniMap.a b/ios/UniMPSDK/Libs/libDCUniMap.a new file mode 100644 index 00000000..fc3664e8 Binary files /dev/null and b/ios/UniMPSDK/Libs/libDCUniMap.a differ diff --git a/ios/UniMPSDK/Libs/liblibGeolocation.a b/ios/UniMPSDK/Libs/liblibGeolocation.a new file mode 100644 index 00000000..6c9a44f6 Binary files /dev/null and b/ios/UniMPSDK/Libs/liblibGeolocation.a differ diff --git a/ios/UniMPSDK/Resources/PandoraApi.bundle/beep-beep.caf b/ios/UniMPSDK/Resources/PandoraApi.bundle/beep-beep.caf index bac22d67..e69de29b 100644 Binary files a/ios/UniMPSDK/Resources/PandoraApi.bundle/beep-beep.caf and b/ios/UniMPSDK/Resources/PandoraApi.bundle/beep-beep.caf differ diff --git a/ios/UniMPSDK/Resources/PandoraApi.bundle/iconfont.ttf b/ios/UniMPSDK/Resources/PandoraApi.bundle/iconfont.ttf index b7853587..e69de29b 100644 Binary files a/ios/UniMPSDK/Resources/PandoraApi.bundle/iconfont.ttf and b/ios/UniMPSDK/Resources/PandoraApi.bundle/iconfont.ttf differ diff --git a/ios/UniMPSDK/Resources/unincomponents.ttf b/ios/UniMPSDK/Resources/unincomponents.ttf index 52e01149..e69de29b 100644 Binary files a/ios/UniMPSDK/Resources/unincomponents.ttf and b/ios/UniMPSDK/Resources/unincomponents.ttf differ diff --git a/ios/UniMPSDK/Resources/userPosition@2x.png b/ios/UniMPSDK/Resources/userPosition@2x.png new file mode 100644 index 00000000..f8f58d1e Binary files /dev/null and b/ios/UniMPSDK/Resources/userPosition@2x.png differ diff --git a/ios/en.lproj/InfoPlist.strings b/ios/en.lproj/InfoPlist.strings index ae9959f1..da6d0ece 100644 --- a/ios/en.lproj/InfoPlist.strings +++ b/ios/en.lproj/InfoPlist.strings @@ -12,3 +12,4 @@ NSCameraUsageDescription="您的相机权限将用于更新头像使用"; NSPhotoLibraryUsageDescription="您的照片信息将用于更新头像使用"; NSLocationWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店"; NSLocationAlwaysAndWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店"; +NSLocationTemporaryUsageDescriptionDictionary="您的定位位置信息将用于查看周围的门店"; diff --git a/ios/zh-Hans.lproj/InfoPlist.strings b/ios/zh-Hans.lproj/InfoPlist.strings index 96d8f302..00d36ed5 100644 --- a/ios/zh-Hans.lproj/InfoPlist.strings +++ b/ios/zh-Hans.lproj/InfoPlist.strings @@ -13,3 +13,4 @@ NSCameraUsageDescription="您的相机权限将用于更新头像使用"; NSPhotoLibraryUsageDescription="您的照片信息将用于更新头像使用"; NSLocationWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店"; NSLocationAlwaysAndWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店"; +NSLocationTemporaryUsageDescriptionDictionary="您的定位位置信息将用于查看周围的门店"; diff --git a/ios/zh-Hant.lproj/InfoPlist.strings b/ios/zh-Hant.lproj/InfoPlist.strings index 80d3ccca..01469ffa 100644 --- a/ios/zh-Hant.lproj/InfoPlist.strings +++ b/ios/zh-Hant.lproj/InfoPlist.strings @@ -8,7 +8,8 @@ CFBundleName="迴響"; CFBundleDisplayName="迴響"; -NSCameraUsageDescription="您的相机权限将用于更新头像使用"; -NSPhotoLibraryUsageDescription="您的照片信息将用于更新头像使用"; -NSLocationWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店"; -NSLocationAlwaysAndWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店"; +NSCameraUsageDescription="您的相機權限將用於投降更新使用"; +NSPhotoLibraryUsageDescription="您的照片信息將用於投降更新使用"; +NSLocationWhenInUseUsageDescription="您的定位位置信息將用於查看周圍的門店"; +NSLocationAlwaysAndWhenInUseUsageDescription="您的定位位置信息將用於查看周圍的門店"; +NSLocationTemporaryUsageDescriptionDictionary="您的定位位置信息將用於查看周圍的門店"; diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index eb2cf590..af97c4d2 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -35,49 +35,51 @@ class MessageLookup extends MessageLookupByLibrary { static m7(yuan) => "活动减免${yuan}元配送费"; - static m8(jifen) => "${jifen}积分"; + static m8(jianjie) => "简介:${jianjie}"; - static m9(jifen) => "${jifen}积分 到下一个等级"; + static m9(jifen) => "${jifen}积分"; - static m10(date) => "开通日期:${date}"; + static m10(jifen) => "${jifen}积分 到下一个等级"; - static m11(shijian) => "领取时间 ${shijian}"; + static m11(date) => "开通日期:${date}"; - static m12(man, jian) => "满${man}立减${jian}代金券"; + static m12(shijian) => "领取时间 ${shijian}"; - static m13(yuan) => "满${yuan}可用"; + static m13(man, jian) => "满${man}立减${jian}代金券"; - static m14(mi) => "${mi}米"; + static m14(yuan) => "满${yuan}可用"; - static m15(zhe) => "全场${zhe}折"; + static m15(mi) => "${mi}米"; - static m16(num) => "取单号${num}"; + static m16(zhe) => "全场${zhe}折"; - static m17(ren) => "¥${ren}/人"; + static m17(num) => "取单号${num}"; - static m18(second) => "${second}s后重新发送"; + static m18(ren) => "¥${ren}/人"; - static m19(jifen) => "商品积分 ${jifen}积分"; + static m19(second) => "${second}s后重新发送"; - static m20(jifen) => "实付积分 ${jifen}积分"; + static m20(jifen) => "商品积分 ${jifen}积分"; - static m21(sui) => "${sui}岁"; + static m21(jifen) => "实付积分 ${jifen}积分"; - static m22(num) => "完成${num}"; + static m22(sui) => "${sui}岁"; - static m23(time) => "下单时间:${time}"; + static m23(num) => "完成${num}"; - static m24(jian) => "已兑换${jian}件"; + static m24(time) => "下单时间:${time}"; - static m25(time) => "营业时间: ${time}"; + static m25(jian) => "已兑换${jian}件"; - static m26(date) => "有效期至${date}"; + static m26(time) => "营业时间: ${time}"; - static m27(yuan) => "${yuan}元"; + static m27(date) => "有效期至${date}"; - static m28(yue) => "余额${yue}"; + static m28(yuan) => "${yuan}元"; - static m29(zuozhe) => "作者${zuozhe}"; + static m29(yue) => "余额${yue}"; + + static m30(zuozhe) => "作者${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -94,6 +96,7 @@ class MessageLookup extends MessageLookupByLibrary { "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("查看我的卡券"), "chakanwuliu" : MessageLookupByLibrary.simpleMessage("查看物流"), "changjianwenti" : MessageLookupByLibrary.simpleMessage("常见问题"), + "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("创始人故事"), "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), @@ -153,6 +156,7 @@ class MessageLookup extends MessageLookupByLibrary { "gong" : MessageLookupByLibrary.simpleMessage("共"), "gongjijianshangpin" : m5, "gongli" : m6, + "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"), @@ -165,7 +169,9 @@ class MessageLookup extends MessageLookupByLibrary { "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), + "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), + "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), "huode" : MessageLookupByLibrary.simpleMessage("获得"), "huodongjianmianpeisongfei" : m7, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"), @@ -177,26 +183,28 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "jian" : MessageLookupByLibrary.simpleMessage("件"), + "jianjie" : m8, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"), "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"), "jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"), "jifen" : MessageLookupByLibrary.simpleMessage("积分"), - "jifen_" : m8, - "jifendaoxiayidengji" : m9, + "jifen_" : m9, + "jifendaoxiayidengji" : m10, "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), - "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净币联盟会员店"), + "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"), "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"), + "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"), "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"), "jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"), - "kaitongriqi" : m10, + "kaitongriqi" : m11, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"), "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"), @@ -215,24 +223,25 @@ class MessageLookup extends MessageLookupByLibrary { "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"), "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"), "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"), - "lingqushijian" : m11, + "lingqushijian" : m12, "linian" : MessageLookupByLibrary.simpleMessage("理念"), "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"), "login" : MessageLookupByLibrary.simpleMessage("登录"), "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), - "main_menu1" : MessageLookupByLibrary.simpleMessage("净币"), + "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("我的"), - "manlijiandaijinquan" : m12, - "manyuankeyong" : m13, + "manlijiandaijinquan" : m13, + "manyuankeyong" : m14, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), - "mi" : m14, + "mi" : m15, "mingxi" : MessageLookupByLibrary.simpleMessage("明细"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"), + "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"), "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("您定位功能开关未开启，请点击去打開定位"), "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("您未开启位置权限，请点击确定申请权限"), "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"), @@ -263,6 +272,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青铜会员"), "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"), + "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("请选择一个门店"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("请选择门店"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("请选择您想设置的语言"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("请在规定时间内完成支付"), @@ -273,12 +283,12 @@ class MessageLookup extends MessageLookupByLibrary { "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"), "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"), "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"), - "quanchangzhe" : m15, + "quanchangzhe" : m16, "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("权限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"), - "qudanhao" : m16, + "qudanhao" : m17, "queding" : MessageLookupByLibrary.simpleMessage("确定"), "queren" : MessageLookupByLibrary.simpleMessage("确认"), "querenchongzhi" : MessageLookupByLibrary.simpleMessage("确认充值"), @@ -295,9 +305,9 @@ class MessageLookup extends MessageLookupByLibrary { "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"), "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"), "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"), - "ren" : m17, + "ren" : m18, "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"), - "resend_in_seconds" : m18, + "resend_in_seconds" : m19, "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"), "send_code" : MessageLookupByLibrary.simpleMessage("发送验证"), "shanchudingdan" : MessageLookupByLibrary.simpleMessage("删除一单"), @@ -306,14 +316,14 @@ class MessageLookup extends MessageLookupByLibrary { "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"), "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"), "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"), - "shangpinjifen" : m19, + "shangpinjifen" : m20, "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"), "shenmijifendali" : MessageLookupByLibrary.simpleMessage("神秘积分大礼"), "shenqingtuikuan" : MessageLookupByLibrary.simpleMessage("申请退款"), "shezhi" : MessageLookupByLibrary.simpleMessage("设置"), "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"), "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"), - "shifujifen" : m20, + "shifujifen" : m21, "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), @@ -329,7 +339,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新余额"), "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), - "sui" : m21, + "sui" : m22, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), @@ -342,7 +352,7 @@ class MessageLookup extends MessageLookupByLibrary { "waimai" : MessageLookupByLibrary.simpleMessage("外卖"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m22, + "wancheng_" : m23, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), @@ -362,7 +372,7 @@ class MessageLookup extends MessageLookupByLibrary { "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"), - "xiadanshijian_" : m23, + "xiadanshijian_" : m24, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"), "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以在使用过程中进行分享，希望您使用HISAPP时让我们使用相机功能"), @@ -377,12 +387,12 @@ class MessageLookup extends MessageLookupByLibrary { "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), - "yiduihuanjian" : m24, + "yiduihuanjian" : m25, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"), - "yingyeshijian" : m25, + "yingyeshijian" : m26, "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"), "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"), "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "), @@ -402,23 +412,25 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquan" : MessageLookupByLibrary.simpleMessage("优惠券"), "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"), - "youxiaoqizhi" : m26, + "youxiaoqizhi" : m27, "yuan" : MessageLookupByLibrary.simpleMessage("元"), - "yuan_" : m27, + "yuan_" : m28, "yue" : MessageLookupByLibrary.simpleMessage("余额"), - "yue_" : m28, + "yue_" : m29, "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yunfei" : MessageLookupByLibrary.simpleMessage("运费"), "yuyan" : MessageLookupByLibrary.simpleMessage("语言"), "zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"), "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"), "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"), + "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"), "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"), "zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("账号信息"), "zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"), "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"), "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"), "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"), + "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在下载中..."), "zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"), "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"), "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"), @@ -432,6 +444,6 @@ class MessageLookup extends MessageLookupByLibrary { "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"), - "zuozhe" : m29 + "zuozhe" : m30 }; } diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 4111360f..957853e9 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -35,49 +35,51 @@ class MessageLookup extends MessageLookupByLibrary { static m7(yuan) => "活动减免${yuan}元配送费"; - static m8(jifen) => "${jifen}积分"; + static m8(jianjie) => "简介:${jianjie}"; - static m9(jifen) => "${jifen}积分 到下一个等级"; + static m9(jifen) => "${jifen}积分"; - static m10(date) => "开通日期:${date}"; + static m10(jifen) => "${jifen}积分 到下一个等级"; - static m11(shijian) => "领取时间 ${shijian}"; + static m11(date) => "开通日期:${date}"; - static m12(man, jian) => "满${man}立减${jian}代金券"; + static m12(shijian) => "领取时间 ${shijian}"; - static m13(yuan) => "满${yuan}可用"; + static m13(man, jian) => "满${man}立减${jian}代金券"; - static m14(mi) => "${mi}米"; + static m14(yuan) => "满${yuan}可用"; - static m15(zhe) => "全场${zhe}折"; + static m15(mi) => "${mi}米"; - static m16(num) => "取单号${num}"; + static m16(zhe) => "全场${zhe}折"; - static m17(ren) => "¥${ren}/人"; + static m17(num) => "取单号${num}"; - static m18(second) => "${second}s后重新发送"; + static m18(ren) => "¥${ren}/人"; - static m19(jifen) => "商品积分 ${jifen}积分"; + static m19(second) => "${second}s后重新发送"; - static m20(jifen) => "实付积分 ${jifen}积分"; + static m20(jifen) => "商品积分 ${jifen}积分"; - static m21(sui) => "${sui}岁"; + static m21(jifen) => "实付积分 ${jifen}积分"; - static m22(num) => "完成${num}"; + static m22(sui) => "${sui}岁"; - static m23(time) => "下单时间:${time}"; + static m23(num) => "完成${num}"; - static m24(jian) => "已兑换${jian}件"; + static m24(time) => "下单时间:${time}"; - static m25(time) => "营业时间: ${time}"; + static m25(jian) => "已兑换${jian}件"; - static m26(date) => "有效期至${date}"; + static m26(time) => "营业时间: ${time}"; - static m27(yuan) => "${yuan}元"; + static m27(date) => "有效期至${date}"; - static m28(yue) => "余额${yue}"; + static m28(yuan) => "${yuan}元"; - static m29(zuozhe) => "作者${zuozhe}"; + static m29(yue) => "余额${yue}"; + + static m30(zuozhe) => "作者${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -94,6 +96,7 @@ class MessageLookup extends MessageLookupByLibrary { "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("查看我的卡券"), "chakanwuliu" : MessageLookupByLibrary.simpleMessage("查看物流"), "changjianwenti" : MessageLookupByLibrary.simpleMessage("常见问题"), + "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("创始人故事"), "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), @@ -153,6 +156,7 @@ class MessageLookup extends MessageLookupByLibrary { "gong" : MessageLookupByLibrary.simpleMessage("共"), "gongjijianshangpin" : m5, "gongli" : m6, + "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"), @@ -165,7 +169,9 @@ class MessageLookup extends MessageLookupByLibrary { "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), + "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), + "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), "huode" : MessageLookupByLibrary.simpleMessage("获得"), "huodongjianmianpeisongfei" : m7, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"), @@ -177,26 +183,28 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "jian" : MessageLookupByLibrary.simpleMessage("件"), + "jianjie" : m8, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"), "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"), "jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"), "jifen" : MessageLookupByLibrary.simpleMessage("积分"), - "jifen_" : m8, - "jifendaoxiayidengji" : m9, + "jifen_" : m9, + "jifendaoxiayidengji" : m10, "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), - "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净币联盟会员店"), + "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"), "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" 集团创办人"), + "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"), "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"), "jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"), - "kaitongriqi" : m10, + "kaitongriqi" : m11, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"), "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"), @@ -215,24 +223,25 @@ class MessageLookup extends MessageLookupByLibrary { "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"), "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"), "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"), - "lingqushijian" : m11, + "lingqushijian" : m12, "linian" : MessageLookupByLibrary.simpleMessage("理念"), "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"), "login" : MessageLookupByLibrary.simpleMessage("登录"), "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), - "main_menu1" : MessageLookupByLibrary.simpleMessage("净币"), + "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("我的"), - "manlijiandaijinquan" : m12, - "manyuankeyong" : m13, + "manlijiandaijinquan" : m13, + "manyuankeyong" : m14, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), - "mi" : m14, + "mi" : m15, "mingxi" : MessageLookupByLibrary.simpleMessage("明细"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"), + "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"), "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("您定位功能开关未开启，请点击去打開定位"), "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("您未开启位置权限，请点击确定申请权限"), "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"), @@ -263,6 +272,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青铜会员"), "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"), + "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("请选择一个门店"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("请选择门店"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("请选择您想设置的语言"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("请在规定时间内完成支付"), @@ -273,12 +283,12 @@ class MessageLookup extends MessageLookupByLibrary { "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"), "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"), "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"), - "quanchangzhe" : m15, + "quanchangzhe" : m16, "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("权限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"), - "qudanhao" : m16, + "qudanhao" : m17, "queding" : MessageLookupByLibrary.simpleMessage("确定"), "queren" : MessageLookupByLibrary.simpleMessage("确认"), "querenchongzhi" : MessageLookupByLibrary.simpleMessage("确认充值"), @@ -295,9 +305,9 @@ class MessageLookup extends MessageLookupByLibrary { "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"), "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"), "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"), - "ren" : m17, + "ren" : m18, "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"), - "resend_in_seconds" : m18, + "resend_in_seconds" : m19, "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"), "send_code" : MessageLookupByLibrary.simpleMessage("发送验证"), "shanchudingdan" : MessageLookupByLibrary.simpleMessage("删除一单"), @@ -306,14 +316,14 @@ class MessageLookup extends MessageLookupByLibrary { "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"), "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"), "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"), - "shangpinjifen" : m19, + "shangpinjifen" : m20, "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"), "shenmijifendali" : MessageLookupByLibrary.simpleMessage("神秘积分大礼"), "shenqingtuikuan" : MessageLookupByLibrary.simpleMessage("申请退款"), "shezhi" : MessageLookupByLibrary.simpleMessage("设置"), "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"), "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"), - "shifujifen" : m20, + "shifujifen" : m21, "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), @@ -329,7 +339,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新余额"), "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), - "sui" : m21, + "sui" : m22, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), @@ -342,7 +352,7 @@ class MessageLookup extends MessageLookupByLibrary { "waimai" : MessageLookupByLibrary.simpleMessage("外卖"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m22, + "wancheng_" : m23, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), @@ -362,7 +372,7 @@ class MessageLookup extends MessageLookupByLibrary { "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"), - "xiadanshijian_" : m23, + "xiadanshijian_" : m24, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"), "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以在使用过程中进行分享，希望您使用HISAPP时让我们使用相机功能"), @@ -377,12 +387,12 @@ class MessageLookup extends MessageLookupByLibrary { "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), - "yiduihuanjian" : m24, + "yiduihuanjian" : m25, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"), - "yingyeshijian" : m25, + "yingyeshijian" : m26, "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"), "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"), "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "), @@ -402,22 +412,24 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquan" : MessageLookupByLibrary.simpleMessage("优惠券"), "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"), - "youxiaoqizhi" : m26, + "youxiaoqizhi" : m27, "yuan" : MessageLookupByLibrary.simpleMessage("元"), - "yuan_" : m27, + "yuan_" : m28, "yue" : MessageLookupByLibrary.simpleMessage("余额"), - "yue_" : m28, + "yue_" : m29, "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yunfei" : MessageLookupByLibrary.simpleMessage("运费"), "yuyan" : MessageLookupByLibrary.simpleMessage("语言"), "zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"), "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"), "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"), + "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"), "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"), "zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"), "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"), "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"), "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"), + "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在下载中..."), "zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"), "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"), "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"), @@ -431,6 +443,6 @@ class MessageLookup extends MessageLookupByLibrary { "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"), - "zuozhe" : m29 + "zuozhe" : m30 }; } diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 0feadd7d..de6db995 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -35,49 +35,51 @@ class MessageLookup extends MessageLookupByLibrary { static m7(yuan) => "活動減免${yuan}元配送費"; - static m8(jifen) => "${jifen}積分"; + static m8(jianjie) => "簡介:${jianjie}"; - static m9(jifen) => "${jifen}積分 到下一個等級"; + static m9(jifen) => "${jifen}積分"; - static m10(date) => "開通日期:${date}"; + static m10(jifen) => "${jifen}積分 到下一個等級"; - static m11(shijian) => "領取時間 ${shijian}"; + static m11(date) => "開通日期:${date}"; - static m12(man, jian) => "滿${man}立減${jian}代金券"; + static m12(shijian) => "領取時間 ${shijian}"; - static m13(yuan) => "滿${yuan}可用"; + static m13(man, jian) => "滿${man}立減${jian}代金券"; - static m14(mi) => "${mi}米"; + static m14(yuan) => "滿${yuan}可用"; - static m15(zhe) => "全場${zhe}折"; + static m15(mi) => "${mi}米"; - static m16(num) => "取膽號${num}"; + static m16(zhe) => "全場${zhe}折"; - static m17(ren) => "¥${ren}/人"; + static m17(num) => "取膽號${num}"; - static m18(second) => "${second}s后重新發送"; + static m18(ren) => "¥${ren}/人"; - static m19(jifen) => "商品積分 ${jifen}積分"; + static m19(second) => "${second}s后重新發送"; - static m20(jifen) => "實付積分 ${jifen}積分"; + static m20(jifen) => "商品積分 ${jifen}積分"; - static m21(sui) => "${sui}嵗"; + static m21(jifen) => "實付積分 ${jifen}積分"; - static m22(num) => "完成${num}"; + static m22(sui) => "${sui}嵗"; - static m23(time) => "下單時間:${time}"; + static m23(num) => "完成${num}"; - static m24(jian) => "已兌換${jian}件"; + static m24(time) => "下單時間:${time}"; - static m25(time) => "營業時間: ${time}"; + static m25(jian) => "已兌換${jian}件"; - static m26(date) => "有效期至${date}"; + static m26(time) => "營業時間: ${time}"; - static m27(yuan) => "${yuan}元"; + static m27(date) => "有效期至${date}"; - static m28(yue) => "餘額${yue}"; + static m28(yuan) => "${yuan}元"; - static m29(zuozhe) => "作者${zuozhe}"; + static m29(yue) => "餘額${yue}"; + + static m30(zuozhe) => "作者${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -94,6 +96,7 @@ class MessageLookup extends MessageLookupByLibrary { "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("查看我的卡券"), "chakanwuliu" : MessageLookupByLibrary.simpleMessage("查看物流"), "changjianwenti" : MessageLookupByLibrary.simpleMessage("常見問題"), + "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("創始人故事"), "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員，享專屬權益"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), @@ -153,6 +156,7 @@ class MessageLookup extends MessageLookupByLibrary { "gong" : MessageLookupByLibrary.simpleMessage("共"), "gongjijianshangpin" : m5, "gongli" : m6, + "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成為本店會員，快去享受超多的會員權益吧。"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("請勾選同意隱私服務和一心回鄉服務協定"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanyu" : MessageLookupByLibrary.simpleMessage("關於"), @@ -165,7 +169,9 @@ class MessageLookup extends MessageLookupByLibrary { "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"), + "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"), + "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"), "huode" : MessageLookupByLibrary.simpleMessage("獲得"), "huodongjianmianpeisongfei" : m7, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"), @@ -177,26 +183,28 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"), "jian" : MessageLookupByLibrary.simpleMessage("件"), + "jianjie" : m8, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"), "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"), "jiesuanjine" : MessageLookupByLibrary.simpleMessage("結算金額"), "jifen" : MessageLookupByLibrary.simpleMessage("積分"), - "jifen_" : m8, - "jifendaoxiayidengji" : m9, + "jifen_" : m9, + "jifendaoxiayidengji" : m10, "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"), "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"), - "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨幣聯盟會員店"), + "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"), "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"), + "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集團創始人"), "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"), "jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"), - "kaitongriqi" : m10, + "kaitongriqi" : m11, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"), "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"), @@ -215,24 +223,25 @@ class MessageLookup extends MessageLookupByLibrary { "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"), "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("領取到卡包"), "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"), - "lingqushijian" : m11, + "lingqushijian" : m12, "linian" : MessageLookupByLibrary.simpleMessage("理念"), "lishijilu" : MessageLookupByLibrary.simpleMessage("歷史記錄"), "login" : MessageLookupByLibrary.simpleMessage("登錄"), "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), - "main_menu1" : MessageLookupByLibrary.simpleMessage("淨幣"), + "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("我的"), - "manlijiandaijinquan" : m12, - "manyuankeyong" : m13, + "manlijiandaijinquan" : m13, + "manyuankeyong" : m14, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), - "mi" : m14, + "mi" : m15, "mingxi" : MessageLookupByLibrary.simpleMessage("明細"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"), + "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"), "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("您定位功能開關未開啟，請點擊去開啟定位"), "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("您未开启位置权限，请点击确定申请权限"), "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"), @@ -263,6 +272,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青銅會員"), "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("請選擇使用門店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("請選擇收貨地址"), + "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("請選擇一個門店"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("请选择门店"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("請選擇您要設置的語言"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("請在規定時間内完成支付"), @@ -273,12 +283,12 @@ class MessageLookup extends MessageLookupByLibrary { "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"), "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兌換"), "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全場通用"), - "quanchangzhe" : m15, + "quanchangzhe" : m16, "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("權限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"), - "qudanhao" : m16, + "qudanhao" : m17, "queding" : MessageLookupByLibrary.simpleMessage("確定"), "queren" : MessageLookupByLibrary.simpleMessage("确认"), "querenchongzhi" : MessageLookupByLibrary.simpleMessage("確認充值"), @@ -295,9 +305,9 @@ class MessageLookup extends MessageLookupByLibrary { "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"), "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("熱門文章視頻"), "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("熱門文章視頻清單"), - "ren" : m17, + "ren" : m18, "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"), - "resend_in_seconds" : m18, + "resend_in_seconds" : m19, "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"), "send_code" : MessageLookupByLibrary.simpleMessage("發送驗證碼"), "shanchudingdan" : MessageLookupByLibrary.simpleMessage("刪除訂單"), @@ -306,14 +316,14 @@ class MessageLookup extends MessageLookupByLibrary { "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"), "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"), "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加載"), - "shangpinjifen" : m19, + "shangpinjifen" : m20, "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品詳情"), "shenmijifendali" : MessageLookupByLibrary.simpleMessage("神秘積分大禮"), "shenqingtuikuan" : MessageLookupByLibrary.simpleMessage("申請退款"), "shezhi" : MessageLookupByLibrary.simpleMessage("設置"), "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"), "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"), - "shifujifen" : m20, + "shifujifen" : m21, "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), @@ -329,7 +339,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新餘額"), "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), - "sui" : m21, + "sui" : m22, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"), @@ -342,7 +352,7 @@ class MessageLookup extends MessageLookupByLibrary { "waimai" : MessageLookupByLibrary.simpleMessage("外賣"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m22, + "wancheng_" : m23, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "), @@ -362,7 +372,7 @@ class MessageLookup extends MessageLookupByLibrary { "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"), - "xiadanshijian_" : m23, + "xiadanshijian_" : m24, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangji" : MessageLookupByLibrary.simpleMessage("相機"), "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("為了您可以在使用過程中進行分享，希望您使用HISAPP時讓我們使用相機功能 "), @@ -377,12 +387,12 @@ class MessageLookup extends MessageLookupByLibrary { "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系統消息"), "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"), - "yiduihuanjian" : m24, + "yiduihuanjian" : m25, "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"), - "yingyeshijian" : m25, + "yingyeshijian" : m26, "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"), "yiqiandao" : MessageLookupByLibrary.simpleMessage("已簽到"), "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "), @@ -402,23 +412,25 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquan" : MessageLookupByLibrary.simpleMessage("優惠券"), "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"), - "youxiaoqizhi" : m26, + "youxiaoqizhi" : m27, "yuan" : MessageLookupByLibrary.simpleMessage("元"), - "yuan_" : m27, + "yuan_" : m28, "yue" : MessageLookupByLibrary.simpleMessage("餘額"), - "yue_" : m28, + "yue_" : m29, "yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"), "yunfei" : MessageLookupByLibrary.simpleMessage("運費"), "yuyan" : MessageLookupByLibrary.simpleMessage("語言"), "zailaiyidan" : MessageLookupByLibrary.simpleMessage("再來一單"), "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在線客服"), "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暫不支持線上點餐"), + "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暫無優惠券可領取"), "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("賬號授權"), "zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("賬號信息"), "zhanghuyue" : MessageLookupByLibrary.simpleMessage("賬戶餘額"), "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫騎手"), "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加載"), "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"), + "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在下載中..."), "zhifubao" : MessageLookupByLibrary.simpleMessage("支付寶"), "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"), "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"), @@ -432,6 +444,6 @@ class MessageLookup extends MessageLookupByLibrary { "zitishijian" : MessageLookupByLibrary.simpleMessage("自提時間"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"), - "zuozhe" : m29 + "zuozhe" : m30 }; } diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index f41177b9..d36b1e9f 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -165,10 +165,10 @@ class S { ); } - /// `净币` + /// `净弼` String get main_menu1 { return Intl.message( - '净币', + '净弼', name: 'main_menu1', desc: '', args: [], @@ -305,10 +305,10 @@ class S { ); } - /// `净币联盟会员店` + /// `净弼联盟会员店` String get jingbilianmenghuiyuandian { return Intl.message( - '净币联盟会员店', + '净弼联盟会员店', name: 'jingbilianmenghuiyuandian', desc: '', args: [], @@ -3545,6 +3545,106 @@ class S { ); } + /// `创始人故事` + String get chaungshirengushi { + return Intl.message( + '创始人故事', + name: 'chaungshirengushi', + desc: '', + args: [], + ); + } + + /// `集团创始人` + String get jituanchuangshiren { + return Intl.message( + '集团创始人', + name: 'jituanchuangshiren', + desc: '', + args: [], + ); + } + + /// `简介:{jianjie}` + String jianjie(Object jianjie) { + return Intl.message( + '简介:$jianjie', + name: 'jianjie', + desc: '', + args: [jianjie], + ); + } + + /// `正在下载中...` + String get zhengzaixiazaizhong { + return Intl.message( + '正在下载中...', + name: 'zhengzaixiazaizhong', + desc: '', + args: [], + ); + } + + /// `请选择一个门店` + String get qingxuanzeyigemendian { + return Intl.message( + '请选择一个门店', + name: 'qingxuanzeyigemendian', + desc: '', + args: [], + ); + } + + /// `目前暂无星店活动` + String get muqianzanwuxingdianhuodong { + return Intl.message( + '目前暂无星店活动', + name: 'muqianzanwuxingdianhuodong', + desc: '', + args: [], + ); + } + + /// `暂无优惠券可领取` + String get zanwuyouhuiquankelingqu { + return Intl.message( + '暂无优惠券可领取', + name: 'zanwuyouhuiquankelingqu', + desc: '', + args: [], + ); + } + + /// `会员积分` + String get huiyuanjifen { + return Intl.message( + '会员积分', + name: 'huiyuanjifen', + desc: '', + args: [], + ); + } + + /// `会员余额` + String get huiyuanyue { + return Intl.message( + '会员余额', + name: 'huiyuanyue', + desc: '', + args: [], + ); + } + + /// `恭喜您，成为本店的会员，快去享受超多会员权益吧。` + String get gongxinichengweibendianhuiyuan { + return Intl.message( + '恭喜您，成为本店的会员，快去享受超多会员权益吧。', + name: 'gongxinichengweibendianhuiyuan', + desc: '', + args: [], + ); + } + /// `并使用本机号码登录` String get privacy_policy4 { return Intl.message( diff --git a/lib/home/activity_list_page.dart b/lib/home/activity_list_page.dart index 615c414c..62f6cd05 100644 --- a/lib/home/activity_list_page.dart +++ b/lib/home/activity_list_page.dart @@ -12,6 +12,7 @@ import 'package:huixiang/view_widget/loading_view.dart'; import 'package:huixiang/view_widget/my_footer.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; class ActivityListPage extends StatefulWidget { @override @@ -91,6 +92,7 @@ class _ActivityListPage extends State "html": activityList[position].content, "title": activityList[position].mainTitle, "time": activityList[position].createTime, + "storeId": activityList[position].storeId, "author": activityList[position].storeName }); }, @@ -106,7 +108,7 @@ class _ActivityListPage extends State return AspectRatio( aspectRatio: 1.34, child: Container( - margin: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 8), + margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 8.h, bottom: 8.h), decoration: BoxDecoration( color: Colors.white, boxShadow: [ @@ -117,7 +119,7 @@ class _ActivityListPage extends State spreadRadius: 0, ) ], - borderRadius: BorderRadius.all(Radius.circular(8)), + borderRadius: BorderRadius.circular(8), ), child: Column( children: [ @@ -133,28 +135,30 @@ class _ActivityListPage extends State fadeSrc: "assets/image/default_2_1.png", ), Container( - padding: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 12), + padding: EdgeInsets.only(left: 16.w, right: 16.w, top: 8.h, bottom: 12.h), child: Column( mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( activity.mainTitle, + maxLines: 1, + overflow: TextOverflow.ellipsis, style: TextStyle( fontWeight: FontWeight.bold, - fontSize: 14, + fontSize: 14.sp, color: Colors.black, ), ), SizedBox( - height: 4, + height: 4.h, ), Text( activity.viceTitle ?? "", maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle( - fontSize: 10, + fontSize: 10.sp, color: Color(0xFF727272), ), ), @@ -166,7 +170,7 @@ class _ActivityListPage extends State activity.storeName == null ? "" : activity.storeName, style: TextStyle( color: Color(0xFF060606), - fontSize: 12, + fontSize: 12.sp, ), ), Column( @@ -177,7 +181,7 @@ class _ActivityListPage extends State activity.startTime.split(" ")[1], style: TextStyle( color: Color(0xFF32A060), - fontSize: 12, + fontSize: 12.sp, fontWeight: FontWeight.bold, ), ), @@ -185,7 +189,7 @@ class _ActivityListPage extends State activity.startTime.split(" ")[0], style: TextStyle( color: Color(0xFF32A060), - fontSize: 12, + fontSize: 12.sp, fontWeight: FontWeight.bold, ), ), diff --git a/lib/home/founder_story_page.dart b/lib/home/founder_story_page.dart index 745bd674..1d43142a 100644 --- a/lib/home/founder_story_page.dart +++ b/lib/home/founder_story_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/utils/MyPainter.dart'; import 'package:huixiang/view_widget/separator.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -21,6 +22,13 @@ class _FounderStoryPage extends State { backgroundColor: Color(0xFFFFFFFF), elevation: 0, centerTitle: false, + title: Text( + S.of(context).chaungshirengushi, + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + ), + ), leading: GestureDetector( onTap: () { Navigator.of(context).pop(); diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index fc981a19..606ab35a 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -18,6 +18,7 @@ import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/hot_item.dart'; import 'package:huixiang/view_widget/item_title.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/view_widget/loading_view.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -53,6 +54,12 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { Founder founder; queryHome() async { + showCupertinoDialog( + context: context, + barrierDismissible: true, + builder: (context) { + return LoadingView(); + }); BaseData baseData = await apiService.queryBanner({ "model": {"type": "HOME_PAGE"}, }).catchError((onError) { @@ -105,6 +112,11 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { gooods.clear(); gooods.addAll(page.list.map((e) => Goods.fromJson(e))); } + + Future.delayed(Duration(milliseconds: 500), () { + if (Navigator.canPop(context)) Navigator.of(context).pop(); + }); + if (baseData != null && baseData.isSuccess) { refreshController.refreshCompleted(); if (mounted) setState(() {}); @@ -113,6 +125,12 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { } } + @override + void dispose() { + super.dispose(); + refreshController.dispose(); + } + RefreshController refreshController = RefreshController(); @override @@ -252,15 +270,21 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { ), ), TextSpan( - text: " 集团创始人", + text: " ", + ), + TextSpan( + text: S.of(context).jituanchuangshiren, style: TextStyle( fontSize: 8.sp, color: Colors.white, ), ), + TextSpan( + text: " ", + ), TextSpan( text: - " 简介:${founder != null ? founder.description : ""}", + S.of(context).jianjie("${founder != null ? founder.description : ""}"), style: TextStyle( fontSize: 10.sp, color: Colors.white, @@ -360,7 +384,7 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { ), ), SizedBox( - height: 4, + height: 4.h, ), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -368,8 +392,7 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { children: [ Expanded( child: Text( - S - .of(context) + S.of(context) .yuan_(double.tryParse(goods.worth).toInt()), overflow: TextOverflow.ellipsis, style: TextStyle( @@ -402,18 +425,20 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { Widget signIn() { return Container( - padding: EdgeInsets.only(left: 12, top: 8, bottom: 8, right: 12), + padding: EdgeInsets.only(left: 12.w, top: 8.h, bottom: 8.h, right: 12.w), margin: EdgeInsets.all(16), decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0) - ], - borderRadius: BorderRadius.all(Radius.circular(4))), + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + borderRadius: BorderRadius.circular(4), + ), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, @@ -451,7 +476,7 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { ); } - SwiperController swiperController = SwiperController(); + // SwiperController swiperController = SwiperController(); brands() { return Container( diff --git a/lib/home/huixiang_brand_page.dart b/lib/home/huixiang_brand_page.dart index 2c249cf7..7c7ea845 100644 --- a/lib/home/huixiang_brand_page.dart +++ b/lib/home/huixiang_brand_page.dart @@ -18,6 +18,7 @@ import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/icon_text.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:huixiang/view_widget/loading_view.dart'; +import 'package:huixiang/view_widget/store_title_tab.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -30,13 +31,7 @@ class BrandPage extends StatefulWidget { class _BrandPage extends State with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin { - ScrollController scrollController; - - List images = [ - "assets/image/icon_chili.png", - "assets/image/icon_milk_tea.png", - "assets/image/icon_bread.png", - ]; + ScrollController scrollController = ScrollController(); GlobalKey chiliGlobalKey = GlobalKey(); GlobalKey milkTeaGlobalKey = GlobalKey(); @@ -85,63 +80,11 @@ class _BrandPage extends State void initState() { super.initState(); - SharedPreferences.getInstance().then((value) => { - apiService = ApiService(Dio(), - context: context, token: value.getString('token')), - queryHome(), - }); - if (scrollController == null) - scrollController = ScrollController(); - - scrollController.addListener(() { - RenderBox chiliRenderBox = - chiliGlobalKey.currentContext.findRenderObject(); - RenderBox milkTeaRenderBox = - milkTeaGlobalKey.currentContext.findRenderObject(); - RenderBox breadRenderBox = - breadGlobalKey.currentContext.findRenderObject(); - - Offset chiliOffset = chiliRenderBox.localToGlobal(Offset.zero); - Offset milkTeaOffset = milkTeaRenderBox.localToGlobal(Offset.zero); - Offset breadOffset = breadRenderBox.localToGlobal(Offset.zero); - - var top = 96.h; - if (chiliOffset.dy <= top) { - if (!isVisible) { - isVisible = true; - setState(() {}); - } - } else { - var b = isVisible; - isVisible = false; - if (b) setState(() {}); - selectedIndex = -1; - } - if (chiliOffset.dy <= top && breadOffset.dy > top) { - selectedIndex = 0; - if (selectedIndex1 != selectedIndex) { - setState(() { - print("object：$selectedIndex"); - }); - selectedIndex1 = selectedIndex; - } - } else if (breadOffset.dy <= top && milkTeaOffset.dy > top) { - selectedIndex = 1; - if (selectedIndex1 != selectedIndex) { - setState(() { - print("object：$selectedIndex"); - }); - selectedIndex1 = selectedIndex; - } - } else if (milkTeaOffset.dy <= top) { - selectedIndex = 2; - if (selectedIndex1 != selectedIndex) { - setState(() { - print("object：$selectedIndex"); - }); - selectedIndex1 = selectedIndex; - } - } + SharedPreferences.getInstance().then((value) => + { + apiService = ApiService(Dio(), + context: context, token: value.getString('token')), + queryHome(), }); eventBus.on().listen((event) { @@ -150,8 +93,6 @@ class _BrandPage extends State }); } - int selectedIndex = -1; - int selectedIndex1 = -1; RefreshController refreshController = RefreshController(); @override @@ -159,7 +100,10 @@ class _BrandPage extends State super.build(context); return Scaffold( appBar: AppBar( - toolbarHeight: 40.h - MediaQuery.of(context).padding.top, + toolbarHeight: 40.h - MediaQuery + .of(context) + .padding + .top, backgroundColor: Colors.white, elevation: 0, ), @@ -191,30 +135,12 @@ class _BrandPage extends State ), ), Positioned( - child: Visibility( - visible: isVisible, - child: Container( - width: MediaQuery.of(context).size.width, - child: Container( - height: 52.h, - color: Colors.white, - padding: EdgeInsets.all(6), - alignment: Alignment.center, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: (brandText == null || brandText.isEmpty) - ? [] - : (brandText.map((e) { - return item( - e, - selectedIndex == brandText.indexOf(e), - brandText.indexOf(e)); - }).toList()), - ), - ), - ), - ), + child: StoreTitleTab( + brandText, + scrollController: scrollController, + chiliGlobalKey: chiliGlobalKey, + milkTeaGlobalKey: milkTeaGlobalKey, + breadGlobalKey: breadGlobalKey), top: 0, ), ], @@ -224,7 +150,14 @@ class _BrandPage extends State } List homeChildItem() { - var widgets = [banner(), buildInfo(), buildTab()]; + var widgets = [ + banner(), + buildInfo(), + StoreTitleTab(brandText, + chiliGlobalKey: chiliGlobalKey, + milkTeaGlobalKey: milkTeaGlobalKey, + breadGlobalKey: breadGlobalKey) + ]; if (brandData == null) return widgets; (brandData.contents as Map).forEach((key, value) { widgets.add(Container( @@ -247,75 +180,6 @@ class _BrandPage extends State return widgets; } - bool isVisible = false; - - Widget buildTab() { - return Container( - // key: tabGlobalKey, - height: 52.h, - padding: EdgeInsets.all(6), - alignment: Alignment.center, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: (brandText == null || brandText.isEmpty) - ? [] - : brandText - .map((e) => item(e, selectedIndex == brandText.indexOf(e), - brandText.indexOf(e))) - .toList(), - ), - ); - } - - Widget item(text, isSelected, index) { - print("selectedIndex: $selectedIndex"); - return GestureDetector( - onTap: () { - FlexParentData parendData; - if (index == 0) { - parendData = - chiliGlobalKey.currentContext.findRenderObject().parentData; - } else if (index == 2) { - parendData = - milkTeaGlobalKey.currentContext.findRenderObject().parentData; - } else if (index == 1) { - parendData = - breadGlobalKey.currentContext.findRenderObject().parentData; - } - double offset = parendData.offset.dy - 52.h + 20.h; - scrollController.animateTo(offset, - duration: Duration(seconds: 1), curve: Curves.ease); - }, - child: tabItem(text, isSelected, index), - ); - } - - Widget tabItem(text, isSelected, index) { - if (isSelected) { - return IconText( - text, - isMax: false, - rightImage: images[index], - iconSize: 16, - iconColor: Colors.red, - textStyle: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 16, - color: Color(0xFF353535)), - ); - } else { - return IconText( - text, - isMax: false, - textStyle: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 16, - color: Color(0xFF353535)), - ); - } - } - Widget buildInfo() { return Container( margin: EdgeInsets.only(bottom: 20, top: 16), @@ -366,7 +230,7 @@ class _BrandPage extends State TextSpan(children: [ TextSpan( text: - brandData == null ? "" : brandData.originator, + brandData == null ? "" : brandData.originator, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 14.sp, @@ -374,7 +238,9 @@ class _BrandPage extends State ), ), TextSpan( - text: S.of(context).jituanchuangbanren, + text: S + .of(context) + .jituanchuangbanren, style: TextStyle( fontSize: 10.sp, color: Colors.black, @@ -407,7 +273,9 @@ class _BrandPage extends State mainAxisSize: MainAxisSize.max, children: [ Text( - S.of(context).gengduo, + S + .of(context) + .gengduo, style: TextStyle( fontSize: 12.sp, color: Colors.black, @@ -457,7 +325,9 @@ class _BrandPage extends State height: 40, ), Text( - S.of(context).linian, + S + .of(context) + .linian, style: TextStyle( fontSize: 16.sp, fontWeight: FontWeight.bold, diff --git a/lib/home/points_mall_page.dart b/lib/home/points_mall_page.dart index 25e64be1..07745abc 100644 --- a/lib/home/points_mall_page.dart +++ b/lib/home/points_mall_page.dart @@ -169,7 +169,7 @@ class _PointsMallPage extends State ), GridView.builder( itemCount: gooods.length, - padding: EdgeInsets.only(left: 16, right: 16, top: 16), + padding: EdgeInsets.only(left: 16.w, right: 16.w, top: 16.h, bottom: 16.h), shrinkWrap: true, physics: NeverScrollableScrollPhysics(), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( @@ -178,7 +178,7 @@ class _PointsMallPage extends State //水平子Widget之间间距 crossAxisSpacing: 11.0, //垂直子Widget之间间距 - mainAxisSpacing: 16, + mainAxisSpacing: 16.w, //子Widget宽高比例 childAspectRatio: Platform.isAndroid ? 0.54 : 0.57, ), diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index b170e90e..db4634a6 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -12,7 +12,7 @@ "privacy_policy1": "登录既同意", "privacy_policy2": "《一心回乡服务协议》", "privacy_policy3": "《隐私服务》", - "main_menu1": "净币", + "main_menu1": "净弼", "main_menu2": "联盟", "main_menu3": "我的", "shouye": "首页", @@ -26,7 +26,7 @@ "gengduoyouhuiquan": "更多优惠券", "lingqu": "领取", "pinpaijieshao": "品牌介绍", - "jingbilianmenghuiyuandian": "净币联盟会员店", + "jingbilianmenghuiyuandian": "净弼联盟会员店", "gongli": "{km}公里", "manlijiandaijinquan": "满{man}立减{jian}代金券", "ren": "¥{ren}/人", @@ -263,7 +263,7 @@ "chakanwodekaquan": "查看我的卡券", "guanyu": "关于", "linian": "理念", - "jingbilianmenghuiyuandian": "净币联盟会员店", + "jingbilianmenghuiyuandian": "净弼联盟会员店", "kaquan": "卡券", "guanlidizhi": "管理地址", "lingquanzhongxin": "领取中心", @@ -367,10 +367,16 @@ "yunfei": "运费", "jiesuan": "结算", "qinglihuancun": "清理缓存", - - - - + "chaungshirengushi": "创始人故事", + "jituanchuangshiren": "集团创始人", + "jianjie": "简介:{jianjie}", + "zhengzaixiazaizhong": "正在下载中...", + "qingxuanzeyigemendian": "请选择一个门店", + "muqianzanwuxingdianhuodong": "目前暂无星店活动", + "zanwuyouhuiquankelingqu": "暂无优惠券可领取", + "huiyuanjifen": "会员积分", + "huiyuanyue": "会员余额", + "gongxinichengweibendianhuiyuan": "恭喜您，成为本店的会员，快去享受超多会员权益吧。", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 77b2589c..afc93a7d 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -12,7 +12,7 @@ "privacy_policy1": "登录既同意", "privacy_policy2": "《一心回乡服务协议》", "privacy_policy3": "《隐私服务》", - "main_menu1": "净币", + "main_menu1": "净弼", "main_menu2": "联盟", "main_menu3": "我的", "shouye": "首页", @@ -26,7 +26,7 @@ "gengduoyouhuiquan": "更多优惠券", "lingqu": "领取", "pinpaijieshao": "品牌介绍", - "jingbilianmenghuiyuandian": "净币联盟会员店", + "jingbilianmenghuiyuandian": "净弼联盟会员店", "gongli": "{km}公里", "manlijiandaijinquan": "满{man}立减{jian}代金券", "ren": "¥{ren}/人", @@ -263,7 +263,7 @@ "chakanwodekaquan": "查看我的卡券", "guanyu": "关于", "linian": "理念", - "jingbilianmenghuiyuandian": "净币联盟会员店", + "jingbilianmenghuiyuandian": "净弼联盟会员店", "kaquan": "卡券", "guanlidizhi": "管理地址", "lingquanzhongxin": "领取中心", @@ -369,6 +369,16 @@ "yunfei": "运费", "jiesuan": "结算", "qinglihuancun": "清理缓存", + "chaungshirengushi": "创始人故事", + "jituanchuangshiren": "集团创始人", + "jianjie": "简介:{jianjie}", + "zhengzaixiazaizhong": "正在下载中...", + "qingxuanzeyigemendian": "请选择一个门店", + "muqianzanwuxingdianhuodong": "目前暂无星店活动", + "zanwuyouhuiquankelingqu": "暂无优惠券可领取", + "huiyuanjifen": "会员积分", + "huiyuanyue": "会员余额", + "gongxinichengweibendianhuiyuan": "恭喜您，成为本店的会员，快去享受超多会员权益吧。", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index acc86024..21d8ad26 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -12,7 +12,7 @@ "privacy_policy1": "登錄既同意", "privacy_policy2": "《一心回鄉服務協議》", "privacy_policy3": "《隱私服務》", - "main_menu1": "淨幣", + "main_menu1": "淨弼", "main_menu2": "聯盟", "main_menu3": "我的", "shouye": "首頁", @@ -26,7 +26,7 @@ "gengduoyouhuiquan": "更多優惠券", "lingqu": "領取", "pinpaijieshao": "品牌介紹", - "jingbilianmenghuiyuandian": "净幣聯盟會員店", + "jingbilianmenghuiyuandian": "净弼聯盟會員店", "gongli": "{km}公里", "manlijiandaijinquan": "滿{man}立減{jian}代金券", "ren": "¥{ren}/人", @@ -256,7 +256,7 @@ "kaiqiquanxian": "開啓權限", "guanyu": "關於", "linian": "理念", - "jingbilianmenghuiyuandian": "淨幣聯盟會員店", + "jingbilianmenghuiyuandian": "淨弼聯盟會員店", "kaquan": "卡券", "guanlidizhi": "管理地址", "lingquanzhongxin": "領取中心", @@ -361,8 +361,16 @@ "yunfei": "運費", "jiesuan": "結算", "qinglihuancun": "清理緩存", - - + "chaungshirengushi": "創始人故事", + "jituanchuangshiren": "集團創始人", + "jianjie": "簡介:{jianjie}", + "zhengzaixiazaizhong": "正在下載中...", + "qingxuanzeyigemendian": "請選擇一個門店", + "muqianzanwuxingdianhuodong": "目前暫無星店活動", + "zanwuyouhuiquankelingqu": "暫無優惠券可領取", + "huiyuanjifen": "會員積分", + "huiyuanyue": "會員餘額", + "gongxinichengweibendianhuiyuan": "恭喜您，成為本店會員，快去享受超多的會員權益吧。", diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart index 48f9f91e..fbbffa29 100644 --- a/lib/login/login_page.dart +++ b/lib/login/login_page.dart @@ -16,7 +16,7 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:dio/dio.dart'; import 'package:huixiang/view_widget/loading_view.dart'; -// import 'package:photo_view/photo_view.dart'; +import 'package:photo_view/photo_view.dart'; import 'package:shared_preferences/shared_preferences.dart'; class LoginPage extends StatefulWidget { @@ -380,11 +380,11 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { child: Stack( alignment: Alignment.center, children: [ - // PhotoView( - // imageProvider: AssetImage("assets/image/laoban.png"), - // initialScale: Platform.isAndroid ? 1.02 : 1.2, - // basePosition: alignmentProgress, - // ), + PhotoView( + imageProvider: AssetImage("assets/image/laoban.png"), + initialScale: Platform.isAndroid ? 1.02 : 1.2, + basePosition: alignmentProgress, + ), Container( decoration: BoxDecoration( color: Color(0xFF32A060).withAlpha(changeAlpha), @@ -774,7 +774,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { recognizer: tapGestureRecognizer, style: TextStyle( fontSize: 11.sp, - color: Colors.black, + color: Color(0xFF32A060), ), ), TextSpan( @@ -789,7 +789,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { recognizer: tapGestureRecognizer, style: TextStyle( fontSize: 11.sp, - color: Colors.black, + color: Color(0xFF32A060), ), ), TextSpan( diff --git a/lib/mine/manage_address_page.dart b/lib/mine/manage_address_page.dart index a43ccde5..121a87ce 100644 --- a/lib/mine/manage_address_page.dart +++ b/lib/mine/manage_address_page.dart @@ -236,20 +236,20 @@ class _ManageAddressPage extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Checkbox( - value: address.isDefault, - onChanged: (value) { - changeCheck(value, position); - }, - checkColor: Color(0xFFFFFFFF), - fillColor: MaterialStateProperty.all( - address.isDefault ? Color(0xFF39B54A) : Color(0xFFA29E9E)), - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - shape: CircleBorder(), - ), + // Checkbox( + // value: address.isDefault, + // onChanged: (value) { + // changeCheck(value, position); + // }, + // checkColor: Color(0xFFFFFFFF), + // fillColor: MaterialStateProperty.all( + // address.isDefault ? Color(0xFF39B54A) : Color(0xFFA29E9E)), + // materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + // shape: CircleBorder(), + // ), Expanded( child: Text( - "默认地址", + "", style: TextStyle( fontSize: 14, color: address.isDefault diff --git a/lib/order/store_selector_page.dart b/lib/order/store_selector_page.dart index 80fc01bf..a463f897 100644 --- a/lib/order/store_selector_page.dart +++ b/lib/order/store_selector_page.dart @@ -13,6 +13,7 @@ import 'package:huixiang/view_widget/loading_view.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:amap_flutter_base/amap_flutter_base.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; class StoreSelectorPage extends StatefulWidget { @override @@ -159,11 +160,11 @@ class _StoreSelectorPage extends State { queryStore(latitude, longitude, province, city, district) async { BaseData baseData = await apiService.queryStore({ - "city": city, - "district": district, + "city": "", + "district": "", "latitude": latitude, "longitude": longitude, - "province": province, + "province": "", "searchKey": "" }); if (baseData != null && baseData.isSuccess) { @@ -185,7 +186,7 @@ class _StoreSelectorPage extends State { style: TextStyle( color: Colors.black, fontWeight: FontWeight.bold, - fontSize: 18, + fontSize: 18.sp, ), ), centerTitle: false, @@ -197,7 +198,7 @@ class _StoreSelectorPage extends State { }, child: Container( alignment: Alignment.centerRight, - margin: EdgeInsets.only(left: 10), + margin: EdgeInsets.only(left: 10.w), padding: EdgeInsets.all(6), child: Icon( Icons.arrow_back_ios, @@ -207,10 +208,10 @@ class _StoreSelectorPage extends State { ), ), titleSpacing: 2, - leadingWidth: 56, + leadingWidth: 56.w, ), body: Container( - margin: EdgeInsets.only(top: 18), + margin: EdgeInsets.only(top: 18.h), child: Column( children: [ Expanded( @@ -231,7 +232,7 @@ class _StoreSelectorPage extends State { InkWell( onTap: () { if (groupValue == null) { - Fluttertoast.showToast(msg: "请选择一个门店"); + Fluttertoast.showToast(msg: S.of(context).qingxuanzeyigemendian); return; } Store store = storeList[groupValue]; @@ -241,19 +242,22 @@ class _StoreSelectorPage extends State { }); }, child: Container( - padding: EdgeInsets.only(top: 16, bottom: 16), + padding: EdgeInsets.only(top: 16.h, bottom: 16.h), decoration: BoxDecoration( - color: Color(0xFF32A060), - borderRadius: BorderRadius.only( - topLeft: Radius.circular(4), - topRight: Radius.circular(4))), + color: Color(0xFF32A060), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(4), + topRight: Radius.circular(4), + ), + ), alignment: Alignment.center, child: Text( S.of(context).queren, style: TextStyle( - fontSize: 16, - color: Color(0xFFFFFFFF), - fontWeight: FontWeight.bold), + fontSize: 16.sp, + color: Color(0xFFFFFFFF), + fontWeight: FontWeight.bold, + ), ), ), ), @@ -265,18 +269,20 @@ class _StoreSelectorPage extends State { Widget buildStoreItem(Store store, position) { return Container( - margin: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 8), + margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 8.h, bottom: 8.h), padding: EdgeInsets.all(16), decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0) - ], - borderRadius: BorderRadius.all(Radius.circular(8))), + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + borderRadius: BorderRadius.circular(8), + ), child: Row( children: [ Expanded( @@ -287,31 +293,37 @@ class _StoreSelectorPage extends State { Text( store.storeName, style: TextStyle( - fontSize: 16, + fontSize: 16.sp, fontWeight: FontWeight.bold, color: Color(0xFF353535), ), ), SizedBox( - height: 12, + height: 12.h, ), IconText( store.address, isMax: true, textAxisAlignment: CrossAxisAlignment.start, - textStyle: TextStyle(color: Color(0xFF353535), fontSize: 14), + textStyle: TextStyle( + color: Color(0xFF353535), + fontSize: 14.sp, + ), leftIcon: Icons.location_on, iconColor: Color(0xFF32A060), iconSize: 16, ), SizedBox( - height: 4, + height: 4.h, ), IconText( (store.openStartTime == null && store.openEndTime == null) - ? "全天" + ? S.of(context).quantian : "${store.openStartTime}-${store.openEndTime}", - textStyle: TextStyle(color: Color(0xFF353535), fontSize: 14), + textStyle: TextStyle( + color: Color(0xFF353535), + fontSize: 14.sp, + ), leftIcon: Icons.access_time, iconColor: Color(0xFF32A060), iconSize: 16, diff --git a/lib/retrofit/data/member_source.dart b/lib/retrofit/data/member_source.dart new file mode 100644 index 00000000..1cea0162 --- /dev/null +++ b/lib/retrofit/data/member_source.dart @@ -0,0 +1,198 @@ +/// id : "1412687522458238976" +/// createTime : "2021-07-07 16:18:46" +/// createUser : "1405494095400402944" +/// updateTime : "2021-07-07 16:18:46" +/// updateUser : "1405494095400402944" +/// mid : "1405494095400402944" +/// openid : "" +/// nickname : "" +/// headimg : "" +/// balance : "1780.00" +/// realRecharge : "988.89" +/// sex : "0" +/// status : true +/// onCredit : false +/// loginTime : "2021-07-20 17:28:57" +/// loginNum : 30 +/// tenantCode : "1177" +/// source : 1 +/// expendAmount : "20.00" +/// buyTimes : 1 +/// lastBuyTime : "2021-07-20 16:15:02" +/// vip_no : null +/// expireTime : null +/// integral : 0 +/// level : 1 +/// vipRegStore : null + +class MemberSource { + String _id; + String _createTime; + String _createUser; + String _updateTime; + String _updateUser; + String _mid; + String _openid; + String _nickname; + String _headimg; + String _balance; + String _realRecharge; + String _sex; + bool _status; + bool _onCredit; + String _loginTime; + int _loginNum; + String _tenantCode; + int _source; + String _expendAmount; + int _buyTimes; + String _lastBuyTime; + dynamic _vipNo; + dynamic _expireTime; + int _integral; + int _level; + dynamic _vipRegStore; + + String get id => _id; + String get createTime => _createTime; + String get createUser => _createUser; + String get updateTime => _updateTime; + String get updateUser => _updateUser; + String get mid => _mid; + String get openid => _openid; + String get nickname => _nickname; + String get headimg => _headimg; + String get balance => _balance; + String get realRecharge => _realRecharge; + String get sex => _sex; + bool get status => _status; + bool get onCredit => _onCredit; + String get loginTime => _loginTime; + int get loginNum => _loginNum; + String get tenantCode => _tenantCode; + int get source => _source; + String get expendAmount => _expendAmount; + int get buyTimes => _buyTimes; + String get lastBuyTime => _lastBuyTime; + dynamic get vipNo => _vipNo; + dynamic get expireTime => _expireTime; + int get integral => _integral; + int get level => _level; + dynamic get vipRegStore => _vipRegStore; + + MemberSource({ + String id, + String createTime, + String createUser, + String updateTime, + String updateUser, + String mid, + String openid, + String nickname, + String headimg, + String balance, + String realRecharge, + String sex, + bool status, + bool onCredit, + String loginTime, + int loginNum, + String tenantCode, + int source, + String expendAmount, + int buyTimes, + String lastBuyTime, + dynamic vipNo, + dynamic expireTime, + int integral, + int level, + dynamic vipRegStore}){ + _id = id; + _createTime = createTime; + _createUser = createUser; + _updateTime = updateTime; + _updateUser = updateUser; + _mid = mid; + _openid = openid; + _nickname = nickname; + _headimg = headimg; + _balance = balance; + _realRecharge = realRecharge; + _sex = sex; + _status = status; + _onCredit = onCredit; + _loginTime = loginTime; + _loginNum = loginNum; + _tenantCode = tenantCode; + _source = source; + _expendAmount = expendAmount; + _buyTimes = buyTimes; + _lastBuyTime = lastBuyTime; + _vipNo = vipNo; + _expireTime = expireTime; + _integral = integral; + _level = level; + _vipRegStore = vipRegStore; +} + + MemberSource.fromJson(dynamic json) { + _id = json["id"]; + _createTime = json["createTime"]; + _createUser = json["createUser"]; + _updateTime = json["updateTime"]; + _updateUser = json["updateUser"]; + _mid = json["mid"]; + _openid = json["openid"]; + _nickname = json["nickname"]; + _headimg = json["headimg"]; + _balance = json["balance"]; + _realRecharge = json["realRecharge"]; + _sex = json["sex"]; + _status = json["status"]; + _onCredit = json["onCredit"]; + _loginTime = json["loginTime"]; + _loginNum = json["loginNum"]; + _tenantCode = json["tenantCode"]; + _source = json["source"]; + _expendAmount = json["expendAmount"]; + _buyTimes = json["buyTimes"]; + _lastBuyTime = json["lastBuyTime"]; + _vipNo = json["vip_no"]; + _expireTime = json["expireTime"]; + _integral = json["integral"]; + _level = json["level"]; + _vipRegStore = json["vipRegStore"]; + } + + Map toJson() { + var map = {}; + map["id"] = _id; + map["createTime"] = _createTime; + map["createUser"] = _createUser; + map["updateTime"] = _updateTime; + map["updateUser"] = _updateUser; + map["mid"] = _mid; + map["openid"] = _openid; + map["nickname"] = _nickname; + map["headimg"] = _headimg; + map["balance"] = _balance; + map["realRecharge"] = _realRecharge; + map["sex"] = _sex; + map["status"] = _status; + map["onCredit"] = _onCredit; + map["loginTime"] = _loginTime; + map["loginNum"] = _loginNum; + map["tenantCode"] = _tenantCode; + map["source"] = _source; + map["expendAmount"] = _expendAmount; + map["buyTimes"] = _buyTimes; + map["lastBuyTime"] = _lastBuyTime; + map["vip_no"] = _vipNo; + map["expireTime"] = _expireTime; + map["integral"] = _integral; + map["level"] = _level; + map["vipRegStore"] = _vipRegStore; + return map; + } + +} \ No newline at end of file diff --git a/lib/retrofit/data/page.dart b/lib/retrofit/data/page.dart index b19dbb63..b1290331 100644 --- a/lib/retrofit/data/page.dart +++ b/lib/retrofit/data/page.dart @@ -25,6 +25,7 @@ class PageInfo { ..total = json['total'] as String ..list = json['list'] as List ..records = json['records'] as List; + Map toJson() => { 'pageNum': this.pageNum, 'current': this.current, @@ -34,7 +35,7 @@ class PageInfo { 'hasPreviousPage': this.hasPreviousPage, 'hasNextPage': this.hasNextPage, 'total': this.total, - 'list': this.list, - 'records': this.records, + 'list': this.list.map((e) => e.toString()).toList(), + 'records': this.records.map((e) => e.toString()).toList(), }; } diff --git a/lib/retrofit/data/store_info.dart b/lib/retrofit/data/store_info.dart index b28b0ade..b453e079 100644 --- a/lib/retrofit/data/store_info.dart +++ b/lib/retrofit/data/store_info.dart @@ -1,6 +1,8 @@ import 'package:huixiang/retrofit/data/banner.dart'; import 'package:huixiang/retrofit/data/coupon_vo.dart'; import 'package:huixiang/retrofit/data/delivery_info.dart'; +import 'package:huixiang/retrofit/data/member_source.dart'; +import 'package:huixiang/retrofit/data/page.dart'; import 'package:huixiang/retrofit/data/promotion.dart'; import 'package:huixiang/retrofit/data/store_type.dart'; import 'package:huixiang/retrofit/data/mini.dart'; @@ -41,7 +43,10 @@ class StoreInfo { String businessService; Mini mini; bool useErp; - + String expireTime; + String vipFee; + MemberSource memberSource; + PageInfo informationVOPageVO; StoreInfo(); factory StoreInfo.fromJson(Map json) => StoreInfo() @@ -92,7 +97,11 @@ class StoreInfo { ..updateUser = json['updateUser'] as String ..businessService = json['businessService'] as String ..mini = json['mini'] == null ? null : Mini.fromJson(json['mini']) - ..useErp = json['useErp'] as bool; + ..useErp = json['useErp'] as bool + ..expireTime = json['expireTime'] as String + ..vipFee = json['vipFee'] as String + ..memberSource = json['memberSource'] != null ? MemberSource.fromJson(json['memberSource']) : null + ..informationVOPageVO = json['informationVOPageVO'] != null ? PageInfo.fromJson(json['informationVOPageVO']) : null; Map toJson() => { 'address': this.address, @@ -130,5 +139,10 @@ class StoreInfo { 'businessService': this.businessService, 'mini': this.mini.toJson(), 'useErp': this.useErp, + 'expireTime': this.expireTime, + 'vipFee': this.vipFee, + 'memberSource': this.memberSource.toJson(), + 'informationVOPageVO': this.informationVOPageVO.toJson(), }; + } diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 6bca8c30..7af0459f 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -11,9 +11,11 @@ import 'package:shared_preferences/shared_preferences.dart'; part 'retrofit_api.g.dart'; -// @RestApi(baseUrl: "http://192.168.10.236:8766/app/") -@RestApi(baseUrl: "http://platform.test.api.lotus-wallet.com/app/") -// @RestApi(baseUrl: "http://192.168.10.129:8766/app/") +const base_url = "http://platform.test.api.lotus-wallet.com/app/"; +// const base_url = "http://192.168.10.236:8766/app/"; +// const base_url = "http://192.168.10.129:8766/app/"; + +@RestApi(baseUrl: base_url) abstract class ApiService { factory ApiService(Dio dio, {String baseUrl, BuildContext context, String token}) { @@ -26,19 +28,19 @@ abstract class ApiService { responseType: ResponseType.json); dio.interceptors.add( InterceptorsWrapper(onRequest: (RequestOptions options) { - print("\n====================== 请求数据 ======================="); - print("method = ${options.method.toString()}"); - print("url = ${options.uri.toString()}"); - print("headers = ${options.headers}"); + debugPrint("\n====================== 请求数据 ======================="); + debugPrint("method = ${options.method.toString()}"); + debugPrint("url = ${options.uri.toString()}"); + debugPrint("headers = ${options.headers}"); if (options.data is FormData) { - print("params data = FormData"); + debugPrint("params data = FormData"); } else { - print("params data = ${jsonEncode(options.data)}"); + debugPrint("params data = ${jsonEncode(options.data)}"); } - print("params queryParameters = ${options.queryParameters}"); + debugPrint("params queryParameters = ${options.queryParameters}"); }, onResponse: (Response response) { - print("\n====================== 响应数据开始 ====================="); - print("code = ${response.statusCode}"); + debugPrint("\n====================== 响应数据开始 ====================="); + debugPrint("code = ${response.statusCode}"); // print("data = ${jsonEncode(response.data)}"); p(jsonEncode(response.data)); Map map = response.data; @@ -50,20 +52,18 @@ abstract class ApiService { }, ), (route) => route == null); } - print("======================= 响应数据结束 =======================\n"); + debugPrint("======================= 响应数据结束 =======================\n"); }, onError: (DioError e) { - print("\n=======================错误响应数据 ========================"); - print("type = ${e.type}"); - print("message = ${e.message}"); - print("\n"); + debugPrint("\n=======================错误响应数据 ========================"); + debugPrint("type = ${e.type}"); + debugPrint("message = ${e.message}"); + debugPrint("\n"); }), ); if(kReleaseMode) { - baseUrl = "http://platform.test.api.lotus-wallet.com/app/"; + baseUrl = base_url; } - - return _ApiService(dio, baseUrl: baseUrl); } @@ -73,7 +73,7 @@ abstract class ApiService { int maxStrLength = 900; //大于1000时 while (msg.length > maxStrLength) { - print(msg.substring(0, maxStrLength)); + debugPrint(msg.substring(0, maxStrLength)); msg = msg.substring(maxStrLength); } //剩余部分 diff --git a/lib/setting/help_feedback_page.dart b/lib/setting/help_feedback_page.dart index 9277dcb6..3b2d2f0f 100644 --- a/lib/setting/help_feedback_page.dart +++ b/lib/setting/help_feedback_page.dart @@ -123,11 +123,11 @@ class _HelpFeedbackPage extends State { "点击我的，进入我页面后，点击下方的领劵中心，进入后即可领取优惠券哦~", 0), _commonProblem( '如何兑换积分?', - "点击净币，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~", + "点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~", 1), _commonProblem( '如何签到?', - "1.点击净币，进入首页，点击上方的去签到。\n2.点击我的，进入我的页面，点击上方的积分详情，进入后即可签到。", + "1.点击净弼，进入首页，点击上方的去签到。\n2.点击我的，进入我的页面，点击上方的积分详情，进入后即可签到。", 2), ], ), diff --git a/lib/union/store_details_page.dart b/lib/union/store_details_page.dart index a6c28033..3b6474cb 100644 --- a/lib/union/store_details_page.dart +++ b/lib/union/store_details_page.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; +import 'package:flutter_html/image_render.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/view_widget/custom_image.dart'; +import 'package:huixiang/view_widget/my_appbar.dart'; class StoreDetailsPage extends StatefulWidget { final Map arguments; @@ -19,39 +22,23 @@ class _StoreDetailsPage extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar( - backgroundColor: Color(0xFFF7F7F7), - elevation: 0, - leading: GestureDetector( - onTap: () { - Navigator.of(context).pop(); - }, - child: Container( - alignment: Alignment.centerRight, - margin: EdgeInsets.only(left: 10), - padding: EdgeInsets.all(6), - child: Icon( - Icons.arrow_back_ios, - color: Colors.black, - size: 24, - ), - ), - ), - titleSpacing: 2, - leadingWidth: 56, - actions: [ - Container( - margin: EdgeInsets.only(right: 15), - child: GestureDetector( - onTap: () {}, - child: Icon( - Icons.share, - size: 24, - color: Colors.black, + appBar: MyAppBar( + action: Container( + margin: EdgeInsets.only(right: 15), + child: GestureDetector( + onTap: () {}, + child: Icon( + Icons.share, + size: 24, + color: Colors.black, + ), ), ), - ) - ], + background: Color(0xFFF7F7F7), + leadingColor: Colors.black, + title: widget.arguments["title"], + titleSize: 18.sp, + titleColor: Colors.black, ), body: Container( child: SingleChildScrollView( @@ -74,13 +61,21 @@ class _StoreDetailsPage extends State { padding: EdgeInsets.symmetric(horizontal: 12), child: Row( children: [ - Text( - "${widget.arguments["author"]}", - style: TextStyle( - fontWeight: FontWeight.normal, - fontSize: 14.sp, - color: Colors.blue, + InkWell( + child: Text( + "${widget.arguments["author"]}", + style: TextStyle( + fontWeight: FontWeight.normal, + fontSize: 14.sp, + color: Colors.blue, + ), ), + onTap: () { + if(widget.arguments.containsKey("storeId")) { + Navigator.of(context).pushNamed('/router/union_detail_page', + arguments: {"id": widget.arguments["storeId"]}); + } + }, ), SizedBox( width: 10, @@ -96,7 +91,19 @@ class _StoreDetailsPage extends State { ], ), ), - Html(data: widget.arguments['html']), + Html( + data: widget.arguments['html'], + customImageRenders: { + base64DataUriMatcher(): base64ImageRender(), + assetUriMatcher(): assetImageRender(), + networkSourceMatcher(extension: "svg"): svgNetworkImageRender(), + networkSourceMatcher(): networkImageRender( + loadingWidget: () { + return Image.asset("assets/image/default_1.png",); + } + ), + }, + ), ], ), ), diff --git a/lib/union/union_details_page.dart b/lib/union/union_details_page.dart index 2b5ebbd1..f03e3507 100644 --- a/lib/union/union_details_page.dart +++ b/lib/union/union_details_page.dart @@ -8,6 +8,7 @@ import 'package:flutter/rendering.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/retrofit/data/activity.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/store_info.dart'; import 'package:huixiang/retrofit/data/user_entity.dart'; @@ -52,6 +53,7 @@ class _UnionDetailsPage extends State { } StoreInfo storeInfo; + List activitys; queryStoreInfo() async { BaseData baseData = await apiService @@ -62,6 +64,7 @@ class _UnionDetailsPage extends State { if (baseData != null && baseData.isSuccess) { refreshController.refreshCompleted(); storeInfo = StoreInfo.fromJson(baseData.data); + activitys = storeInfo.informationVOPageVO.list.map((e) => Activity.fromJson(e)).toList(); if (mounted) setState(() {}); } else { refreshController.refreshFailed(); @@ -195,8 +198,8 @@ class _UnionDetailsPage extends State { null && storeInfo.openEndTime == null) - ? "全天" - : "${storeInfo.openStartTime} - ${storeInfo.openEndTime}"), + ? S.of(context).quantian + : "${storeInfo.openStartTime.substring(0, storeInfo.openStartTime.lastIndexOf(":"))} - ${storeInfo.openEndTime.substring(0, storeInfo.openEndTime.lastIndexOf(":"))}"), style: TextStyle( color: Color(0xFF353535), fontSize: 12.sp, @@ -238,7 +241,21 @@ class _UnionDetailsPage extends State { imgPath: "assets/image/icon_union_coupons.png", ), ), - buildCoupon(), + (storeInfo != null && storeInfo.couponVOList != null) + ? buildCoupon() + : Container( + width: double.infinity, + height: 50.h, + alignment: Alignment.center, + child: Text( + S.of(context).zanwuyouhuiquankelingqu, + style: TextStyle( + fontSize: 14.sp, + fontWeight: FontWeight.bold, + color: Color(0xFFA0A0A0), + ), + ), + ), Container( margin: EdgeInsets.only(top: 20.h, bottom: 20.h), child: ItemTitle( @@ -246,13 +263,28 @@ class _UnionDetailsPage extends State { imgPath: "assets/image/icon_union_start_store.png", ), ), - Container( - margin: EdgeInsets.only(bottom: 30.h), - child: AspectRatio( - aspectRatio: 1.55, - child: buildSwiper2Bottom(), - ), - ) + (activitys != null && activitys.length > 0) + ? Container( + margin: EdgeInsets.only(bottom: 30.h), + child: AspectRatio( + aspectRatio: 1.55, + child: buildSwiper2Bottom(), + ), + ) + : Container( + width: double.infinity, + height: 30.h, + margin: EdgeInsets.only(bottom: 30.h), + alignment: Alignment.center, + child: Text( + S.of(context).muqianzanwuxingdianhuodong, + style: TextStyle( + fontSize: 14.sp, + fontWeight: FontWeight.bold, + color: Color(0xFFA0A0A0), + ), + ), + ), ], ), ), @@ -306,7 +338,9 @@ class _UnionDetailsPage extends State { Widget buildVip() { return Container( - margin: EdgeInsets.symmetric(vertical: 20.h, horizontal: 16.w), + margin: EdgeInsets.symmetric( + vertical: (storeInfo != null && storeInfo.isVip) ? 12.h : 20.h, + horizontal: 16.w), padding: EdgeInsets.all(16), decoration: BoxDecoration( image: DecorationImage( @@ -314,47 +348,127 @@ class _UnionDetailsPage extends State { image: AssetImage("assets/image/icon_vip_bg.png"), ), ), - child: Row( - children: [ - Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, + child: (storeInfo != null && storeInfo.isVip) + ? Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.max, children: [ - Image.asset( - "assets/image/icon_vip.png", - width: 36.w, - height: 20.h, - ), - SizedBox( - height: 2.h, + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + Text( + S.of(context).huiyuanyue, + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.bold, + color: Colors.white, + ), + ), + SizedBox( + width: 8.w, + ), + Text( + "¥${(storeInfo != null && storeInfo.memberSource != null) ? storeInfo.memberSource.balance : ""}", + style: TextStyle( + fontSize: 14.sp, + fontWeight: FontWeight.bold, + color: Colors.white, + ), + ), + ], + ), + Container( + color: Colors.white, + width: 1.w, + height: 20.h, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + Text( + S.of(context).huiyuanjifen, + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.bold, + color: Colors.white, + ), + ), + SizedBox( + width: 8.w, + ), + Text( + (storeInfo != null && storeInfo.memberSource != null) ? "${storeInfo.memberSource.integral}" : "", + style: TextStyle( + fontSize: 14.sp, + fontWeight: FontWeight.bold, + color: Colors.white, + ), + ), + ], + ), + ], ), + SizedBox(height: 10.h,), Text( - S.of(context).chengweidianpuzhuanshuhuiyuan, + S.of(context).gongxinichengweibendianhuiyuan, style: TextStyle( fontSize: 10.sp, - color: Color(0xCFFFFFFF), fontWeight: FontWeight.bold, + color: Color(0xFFEDC98E), ), ) ], + ) + : Row( + children: [ + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Image.asset( + "assets/image/icon_vip.png", + width: 36.w, + height: 20.h, + ), + SizedBox( + height: 2.h, + ), + Text( + S.of(context).chengweidianpuzhuanshuhuiyuan, + style: TextStyle( + fontSize: 10.sp, + color: Color(0xCFFFFFFF), + fontWeight: FontWeight.bold, + ), + ), + ], + ), + flex: 1, + ), + InkWell( + onTap: () { + receiveVip(); + }, + child: RoundButton( + text: S.of(context).dianwolingqu, + textColor: isReceive ? Colors.white : Color(0xFF484D66), + backgroup: isReceive ? Color(0xFF242B45) : Colors.white, + padding: + EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w), + radius: 14, + ), + ), + ], ), - flex: 1, - ), - InkWell( - onTap: () { - receiveVip(); - }, - child: RoundButton( - text: S.of(context).dianwolingqu, - textColor: isReceive ? Colors.white : Color(0xFF484D66), - backgroup: isReceive ? Color(0xFF242B45) : Colors.white, - padding: EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w), - radius: 14, - ), - ), - ], - ), ); } @@ -398,10 +512,13 @@ class _UnionDetailsPage extends State { margin: EdgeInsets.only(left: 5), child: Text.rich(TextSpan(children: [ TextSpan( - text: (storeInfo != - null && - storeInfo.couponVOList != null && storeInfo.couponVOList[position] - .bizType == 1) ? "¥" : "", + text: (storeInfo != null && + storeInfo.couponVOList != null && + storeInfo.couponVOList[position] + .bizType == + 1) + ? "¥" + : "", style: TextStyle( fontSize: 22.sp, color: Color(0xFFFF7A1A), @@ -409,10 +526,11 @@ class _UnionDetailsPage extends State { ), ), TextSpan( - text: (storeInfo != - null && - storeInfo.couponVOList != null && storeInfo.couponVOList[position] - .bizType == 1) + text: (storeInfo != null && + storeInfo.couponVOList != null && + storeInfo.couponVOList[position] + .bizType == + 1) ? "${double.tryParse(storeInfo.couponVOList[position].discountAmount).toInt()}" : "${storeInfo.couponVOList[position].discountPercent}折", style: TextStyle( @@ -454,6 +572,8 @@ class _UnionDetailsPage extends State { ? storeInfo .couponVOList[position].couponName : "", + maxLines: 1, + overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 10.sp, fontWeight: FontWeight.bold, @@ -520,15 +640,21 @@ class _UnionDetailsPage extends State { ), InkWell( onTap: () { - receiveCoupon(storeInfo.couponVOList[position].id); + receiveCoupon( + storeInfo.couponVOList[position].id); }, child: Container( height: 25.h, child: RoundButton( text: S.of(context).lingqu, textColor: Colors.white, - backgroup: (storeInfo != null && storeInfo - .couponVOList != null && storeInfo.couponVOList[position].status >= 2) ? Colors.grey : Color(0xFF32A060), + backgroup: (storeInfo != null && + storeInfo.couponVOList != null && + storeInfo.couponVOList[position] + .status >= + 2) + ? Colors.grey + : Color(0xFF32A060), padding: EdgeInsets.fromLTRB(8, 4, 8, 4), fontSize: 12.sp, ), @@ -586,112 +712,120 @@ class _UnionDetailsPage extends State { viewportFraction: 0.95, loop: false, itemBuilder: (context, position) { - return Container( - margin: EdgeInsets.symmetric(horizontal: 5.w), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - boxShadow: [ - BoxShadow( - color: Color(0x0D000000), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ], - ), - child: Stack( - children: [ - Container( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.max, - children: [ - MImage( - (storeInfo != null && storeInfo.promotionList != null) - ? storeInfo.promotionList[position].image - : "", - aspectRatio: 2.14375, - radius: BorderRadius.only( - topRight: Radius.circular(8), - topLeft: Radius.circular(8), + return InkWell( + onTap: () { + Navigator.of(context) + .pushNamed('/router/store_detail_page', arguments: { + "html": activitys[position].content, + "title": activitys[position].mainTitle, + "time": activitys[position].createTime, + "author": activitys[position].storeName + }); + }, + child: Container( + margin: EdgeInsets.symmetric(horizontal: 5.w), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + boxShadow: [ + BoxShadow( + color: Color(0x0D000000), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + ), + child: Stack( + children: [ + Container( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + MImage( + (activitys != null) + ? activitys[position].coverImg + : "", + aspectRatio: 2.2, + radius: BorderRadius.only( + topRight: Radius.circular(8), + topLeft: Radius.circular(8), + ), + fit: BoxFit.cover, + errorSrc: "assets/image/default_2_1.png", + fadeSrc: "assets/image/default_2_1.png", ), - fit: BoxFit.cover, - errorSrc: "assets/image/default_2_1.png", - fadeSrc: "assets/image/default_2_1.png", - ), - Container( - padding: EdgeInsets.all(8), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - (storeInfo != null && - storeInfo.promotionList != null) - ? storeInfo.promotionList[position].name - : "", - style: TextStyle( - fontSize: 14.sp, - fontWeight: FontWeight.bold, - color: Color(0xFF000000), + Container( + padding: EdgeInsets.all(8), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + (activitys != null) + ? activitys[position].storeName + : "", + style: TextStyle( + fontSize: 14.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF000000), + ), ), - ), - SizedBox( - height: 4.h, - ), - Text( - (storeInfo != null && - storeInfo.promotionList != null) - ? storeInfo - .promotionList[position].description - : "", - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.bold, - color: Color(0xFF727272), + SizedBox( + height: 4.h, ), - ), - ], + Text( + (activitys != null) + ? activitys[position].mainTitle + : "", + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF727272), + ), + ), + ], + ), ), - ), - ], - ), - ), - Positioned( - top: 0, - right: 0, - child: Container( - padding: EdgeInsets.symmetric( - vertical: 4.h, - horizontal: 8.w, + ], ), - decoration: BoxDecoration( - color: Colors.black.withAlpha(76), - borderRadius: BorderRadius.only( - bottomLeft: Radius.circular(8), - topRight: Radius.circular(8), + ), + Positioned( + top: 0, + right: 0, + child: Container( + padding: EdgeInsets.symmetric( + vertical: 4.h, + horizontal: 8.w, ), - ), - child: Text( - (storeInfo != null && storeInfo.promotionList != null) - ? storeInfo.promotionList[position].activityStartTime - .split(" ")[0] - : "", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 12.sp, - color: Color(0xD9FFFFFF), + decoration: BoxDecoration( + color: Colors.black.withAlpha(76), + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(8), + topRight: Radius.circular(8), + ), + ), + child: Text( + (activitys != null) + ? activitys[position].startTime + .split(" ")[0] + : "", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 12.sp, + color: Color(0xD9FFFFFF), + ), ), ), ), - ), - ], + ], + ), ), ); }, - itemCount: (storeInfo != null && storeInfo.promotionList != null) + itemCount: (activitys != null && activitys.length > 0) ? storeInfo.promotionList.length : 0, ), @@ -720,7 +854,6 @@ class _UnionDetailsPage extends State { position < storeInfo.bannerList.length) ? storeInfo.bannerList[position].imgUrl : "", - fit: BoxFit.cover, radius: BorderRadius.circular(4), errorSrc: "assets/image/default_2_1.png", @@ -734,6 +867,19 @@ class _UnionDetailsPage extends State { ); } +//{"uid":"1412687522458238976", +// "userInfo":{"headimg":"https:\/\/pos.upload.gznl.top\/admin\/2021\/07\/4ed055e5-5341-4080-a6f0-fe97c62d078f.jpg", +// "balance":null, +// "money":"0.00", +// "phone":"13800138000", +// "isBind":true, +// "nickname":"你这橘子洋气呀" +// }, +// "baseURL":"https:\/\/pos-test.api.lotus-wallet.com\/app\/", +// "shopId":"1344490596986781696", +// "tenantCode":"1177", +// "position":"30.554638,114.34394500000002", +// "token":"Bearer eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJNSU5JIiwibmFtZSI6IiIsInRva2VuX3R5cGUiOiJ0b2tlbiIsInVzZXJpZCI6IjE0MTI2ODc1MjI0NTgyMzg5NzYiLCJhY2NvdW50IjoiIiwiZXhwIjoxNjI2Nzk1Nzc0LCJuYmYiOjE2MjY3NjY5NzR9.cggcx_vqTozKS-z9uygjV4uA2yHQ4eWssMAngd2c-i0"} printMin() async { String miniAppId = storeInfo.mini.miniAppId; print("print isExistsApp: ${await Min.isExistsApp(miniAppId)}"); @@ -784,14 +930,6 @@ class _UnionDetailsPage extends State { } } -//baseURL : 'http://192.168.10.130:8765/app/', // 本地 -//baseURL : 'http://192.168.10.236:8766/app/', // 本地 -// baseURL : 'https://pos-test.api.lotus-wallet.com/app/', //测试 -// baseURL : 'https://pos.api.lotus-wallet.com/app/', //线上 -// socketUrl: 'ws://192.168.10.130:9999/cart', // 本地 -// socketUrl : 'wss://pos-test.api.lotus-wallet.com:10005/cart', //测试 -// socketUrl : 'wss://pos.api.lotus-wallet.com:10015/cart', //线上 - SharedPreferences sharedPreferences = await SharedPreferences.getInstance(); String nickname = sharedPreferences.getString("nick"); String mobile = sharedPreferences.getString("mobile"); @@ -819,12 +957,12 @@ class _UnionDetailsPage extends State { }); } -//__UNI__ACD00DA Function state; double progressValue = 0; String downText = "正在下载中..."; downloadWgt(appid, savePath) async { + downText = S.of(context).zhengzaixiazaizhong; showCupertinoDialog( context: context, barrierDismissible: true, @@ -875,13 +1013,18 @@ class _UnionDetailsPage extends State { .download(storeInfo.mini.miniDownloadUrl, savePath, onReceiveProgress: (progress, max) { progressValue = progress.toDouble() / max.toDouble(); - print("print progressValue: $progressValue"); + // print("print progressValue: $progressValue"); state(() {}); }); if (response.statusCode == 200) { downText = "下载完成"; SharedPreferences.getInstance().then((value) { - value.setStringList("miniAppid", (value.getStringList("miniAppid") != null ? value.getStringList("miniAppid") : [])..add(appid)); + value.setStringList( + "miniAppid", + (value.getStringList("miniAppid") != null + ? value.getStringList("miniAppid") + : []) + ..add(appid)); }); state(() {}); Future.delayed(Duration(seconds: 1), () { @@ -889,6 +1032,8 @@ class _UnionDetailsPage extends State { Navigator.of(context).pop(); } }); + } else { + print("print 下载失败"); } } diff --git a/lib/union/union_page.dart b/lib/union/union_page.dart index 6e957bda..3166b7f4 100644 --- a/lib/union/union_page.dart +++ b/lib/union/union_page.dart @@ -107,6 +107,7 @@ class _UnionPage extends State "feaae7986201b571cace1b83728be5bb"); aMapFlutterLocation = AMapFlutterLocation(); aMapFlutterLocation.onLocationChanged().listen((event) { + if (Navigator.canPop(context)) Navigator.of(context).pop(); if (event != null && event["latitude"] != null && event["longitude"] != null) { @@ -141,11 +142,13 @@ class _UnionPage extends State setState(() {}); }); } + aMapFlutterLocation.setLocationOption(AMapLocationOption( needAddress: true, onceLocation: true, locationMode: AMapLocationMode.Hight_Accuracy, - desiredAccuracy: DesiredAccuracy.ThreeKilometers, + desiredAccuracy: DesiredAccuracy.HundredMeters, + desiredLocationAccuracyAuthorizationMode: AMapLocationAccuracyAuthorizationMode.FullAndReduceAccuracy, pausesLocationUpdatesAutomatically: true, )); @@ -209,9 +212,9 @@ class _UnionPage extends State } List storeList; - bool isFirst = true; queryStore(latitude, longitude, province, city, district, searchKey) async { + showLoadingDialog(); BaseData baseData = await apiService.queryStore({ // "city": city, // "district": district, @@ -223,9 +226,8 @@ class _UnionPage extends State refreshController.refreshFailed(); }); - if (Navigator.canPop(context) && !isFirst) Navigator.of(context).pop(); - - isFirst = false; + if (Navigator.canPop(context)) + Navigator.of(context).pop(); if (baseData != null && baseData.isSuccess) { storeList = (baseData.data as List) diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index 15a97ff2..a7745e67 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -133,7 +133,7 @@ class NewCouponWidget extends StatelessWidget { ], ), ), - flex: (coupon != null && coupon.isEx) ? 95 : 97, + flex: (coupon != null && coupon.isEx) ? 97 : 97, ), Container( padding: EdgeInsets.symmetric(horizontal: 23.w), diff --git a/lib/view_widget/store_title_tab.dart b/lib/view_widget/store_title_tab.dart new file mode 100644 index 00000000..71731743 --- /dev/null +++ b/lib/view_widget/store_title_tab.dart @@ -0,0 +1,171 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/view_widget/icon_text.dart'; + +class StoreTitleTab extends StatefulWidget { + final ScrollController scrollController; + final List brandText; + + final GlobalKey chiliGlobalKey; + final GlobalKey milkTeaGlobalKey; + final GlobalKey breadGlobalKey; + + StoreTitleTab(this.brandText, + {this.scrollController, + this.chiliGlobalKey, + this.milkTeaGlobalKey, + this.breadGlobalKey}); + + @override + State createState() { + return _StoreTitleTab(); + } +} + +class _StoreTitleTab extends State { + int selectedIndex = -1; + int selectedIndex1 = -1; + bool isVisible = false; + + List images = [ + "assets/image/icon_chili.png", + "assets/image/icon_milk_tea.png", + "assets/image/icon_bread.png", + ]; + + @override + void initState() { + super.initState(); + + if (widget.scrollController != null) { + widget.scrollController.addListener(() { + RenderBox chiliRenderBox = + widget.chiliGlobalKey.currentContext.findRenderObject(); + RenderBox milkTeaRenderBox = + widget.milkTeaGlobalKey.currentContext.findRenderObject(); + RenderBox breadRenderBox = + widget.breadGlobalKey.currentContext.findRenderObject(); + + Offset chiliOffset = chiliRenderBox.localToGlobal(Offset.zero); + Offset milkTeaOffset = milkTeaRenderBox.localToGlobal(Offset.zero); + Offset breadOffset = breadRenderBox.localToGlobal(Offset.zero); + + var top = 96.h; + if (chiliOffset.dy <= top) { + if (!isVisible) { + isVisible = true; + setState(() {}); + } + } else { + var b = isVisible; + isVisible = false; + if (b) setState(() {}); + selectedIndex = -1; + } + if (chiliOffset.dy <= top && breadOffset.dy > top) { + selectedIndex = 0; + if (selectedIndex1 != selectedIndex) { + setState(() { + print("object：$selectedIndex"); + }); + selectedIndex1 = selectedIndex; + } + } else if (breadOffset.dy <= top && milkTeaOffset.dy > top) { + selectedIndex = 1; + if (selectedIndex1 != selectedIndex) { + setState(() { + print("object：$selectedIndex"); + }); + selectedIndex1 = selectedIndex; + } + } else if (milkTeaOffset.dy <= top) { + selectedIndex = 2; + if (selectedIndex1 != selectedIndex) { + setState(() { + print("object：$selectedIndex"); + }); + selectedIndex1 = selectedIndex; + } + } + }); + } + } + + @override + Widget build(BuildContext context) { + return Visibility( + visible: (widget.scrollController == null) ? true : isVisible, + child: Container( + width: MediaQuery.of(context).size.width, + child: Container( + height: 52.h, + color: Colors.white, + padding: EdgeInsets.all(6), + alignment: Alignment.center, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: (widget.brandText == null || widget.brandText.isEmpty) + ? [] + : (widget.brandText.map((e) { + return item(e, selectedIndex == widget.brandText.indexOf(e), + widget.brandText.indexOf(e)); + }).toList()), + ), + ), + ), + ); + } + + Widget item(text, isSelected, index) { + print("selectedIndex: $selectedIndex"); + return GestureDetector( + onTap: () { + FlexParentData parendData; + if (index == 0) { + parendData = widget.chiliGlobalKey.currentContext + .findRenderObject() + .parentData; + } else if (index == 2) { + parendData = widget.milkTeaGlobalKey.currentContext + .findRenderObject() + .parentData; + } else if (index == 1) { + parendData = widget.breadGlobalKey.currentContext + .findRenderObject() + .parentData; + } + double offset = parendData.offset.dy - 52.h + 20.h; + widget.scrollController.animateTo(offset, + duration: Duration(seconds: 1), curve: Curves.ease); + }, + child: tabItem(text, isSelected, index), + ); + } + + Widget tabItem(text, isSelected, index) { + if (isSelected) { + return IconText( + text, + isMax: false, + rightImage: images[index], + iconSize: 16, + iconColor: Colors.red, + textStyle: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + color: Color(0xFF353535)), + ); + } else { + return IconText( + text, + isMax: false, + textStyle: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + color: Color(0xFF353535)), + ); + } + } +}