Merge branch 'master' of https://github.com/didi/DoraemonKit

# Conflicts:
#	Android/java/config.gradle
#	iOS/DoraemonKit/Src/GPS/Function/DoraemonGPSMocker.m

Android/java/config.gradle

@@ -19,17 +19,17 @@ ext {
                minSdkVersion             : 16,
                targetSdkVersion          : 29,
                //app版本号
-               versionCode               : 335,
+               versionCode               : 334,
                //dokit 插件版本号
-               pluginVersionName         : "3.3.5",
+               pluginVersionName         : "3.3.4",
                //jcenter dokit版本号 打包上传时 dokit的版本名字
-               jcenterArchivesVersionName: "3.3.5",
+               jcenterArchivesVersionName: "3.3.4",
                //didi内部仓库版本号
-               versionName               : "3.3.5",
+               versionName               : "3.3.4",
                glide_version             : "4.9.0",
                kotlin_version            : "1.3.72",
                booster_version           : "3.0.0",
-               gradle_plugin_version     : "4.1.1",
+               gradle_plugin_version     : "4.1.0",
                okhttp_v2                 : "2.7.5",
                okhttp_v3                 : "3.14.7",
                okhttp_v4                 : "4.7.0"

iOS/DoraemonKit/Src/Core/Plugin/Common/AppInfo/DoraemonAppInfoUtil.m

@@ -91,7 +91,7 @@
     if ([platform isEqualToString:@"iPhone9,2"]) return @"iPhone 7 Plus";
     if ([platform isEqualToString:@"iPhone9,4"]) return @"iPhone 7 Plus";
     if ([platform isEqualToString:@"iPhone10,1"]) return @"iPhone 8";
-    if ([platform isEqualToString:@"iPhone10.4"]) return @"iPhone 8";
+    if ([platform isEqualToString:@"iPhone10,4"]) return @"iPhone 8";
     if ([platform isEqualToString:@"iPhone10,2"]) return @"iPhone 8 Plus";
     if ([platform isEqualToString:@"iPhone10,5"]) return @"iPhone 8 Plus";
     if ([platform isEqualToString:@"iPhone10,3"]) return @"iPhone X";
@@ -103,6 +103,10 @@
     if ([platform isEqualToString:@"iPhone12,1"]) return @"iPhone 11";
     if ([platform isEqualToString:@"iPhone12,3"]) return @"iPhone 11 Pro";
     if ([platform isEqualToString:@"iPhone12,5"]) return @"iPhone 11 Pro Max";
+    if ([platform isEqualToString:@"iPhone13,1"]) return @"iPhone 12 Mini";
+    if ([platform isEqualToString:@"iPhone13,2"]) return @"iPhone 12";
+    if ([platform isEqualToString:@"iPhone13,3"]) return @"iPhone 12 Pro";
+    if ([platform isEqualToString:@"iPhone13,4"]) return @"iPhone 12 Pro Max";
     
     return platform;
 }

iOS/DoraemonKit/Src/GPS/Function/DoraemonGPSMocker.m

@@ -240,14 +240,6 @@ monitoringDidFailForRegion:(nullable CLRegion *)region
     }];
 }
 
--(void)locationManagerDidChangeAuthorization:(CLLocationManager *)manager {
-    [self enumDelegate:manager block:^(id<CLLocationManagerDelegate> delegate) {
-        if ([delegate respondsToSelector:@selector(locationManagerDidChangeAuthorization:)]) {
-            [delegate locationManagerDidChangeAuthorization:manager];
-        }
-    }];
-}
-
 - (void)locationManager:(CLLocationManager *)manager didStartMonitoringForRegion:(CLRegion *)region{
     [self enumDelegate:manager block:^(id<CLLocationManagerDelegate> delegate) {
         if ([delegate respondsToSelector:@selector(locationManager:didStartMonitoringForRegion:)]) {