diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index ee8c6e6..c03dcd7 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 6ee2a84..53a209f 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -383,6 +383,38 @@ endingLineNumber = "35" landmarkName = "+dd_thumbnailImageForVideo:" landmarkType = "7"> + + + + + + - - - - - - - - - - @@ -4839,8 +4823,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "807" - endingLineNumber = "807" + startingLineNumber = "813" + endingLineNumber = "813" landmarkName = "addSubviews()" landmarkType = "7"> @@ -5015,8 +4999,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "872" - endingLineNumber = "872" + startingLineNumber = "878" + endingLineNumber = "878" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5095,8 +5079,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1277" - endingLineNumber = "1277" + startingLineNumber = "1286" + endingLineNumber = "1286" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5143,8 +5127,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1289" - endingLineNumber = "1289" + startingLineNumber = "1298" + endingLineNumber = "1298" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5191,8 +5175,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1291" - endingLineNumber = "1291" + startingLineNumber = "1300" + endingLineNumber = "1300" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5286,8 +5270,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1118" - endingLineNumber = "1118" + startingLineNumber = "1127" + endingLineNumber = "1127" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -5302,8 +5286,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1421" - endingLineNumber = "1421" + startingLineNumber = "1430" + endingLineNumber = "1430" landmarkName = "updateData(taskModel:)" landmarkType = "7"> @@ -5334,8 +5318,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1280" - endingLineNumber = "1280" + startingLineNumber = "1289" + endingLineNumber = "1289" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5350,8 +5334,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1293" - endingLineNumber = "1293" + startingLineNumber = "1302" + endingLineNumber = "1302" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5366,8 +5350,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1123" - endingLineNumber = "1123" + startingLineNumber = "1132" + endingLineNumber = "1132" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -5382,8 +5366,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1292" - endingLineNumber = "1292" + startingLineNumber = "1301" + endingLineNumber = "1301" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5414,8 +5398,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "633" - endingLineNumber = "633" + startingLineNumber = "639" + endingLineNumber = "639" landmarkName = "showListDetail(vehicleModel:)" landmarkType = "7"> @@ -5462,8 +5446,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "852" - endingLineNumber = "852" + startingLineNumber = "858" + endingLineNumber = "858" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5478,8 +5462,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "858" - endingLineNumber = "858" + startingLineNumber = "864" + endingLineNumber = "864" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5494,8 +5478,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "864" - endingLineNumber = "864" + startingLineNumber = "870" + endingLineNumber = "870" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5574,8 +5558,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1427" - endingLineNumber = "1427" + startingLineNumber = "1436" + endingLineNumber = "1436" landmarkName = "listView()" landmarkType = "7"> @@ -5628,5 +5612,37 @@ landmarkType = "7"> + + + + + + + + diff --git a/OrderScheduling/Assets.xcassets/VehicleMonitoring/.DS_Store b/OrderScheduling/Assets.xcassets/VehicleMonitoring/.DS_Store index d934478..1c8918e 100644 Binary files a/OrderScheduling/Assets.xcassets/VehicleMonitoring/.DS_Store and b/OrderScheduling/Assets.xcassets/VehicleMonitoring/.DS_Store differ diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 1d89740..5e8ab9c 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -305,7 +305,7 @@ extension VehicleMonitoringController : DDMAMapViewDelegate { public func dd_mapView(_ mapView: MAMapView, mapDidZoomByUser wasUserAction: Bool) { /// 缩小过一次后就不需要频繁调用移除添加 - if mapView.zoomLevel <= 16 { + if mapView.zoomLevel <= 11 { shouldShowSmallAnnotation = true if isShowSmallAnnotation == false { @@ -554,6 +554,7 @@ extension VehicleMonitoringController { func annotationViewStateConfig(annotationView: VehicleMonitoringPointAnnotation,vehicleModel: VehicleMonitorListDataModel.ItemModel, shouldShowSmallAnnotation: Bool) { var backgroundColor : UIColor? var bigImage : UIImage? + var middleImage : UIImage? if let alarmType = vehicleModel.alarmType { switch alarmType.code { @@ -569,22 +570,27 @@ extension VehicleMonitoringController { case .offLine,.lostConnection: backgroundColor = .hex("858585") bigImage = UIImage(named: "vehicleMonitoring_offline_big") + middleImage = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") break case .onLine,.leisure: backgroundColor = .hex("067BB9") bigImage = UIImage(named: "vehicleMonitoring_empty_big") + middleImage = UIImage(named: "vehicleMonitor_empty_cell_flag_bg") break case .busy: backgroundColor = .hex("F05412") bigImage = UIImage(named: "vehicleMonitoring_busy_big") + middleImage = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break case .BuyBusy: backgroundColor = .hex("F05412") bigImage = UIImage(named: "vehicleMonitoring_busy_big") + middleImage = UIImage(named: "vehicleMonitor_busy_cell_onlne_bg") break case .none: backgroundColor = .hex("858585") bigImage = UIImage(named: "vehicleMonitoring_offline_big") + middleImage = UIImage(named: "vehicleMonitor_offline_cell_flag_bg") break } } @@ -613,7 +619,7 @@ extension VehicleMonitoringController { annotationView.middleImageView.isHidden = false annotationView.middleStateLabel.isHidden = false annotationView.titleLabel.isHidden = false - annotationView.middleImageView.backgroundColor = backgroundColor + annotationView.middleImageView.image = middleImage annotationView.middleStateLabel.text = vehicleModel.vehicleTypeStr annotationView.middleWorkingCountlabel.isHidden = !vehicleModel.shouldShowWorkingCount if let workingCount = vehicleModel.workingCount { @@ -871,6 +877,9 @@ open class VehicleMonitoringController : ZDViewController { pannelPanGes.panGesValue.minDisplayHeight = minDisplayHeight pannelPanGes.panGesValue.maxDisplayHeight = maxDisplayHeight pannelPanGes.panGesValue.defaultDisplayHeight = defaultDisplayHeight + + /// categoryView会影响导航栏的背景色 + dd_navigationBarBackgroundColor = .hex("354683") } open override func viewWillLayoutSubviews() { @@ -880,7 +889,6 @@ open class VehicleMonitoringController : ZDViewController { open override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - dd_navigationBarBackgroundColor = .hex("354683") } open override func viewWillDisappear(_ animated: Bool) { @@ -916,6 +924,7 @@ open class VehicleMonitoringView : DDView { panGes = UIPanGestureRecognizer() super.init(frame: .zero) + maMapView.maMapView.isRotateCameraEnabled = false addSubview(maMapView) coverView.addGestureRecognizer(tapGes) coverView.addGestureRecognizer(panGes) diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift index ab5caf3..7f89ee4 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift @@ -186,7 +186,10 @@ open class VehicleMonitoringListView : DDView { super.init(frame: frame) tableView.separatorStyle = .none - + tableView.contentInsetAdjustmentBehavior = .never + if #available(iOS 15.0, *) { + tableView.sectionHeaderTopPadding = 0 + } addSubview(tableView) tableView.snp.makeConstraints { make in make.edges.equalToSuperview() diff --git a/Podfile b/Podfile index 1050348..664f525 100644 --- a/Podfile +++ b/Podfile @@ -13,7 +13,7 @@ target 'OrderScheduling' do pod 'DDColorKit_Private' pod 'DDFontKit_Private' pod 'IQKeyboardManagerSwift' - pod 'DDMAMapKit_Private' + pod 'DDMAMapKit_Private', '0.2.3' pod 'SnapKit' pod 'DDAutoUIKit_Private' pod 'RxSwift' diff --git a/Podfile.lock b/Podfile.lock index a1a6835..9ed2d1b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -210,35 +210,35 @@ PODS: - DDLogKit_Private/SwiftLog (= 0.1.4) - DDLogKit_Private/OCLog (0.1.4) - DDLogKit_Private/SwiftLog (0.1.4) - - DDMAMapKit_Private (0.2.2): - - DDMAMapKit_Private/DDMALocation (= 0.2.2) - - DDMAMapKit_Private/DDMAMap (= 0.2.2) - - DDMAMapKit_Private/DDMANaviManager (= 0.2.2) - - DDMAMapKit_Private/DDMASearch (= 0.2.2) - - DDMAMapKit_Private/DDMATrackManager (= 0.2.2) - - DDMAMapKit_Private/DDMAUtil (= 0.2.2) - - DDMAMapKit_Private/DDMALocation (0.2.2): + - DDMAMapKit_Private (0.2.3): + - DDMAMapKit_Private/DDMALocation (= 0.2.3) + - DDMAMapKit_Private/DDMAMap (= 0.2.3) + - DDMAMapKit_Private/DDMANaviManager (= 0.2.3) + - DDMAMapKit_Private/DDMASearch (= 0.2.3) + - DDMAMapKit_Private/DDMATrackManager (= 0.2.3) + - DDMAMapKit_Private/DDMAUtil (= 0.2.3) + - DDMAMapKit_Private/DDMALocation (0.2.3): - AMapLocation-NO-IDFA (= 2.10.0) - DDLogKit_Private - - DDMAMapKit_Private/DDMAMap (0.2.2): + - DDMAMapKit_Private/DDMAMap (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - - DDMAMapKit_Private/DDMAMap/Annotation (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/AnnotationView (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/MapView (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/Overlay (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/Sources (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/Trace (= 0.2.2) + - DDMAMapKit_Private/DDMAMap/Annotation (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/AnnotationView (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/MapView (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/Overlay (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/Sources (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/Trace (= 0.2.3) - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/Annotation (0.2.2): + - DDMAMapKit_Private/DDMAMap/Annotation (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/AnnotationView (0.2.2): + - DDMAMapKit_Private/DDMAMap/AnnotationView (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/MapView (0.2.2): + - DDMAMapKit_Private/DDMAMap/MapView (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMAMap/Annotation @@ -247,29 +247,29 @@ PODS: - DDMAMapKit_Private/DDMAMap/Sources - DDMAMapKit_Private/DDMAMap/Trace - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/Overlay (0.2.2): + - DDMAMapKit_Private/DDMAMap/Overlay (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/Sources (0.2.2): + - DDMAMapKit_Private/DDMAMap/Sources (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/Trace (0.2.2): + - DDMAMapKit_Private/DDMAMap/Trace (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMANaviManager (0.2.2): + - DDMAMapKit_Private/DDMANaviManager (0.2.3): - AMapFoundation-NO-IDFA (= 1.8.2) - AMapNavi-NO-IDFA (= 9.8.1) - - DDMAMapKit_Private/DDMASearch (0.2.2): + - DDMAMapKit_Private/DDMASearch (0.2.3): - AMapSearch-NO-IDFA (= 9.7.0) - "DDCategoryKit_Private/NSThread+DDCategory" - DDLogKit_Private - - DDMAMapKit_Private/DDMATrackManager (0.2.2): + - DDMAMapKit_Private/DDMATrackManager (0.2.3): - AMapTrack-NO-IDFA (= 1.4.2) - DDLogKit_Private - - DDMAMapKit_Private/DDMAUtil (0.2.2): + - DDMAMapKit_Private/DDMAUtil (0.2.3): - DDMAMapKit_Private/DDMAMap - DDNetworkingOfAlamofireKit_Private (0.2.1): - Alamofire @@ -346,7 +346,7 @@ DEPENDENCIES: - DDControlsKit_Private (= 0.1.4) - DDDateKit_Private - DDFontKit_Private - - DDMAMapKit_Private + - DDMAMapKit_Private (= 0.2.3) - DDNetworkingOfAlamofireKit_Private - DDPersistenceKit_Private - DDProgressHUDKit_Private @@ -435,7 +435,7 @@ SPEC CHECKSUMS: DDDateKit_Private: f8348d10cec77ccacd2f5ec27d587ea2898ae90a DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806 DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0 - DDMAMapKit_Private: a3cdcccf284fc0fd63d48726e65e36b1255e4d4f + DDMAMapKit_Private: dcfa1b22ba34562e99120066424834b1f498c3c2 DDNetworkingOfAlamofireKit_Private: 652eb70a7d8bac81d77d036fabeb52f807120f6d DDPersistenceKit_Private: c150822543ffa6ece3900178629812f64902ed90 DDProgressHUDKit_Private: 1e219062ddeb7801a4bb13b367efa1f3fbf17f1e @@ -461,6 +461,6 @@ SPEC CHECKSUMS: SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6 ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b -PODFILE CHECKSUM: 2e0cc301f049eb136c4bc3fa33f6047cd0e03e64 +PODFILE CHECKSUM: cfac3608e685491f1a248909d602e94d677d553c COCOAPODS: 1.11.3 diff --git a/Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.h b/Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.h index fd5c1f3..b3bbafb 100644 --- a/Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.h +++ b/Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @class DDAnnotation; @interface DDMAMapView : UIView -@property (nonatomic, strong, nonnull)MAMapView *maMapView; +@property (nonatomic, strong, nonnull)MAMapView *maMapView UI_APPEARANCE_SELECTOR; @property (nonatomic, weak)id delegate; diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index a1a6835..9ed2d1b 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -210,35 +210,35 @@ PODS: - DDLogKit_Private/SwiftLog (= 0.1.4) - DDLogKit_Private/OCLog (0.1.4) - DDLogKit_Private/SwiftLog (0.1.4) - - DDMAMapKit_Private (0.2.2): - - DDMAMapKit_Private/DDMALocation (= 0.2.2) - - DDMAMapKit_Private/DDMAMap (= 0.2.2) - - DDMAMapKit_Private/DDMANaviManager (= 0.2.2) - - DDMAMapKit_Private/DDMASearch (= 0.2.2) - - DDMAMapKit_Private/DDMATrackManager (= 0.2.2) - - DDMAMapKit_Private/DDMAUtil (= 0.2.2) - - DDMAMapKit_Private/DDMALocation (0.2.2): + - DDMAMapKit_Private (0.2.3): + - DDMAMapKit_Private/DDMALocation (= 0.2.3) + - DDMAMapKit_Private/DDMAMap (= 0.2.3) + - DDMAMapKit_Private/DDMANaviManager (= 0.2.3) + - DDMAMapKit_Private/DDMASearch (= 0.2.3) + - DDMAMapKit_Private/DDMATrackManager (= 0.2.3) + - DDMAMapKit_Private/DDMAUtil (= 0.2.3) + - DDMAMapKit_Private/DDMALocation (0.2.3): - AMapLocation-NO-IDFA (= 2.10.0) - DDLogKit_Private - - DDMAMapKit_Private/DDMAMap (0.2.2): + - DDMAMapKit_Private/DDMAMap (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - - DDMAMapKit_Private/DDMAMap/Annotation (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/AnnotationView (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/MapView (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/Overlay (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/Sources (= 0.2.2) - - DDMAMapKit_Private/DDMAMap/Trace (= 0.2.2) + - DDMAMapKit_Private/DDMAMap/Annotation (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/AnnotationView (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/MapView (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/Overlay (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/Sources (= 0.2.3) + - DDMAMapKit_Private/DDMAMap/Trace (= 0.2.3) - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/Annotation (0.2.2): + - DDMAMapKit_Private/DDMAMap/Annotation (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/AnnotationView (0.2.2): + - DDMAMapKit_Private/DDMAMap/AnnotationView (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/MapView (0.2.2): + - DDMAMapKit_Private/DDMAMap/MapView (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMAMap/Annotation @@ -247,29 +247,29 @@ PODS: - DDMAMapKit_Private/DDMAMap/Sources - DDMAMapKit_Private/DDMAMap/Trace - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/Overlay (0.2.2): + - DDMAMapKit_Private/DDMAMap/Overlay (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/Sources (0.2.2): + - DDMAMapKit_Private/DDMAMap/Sources (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMAMap/Trace (0.2.2): + - DDMAMapKit_Private/DDMAMap/Trace (0.2.3): - "DDCategoryKit_Private/UIImage+DDCategory" - DDLogKit_Private - DDMAMapKit_Private/DDMANaviManager - - DDMAMapKit_Private/DDMANaviManager (0.2.2): + - DDMAMapKit_Private/DDMANaviManager (0.2.3): - AMapFoundation-NO-IDFA (= 1.8.2) - AMapNavi-NO-IDFA (= 9.8.1) - - DDMAMapKit_Private/DDMASearch (0.2.2): + - DDMAMapKit_Private/DDMASearch (0.2.3): - AMapSearch-NO-IDFA (= 9.7.0) - "DDCategoryKit_Private/NSThread+DDCategory" - DDLogKit_Private - - DDMAMapKit_Private/DDMATrackManager (0.2.2): + - DDMAMapKit_Private/DDMATrackManager (0.2.3): - AMapTrack-NO-IDFA (= 1.4.2) - DDLogKit_Private - - DDMAMapKit_Private/DDMAUtil (0.2.2): + - DDMAMapKit_Private/DDMAUtil (0.2.3): - DDMAMapKit_Private/DDMAMap - DDNetworkingOfAlamofireKit_Private (0.2.1): - Alamofire @@ -346,7 +346,7 @@ DEPENDENCIES: - DDControlsKit_Private (= 0.1.4) - DDDateKit_Private - DDFontKit_Private - - DDMAMapKit_Private + - DDMAMapKit_Private (= 0.2.3) - DDNetworkingOfAlamofireKit_Private - DDPersistenceKit_Private - DDProgressHUDKit_Private @@ -435,7 +435,7 @@ SPEC CHECKSUMS: DDDateKit_Private: f8348d10cec77ccacd2f5ec27d587ea2898ae90a DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806 DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0 - DDMAMapKit_Private: a3cdcccf284fc0fd63d48726e65e36b1255e4d4f + DDMAMapKit_Private: dcfa1b22ba34562e99120066424834b1f498c3c2 DDNetworkingOfAlamofireKit_Private: 652eb70a7d8bac81d77d036fabeb52f807120f6d DDPersistenceKit_Private: c150822543ffa6ece3900178629812f64902ed90 DDProgressHUDKit_Private: 1e219062ddeb7801a4bb13b367efa1f3fbf17f1e @@ -461,6 +461,6 @@ SPEC CHECKSUMS: SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6 ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b -PODFILE CHECKSUM: 2e0cc301f049eb136c4bc3fa33f6047cd0e03e64 +PODFILE CHECKSUM: cfac3608e685491f1a248909d602e94d677d553c COCOAPODS: 1.11.3 diff --git a/Pods/Target Support Files/DDMAMapKit_Private/ResourceBundle-DDMAMapKit_Private-DDMAMapKit_Private-Info.plist b/Pods/Target Support Files/DDMAMapKit_Private/ResourceBundle-DDMAMapKit_Private-DDMAMapKit_Private-Info.plist index cc0a0d6..09e36fb 100644 --- a/Pods/Target Support Files/DDMAMapKit_Private/ResourceBundle-DDMAMapKit_Private-DDMAMapKit_Private-Info.plist +++ b/Pods/Target Support Files/DDMAMapKit_Private/ResourceBundle-DDMAMapKit_Private-DDMAMapKit_Private-Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.2.2 + 0.2.3 CFBundleSignature ???? CFBundleVersion diff --git a/fastlane/report.xml b/fastlane/report.xml index 47fbec4..f173b6e 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +