diff --git a/LekangGuard.xcodeproj/project.pbxproj b/LekangGuard.xcodeproj/project.pbxproj index 5ae5931..d934412 100644 --- a/LekangGuard.xcodeproj/project.pbxproj +++ b/LekangGuard.xcodeproj/project.pbxproj @@ -4112,7 +4112,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.4; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -4165,7 +4165,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.4; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -4254,7 +4254,7 @@ "$(PROJECT_DIR)/LekangGuard/Common/VoiceConvert/lib", "$(PROJECT_DIR)/LekangGuard/sdk/lib/ios", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.6; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", @@ -4473,7 +4473,7 @@ "$(PROJECT_DIR)/LekangGuard/Common/VoiceConvert/lib", "$(PROJECT_DIR)/LekangGuard/sdk/lib/ios", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.6; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate index d06e569..5e8507d 100644 Binary files a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 30867cc..2553bef 100644 --- a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -3,4 +3,38 @@ uuid = "C221774C-F002-4C3A-AC8E-C40B3B293279" type = "0" version = "2.0"> + + + + + + + + + + diff --git a/LekangGuard/AppDelegate.m b/LekangGuard/AppDelegate.m index 198110f..de85b50 100644 --- a/LekangGuard/AppDelegate.m +++ b/LekangGuard/AppDelegate.m @@ -671,7 +671,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response } } --(void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations +- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations { CLLocation *userLocation = [locations lastObject]; self.curLocation = [userLocation locationMarsFromEarth]; diff --git a/LekangGuard/Map/Track(轨迹)/TrackMapView.m b/LekangGuard/Map/Track(轨迹)/TrackMapView.m index bf69a1b..205a4c0 100644 --- a/LekangGuard/Map/Track(轨迹)/TrackMapView.m +++ b/LekangGuard/Map/Track(轨迹)/TrackMapView.m @@ -140,8 +140,10 @@ - (void)topViewShowAndHidden:(NSInteger)isShow { self.topView.hidden = isShow == 1 ? NO : YES; +// CGFloat yy = iPhoneX_NavHeight+Adapted(50)+0.5; [UIView animateWithDuration:0.5 animations:^{ self.topView.frame = CGRectMake(0,isShow == 1 ? 0 : -Adapted(55), SCREEN_WIDTH, Adapted(55)); +// self.mapView.frame = CGRectMake(0, self.topView.bottom, SCREEN_WIDTH, SCREEN_HEIGHT-yy-Adapted(55)); } completion:^(BOOL finished) { }]; @@ -177,11 +179,14 @@ - (void)loadWithInfoTrack:(NSMutableArray *)mapPoints { // self.startAndStopBtn.selected = NO; +// [self startAndStopBtnAction:self.startAndStopBtn]; + mapPoints = (NSMutableArray *)[[mapPoints reverseObjectEnumerator] allObjects]; - [self startAndStopBtnAction:self.startAndStopBtn]; [self.mapView removeAnnotations:self.pointAnnotationArr]; [self.mapView removeOverlay:self.routeLine]; + [self.trackView removeFromSuperview]; self.trackView = nil; + self.currentIndex = 0; self.routeLine = nil; self.routeLineView = nil; self.pointAnnotationArr = nil; @@ -195,16 +200,18 @@ self.pathPoints = nil; } - [self addLocate:mapPoints]; - if(mapPoints.count > 1) - { - self.startAndStopBtn.selected = YES; - [self startAndStopBtnAction:self.startAndStopBtn]; - } - //默认选中 起点 - CustomAnnotationView *tempView = [CustomAnnotationView new]; - tempView.annotation = self.pointAnnotationArr.lastObject; - [self mapView:self.mapView didSelectAnnotationView:tempView]; + AfterDispatch(0.2, ^{ + [self addLocate:mapPoints]; + if(mapPoints.count > 1) + { + self.startAndStopBtn.selected = YES; + [self startAndStopBtnAction:self.startAndStopBtn]; + } + //默认选中 起点 + CustomAnnotationView *tempView = [CustomAnnotationView new]; + tempView.annotation = self.pointAnnotationArr.lastObject; + [self mapView:self.mapView didSelectAnnotationView:tempView]; + }); } @@ -236,7 +243,7 @@ [self.mapView addAnnotations:self.pointAnnotationArr]; } // [sender setSelected:!sender.isSelected]; - self.mapView.userInteractionEnabled = sender.isSelected; +// self.mapView.userInteractionEnabled = sender.isSelected; } #pragma mark - 构造shapeLayer - (void)initShapeLayerWithPath:(CGPathRef)path @@ -325,10 +332,10 @@ [self.headView.layer removeFromSuperlayer]; self.startAndStopBtn.selected = NO; [self.startAndStopBtn setImage:ImageName_(@"icon_start") forState:UIControlStateNormal]; -// if(!self.startAndStopBtn.isSelected) -// { -// [self startAndStopBtnAction:self.startAndStopBtn]; -// } + + [self.trackView removeFromSuperview]; + self.trackView = nil; + [self.mapView addAnnotations:self.pointAnnotationArr]; } return; } @@ -337,17 +344,24 @@ nextAnim.delegate = self; // [self.headView addAnimation:nextAnim forKey:[NSString stringWithFormat:@"headPosition%d",currentIndex]]; [self.headView.layer addAnimation:nextAnim forKey:@"headPosition"]; - if(self.pathPoints){ + if(self.pathPoints) + { CGPoint currentPoint = self.pathPoints[self.currentIndex]; - if (self.currentIndex == 0){ + if (self.currentIndex == 0) + { //第一 [self addTrackViewPoint:currentPoint Type:0 Angle:0]; double angle = self.angeleValues[self.angeleValues.count-1].doubleValue; self.headView.transform = CGAffineTransformMakeRotation(angle); - }else if(self.currentIndex == self.pointAnnotationArr.count-1){ + } + else if(self.currentIndex == self.pointAnnotationArr.count-1) + { //最后一个 [self addTrackViewPoint:currentPoint Type:2 Angle:0]; - }else{ + self.mapView.userInteractionEnabled = YES; + } + else + { NSInteger tempIndex = self.angeleValues.count-self.currentIndex-1; if(tempIndex < 0){ tempIndex = 0; @@ -833,13 +847,13 @@ { if (!_mapView) { - CGFloat yy = iPhoneX_NavHeight+Adapted(50)+0.5; - _mapView = [[MKMapView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-yy)]; + CGFloat yy = iPhoneX_NavHeight+Adapted(50)+0.5+Adapted(55); + _mapView = [[MKMapView alloc] initWithFrame:CGRectMake(0, Adapted(55), SCREEN_WIDTH, SCREEN_HEIGHT-yy)]; MKCoordinateSpan span = MKCoordinateSpanMake(0.021251, 0.016093); CLLocationCoordinate2D center = self.mapView.region.center; [_mapView setRegion:MKCoordinateRegionMake(center, span) animated:YES]; _mapView.rotateEnabled = NO; - _mapView.userInteractionEnabled = NO; + _mapView.userInteractionEnabled = YES; _mapView.delegate = self; } return _mapView; diff --git a/LekangGuard/Map/Track(轨迹)/TrackViewController.m b/LekangGuard/Map/Track(轨迹)/TrackViewController.m index 1b2baa8..e496bfc 100644 --- a/LekangGuard/Map/Track(轨迹)/TrackViewController.m +++ b/LekangGuard/Map/Track(轨迹)/TrackViewController.m @@ -184,7 +184,7 @@ self.comTable.tableHeaderView = arr.count > 0 ? self.headerView : nil; self.comTable.tableHeaderView.height = arr.count > 0 ? Adapted(60) : 0; self.numberLabel.attributedText = [UICommon labelFontSize:arr.count > 0 ? F(@"%ld %@", arr.count,GJText(@"条轨迹")) : @""]; -// [self.trackMapView loadWithInfoTrack:self.modelListArr]; + [self.trackMapView loadWithInfoTrack:self.modelListArr]; [self.comTable reloadData]; self.zx_navRightBtn.hidden = self.modelListArr.count > 0 ? NO : YES; diff --git a/LekangGuard/sdk/AnyChatCoreSDK.framework/AnyChatCoreSDK b/LekangGuard/sdk/AnyChatCoreSDK.framework/AnyChatCoreSDK deleted file mode 100644 index 79cabef..0000000 Binary files a/LekangGuard/sdk/AnyChatCoreSDK.framework/AnyChatCoreSDK and /dev/null differ diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index f5e49d7..43bcac2 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -2395,7 +2395,7 @@ 9F91CC8D9596A9767E097EDEA28F83CF /* MOBFoundation.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MOBFoundation.release.xcconfig; sourceTree = ""; }; 9F9E3A312081F62DC6E9B2E725A799CF /* YYDiskCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = YYDiskCache.m; path = YYCache/YYDiskCache.m; sourceTree = ""; }; A01DAB8521E5BA656A0425FA059B26CB /* EasyAlertConfig.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = EasyAlertConfig.m; path = EasyShowView/EasyAlertConfig.m; sourceTree = ""; }; - A03A7C3856D30063F1B649BC7B4BF0F5 /* ZXNavigationBar */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = ZXNavigationBar; path = ZXNavigationBar.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A03A7C3856D30063F1B649BC7B4BF0F5 /* ZXNavigationBar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ZXNavigationBar.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A0A6BE922721FAF96B45C993EDDA53EB /* UIBarButtonItem+RACCommandSupport.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIBarButtonItem+RACCommandSupport.m"; path = "ReactiveObjC/UIBarButtonItem+RACCommandSupport.m"; sourceTree = ""; }; A10653B4A439807E24029E84BCCFB8CB /* EasyEmptyConfig.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = EasyEmptyConfig.h; path = EasyShowView/EasyEmptyConfig.h; sourceTree = ""; }; A16172AA44D1EFC4CB04FCD8EE4D44C1 /* MAMapAccessibilityIdentifier.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MAMapAccessibilityIdentifier.h; path = MAMapKit.framework/Headers/MAMapAccessibilityIdentifier.h; sourceTree = ""; }; @@ -4564,7 +4564,7 @@ F9ABEB157CD437A93AED5462580D63B9 /* YCShadowView */, 48ACF38225AF5129416A1F090F6D3286 /* YYCache */, E460D5B0416D36F66EE8EC89E5D2FA0A /* YYModel */, - A03A7C3856D30063F1B649BC7B4BF0F5 /* ZXNavigationBar */, + A03A7C3856D30063F1B649BC7B4BF0F5 /* ZXNavigationBar.framework */, ); name = Products; sourceTree = ""; @@ -6479,7 +6479,7 @@ ); name = ZXNavigationBar; productName = ZXNavigationBar; - productReference = A03A7C3856D30063F1B649BC7B4BF0F5 /* ZXNavigationBar */; + productReference = A03A7C3856D30063F1B649BC7B4BF0F5 /* ZXNavigationBar.framework */; productType = "com.apple.product-type.framework"; }; ACBDE5E0D3073720CB54E61FB8C1A940 /* Pods-LekangGuard-LekangGuardUITests */ = { @@ -9630,7 +9630,7 @@ GCC_PREFIX_HEADER = "Target Support Files/ZXNavigationBar/ZXNavigationBar-prefix.pch"; INFOPLIST_FILE = "Target Support Files/ZXNavigationBar/ZXNavigationBar-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -10445,7 +10445,7 @@ GCC_PREFIX_HEADER = "Target Support Files/ZXNavigationBar/ZXNavigationBar-prefix.pch"; INFOPLIST_FILE = "Target Support Files/ZXNavigationBar/ZXNavigationBar-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks",