hellob5code
diff --git a/‎utilcode/build.gradle‎
Lines changed: 2 additions & 2 deletions b/‎utilcode/build.gradle‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎utilcode/src/main/java/com/blankj/utilcode/utils/ActivityUtils.java‎
Lines changed: 3 additions & 0 deletions b/‎utilcode/src/main/java/com/blankj/utilcode/utils/ActivityUtils.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java‎
Lines changed: 26 additions & 30 deletions b/‎utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java‎
Lines changed: 26 additions & 30 deletions
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 8
-        versionName "1.2.1"
+        versionCode 9
+        versionName "1.2.2"
     }
     buildTypes {
         release {
 
@@ -1,9 +1,12 @@
 package com.blankj.utilcode.utils;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import java.util.List;
+
 /**
  * <pre>
  *     author: Blankj
 
@@ -17,6 +17,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -32,36 +33,6 @@ public class AppUtils {
     private AppUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
-    
-    
-   /**
-	 * 获取应用的 SHA1 值， 可据此判断高德，百度地图 key 是否正确
-	 * @param context 上下文
-	 * @return 应用的 SHA1 字符串, 比如： 53:FD:54:DC:19:0F:11:AC:B5:22:9E:F1:1A:68:88:1B:8B:E8:54:42
-     */
-	public static String getSHA1(Context context) {
-		try {
-			PackageInfo info = context.getPackageManager().getPackageInfo(
-					context.getPackageName(), PackageManager.GET_SIGNATURES);
-			byte[] cert = info.signatures[0].toByteArray();
-			MessageDigest md = MessageDigest.getInstance("SHA1");
-			byte[] publicKey = md.digest(cert);
-			StringBuilder hexString = new StringBuilder();
-			for (byte aPublicKey : publicKey) {
-				String appendString = Integer.toHexString(0xFF & aPublicKey).toUpperCase();
-				if (appendString.length() == 1)
-					hexString.append("0");
-				hexString.append(appendString);
-				hexString.append(":");
-			}
-			String result = hexString.toString();
-			return result.substring(0, result.length() - 1);
-		} catch (PackageManager.NameNotFoundException | NoSuchAlgorithmException e) {
-			e.printStackTrace();
-		}
-		return "";
-	}
-    
 
     /**
      * 判断App是否安装
@@ -400,6 +371,31 @@ public static Signature[] getAppSignature(Context context, String packageName) {
         }
     }
 
+    /**
+     * 获取应用签名的的SHA1值
+     * <p>可据此判断高德，百度地图key是否正确</p>
+     *
+     * @param context 上下文
+     * @return 应用签名的SHA1字符串, 比如：53:FD:54:DC:19:0F:11:AC:B5:22:9E:F1:1A:68:88:1B:8B:E8:54:42
+     */
+    public static String getAppSignatureSHA1(Context context) {
+        return getAppSignatureSHA1(context, context.getPackageName());
+    }
+
+    /**
+     * 获取应用签名的的SHA1值
+     * <p>可据此判断高德，百度地图key是否正确</p>
+     *
+     * @param context 上下文
+     * @return 应用签名的SHA1字符串, 比如：53:FD:54:DC:19:0F:11:AC:B5:22:9E:F1:1A:68:88:1B:8B:E8:54:42
+     */
+    public static String getAppSignatureSHA1(Context context, String packageName) {
+        Signature[] signature = getAppSignature(context, packageName);
+        if (signature == null) return null;
+        return EncryptUtils.encryptSHA1ToString(signature[0].toByteArray()).
+                replaceAll("(?<=[0-9A-F]{2})[0-9A-F]{2}", ":$0");
+    }
+
     /**
      * 判断App是否是系统应用
      *