Commit 8436ba46 authored by 朱璇's avatar 朱璇

Merge branch 'zx/base' into 'master'

Zx/base

See merge request !32
parents 7d13a65d 55f9e5d5
......@@ -18,7 +18,7 @@ PODS:
- BDOpenSDKKit (1.0.0)
- DouyinOpenSDK (1.4.1):
- BDOpenSDKKit (~> 1.0.0)
- GMBase (1.2.3):
- GMBase (1.2.8):
- GMFoundation
- GMHud
- GMJSONModel
......@@ -154,7 +154,7 @@ SPEC CHECKSUMS:
Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25
BDOpenSDKKit: 3fb530ce73f85a7d6ee69e7fd3d9158444c5bd09
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
GMBase: 02a392993e6c88f11b03136ccd49f4192637da54
GMBase: b07c7efad191a092eb785f6c2c2eef10643fd24e
GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c
......@@ -178,4 +178,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 9649bb81da24ce1a9c9ce2ddfe99a23738cbe846
COCOAPODS: 1.9.3
COCOAPODS: 1.10.1
......@@ -77,6 +77,9 @@ typedef void(^GMLocationAuthorizationBlock)(CLAuthorizationStatus status);
*/
- (void)updateLocation;
/// 更新定位前先停止上次定位
- (void)stopLocationIfNeeded;
/**
* @author wangyang, 16-03-10 12:03:57
*
......
......@@ -247,6 +247,10 @@
_firstTime = YES;
}
- (void)stopLocationIfNeeded {
[self.locationManager stopUpdatingLocation];
}
#pragma mark - CLLocationManagerDelegate
// 地理位置发生改变时触发
- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray<CLLocation *> *)locations {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment