see 01/11 log

Author: Blankj

utilcode/README-CN.md

@@ -69,6 +69,7 @@ getAppSignatureSHA256             : 获取应用签名的的 SHA256 值
 getAppSignatureMD5                : 获取应用签名的的 MD5 值
 getAppInfo                        : 获取 App 信息
 getAppsInfo                       : 获取所有已安装 App 信息
+getApkInfo                        : 获取 Apk 信息
 ```
 
 * ### 栏相关 -> [BarUtils.java][bar.java] -> [Demo][bar.demo]
@@ -372,9 +373,13 @@ setBackground         : 设置背景
 
 * ### Gson 相关 -> [GsonUtils.java][gson.java] -> [Test][gson.test]
 ```
-getGson : 获取 Gson 对象
-toJson  : 对象转 Json 串
-fromJson: Json 串转对象
+getGson          : 获取 Gson 对象
+toJson           : 对象转 Json 串
+fromJson         : Json 串转对象
+getCollectionType: 获取集合类型
+getMapType       : 获取字典类型
+getArrayType     : 获取数组类型
+getType          : 获取类型
 ```
 
 * ### 图片相关 -> [ImageUtils.java][image.java] -> [Demo][image.demo]

utilcode/README.md

@@ -69,6 +69,7 @@ getAppSignatureSHA256
 getAppSignatureMD5
 getAppInfo
 getAppsInfo
+getApkInfo
 ```
 
 * ### About Bar -> [BarUtils.java][bar.java] -> [Demo][bar.demo]
@@ -375,6 +376,10 @@ setBackground
 getGson
 toJson
 fromJson
+getCollectionType
+getMapType
+getArrayType
+getType
 ```
 
 * ### About Image -> [ImageUtils.java][image.java] -> [Demo][image.demo]

utilcode/lib/src/main/AndroidManifest.xml

@@ -3,14 +3,14 @@
 
     <application>
         <activity
-            android:name=".util.PermissionUtils$PermissionActivity"
+            android:name="com.blankj.utilcode.util.PermissionUtils$PermissionActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:multiprocess="true"
             android:theme="@style/ActivityTranslucent"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
 
         <provider
-            android:name=".util.Utils$FileProvider4UtilCode"
+            android:name="com.blankj.utilcode.util.Utils$FileProvider4UtilCode"
             android:authorities="${applicationId}.utilcode.provider"
             android:exported="false"
             android:grantUriPermissions="true"

utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java

@@ -8,7 +8,6 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.Arrays;
 
 
 /**
@@ -52,9 +51,11 @@ public final class PermissionConstants {
             permission.READ_CALL_LOG, permission.WRITE_CALL_LOG, permission.ADD_VOICEMAIL,
             permission.USE_SIP, permission.PROCESS_OUTGOING_CALLS, permission.ANSWER_PHONE_CALLS
     };
-    private static final String[] GROUP_PHONE_BELOW_O = Arrays.copyOf(
-            GROUP_PHONE, GROUP_PHONE.length - 1
-    );
+    private static final String[] GROUP_PHONE_BELOW_O = {
+            permission.READ_PHONE_STATE, permission.READ_PHONE_NUMBERS, permission.CALL_PHONE,
+            permission.READ_CALL_LOG, permission.WRITE_CALL_LOG, permission.ADD_VOICEMAIL,
+            permission.USE_SIP, permission.PROCESS_OUTGOING_CALLS
+    };
     private static final String[] GROUP_SENSORS       = {
             permission.BODY_SENSORS
     };

utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java

@@ -766,6 +766,28 @@ public static List<AppInfo> getAppsInfo() {
         return list;
     }
 
+    /**
+     * Return the application's package information.
+     *
+     * @return the application's package information
+     */
+    public static AppUtils.AppInfo getApkInfo(final File apkFile) {
+        if (apkFile == null || !apkFile.isFile() || !apkFile.exists()) return null;
+        return getApkInfo(apkFile.getAbsolutePath());
+    }
+
+    /**
+     * Return the application's package information.
+     *
+     * @return the application's package information
+     */
+    public static AppUtils.AppInfo getApkInfo(final String apkFilePath) {
+        if (isSpace(apkFilePath)) return null;
+        PackageManager pm = Utils.getApp().getPackageManager();
+        PackageInfo pi = pm.getPackageArchiveInfo(apkFilePath, 0);
+        return getBean(pm, pi);
+    }
+
     private static AppInfo getBean(final PackageManager pm, final PackageInfo pi) {
         if (pm == null || pi == null) return null;
         ApplicationInfo ai = pi.applicationInfo;

utilcode/lib/src/main/java/com/blankj/utilcode/util/GsonUtils.java

@@ -2,9 +2,12 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
 
 import java.io.Reader;
 import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.Map;
 
 
 /**
@@ -110,6 +113,48 @@ public static <T> T fromJson(final Reader reader, final Type type) {
         return GSON.fromJson(reader, type);
     }
 
+    /**
+     * Return the type of collection with the {@code type}.
+     *
+     * @param type The type.
+     * @return the type of collection with the {@code type}
+     */
+    public static Type getCollectionType(final Type type) {
+        return TypeToken.getParameterized(Collection.class, type).getType();
+    }
+
+    /**
+     * Return the type of map with the {@code keyType} and {@code valueType}.
+     *
+     * @param keyType   The type of key.
+     * @param valueType The type of value.
+     * @return the type of map with the {@code keyType} and {@code valueType}
+     */
+    public static Type getMapType(final Type keyType, final Type valueType) {
+        return TypeToken.getParameterized(Map.class, keyType, valueType).getType();
+    }
+
+    /**
+     * Return the type of array with the {@code type}.
+     *
+     * @param type The type.
+     * @return the type of map with the {@code type}
+     */
+    public static Type getArrayType(final Type type) {
+        return TypeToken.getArray(type).getType();
+    }
+
+    /**
+     * Return the type of {@code rawType} with the {@code typeArguments}.
+     *
+     * @param rawType       The raw type.
+     * @param typeArguments The type of arguments.
+     * @return the type of map with the {@code type}
+     */
+    public static Type getType(final Type rawType, final Type... typeArguments) {
+        return TypeToken.getParameterized(rawType, typeArguments).getType();
+    }
+
     /**
      * Create a pre-configured {@link Gson} instance.
      *

utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java

@@ -39,13 +39,10 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.Formatter;
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -798,7 +795,7 @@ static String object2Json(Object object) {
                 return formatJson(object.toString());
             }
             try {
-                return formatJson(GSON.toJson(object));
+                return GSON.toJson(object);
             } catch (Throwable t) {
                 return object.toString();
             }

utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java

@@ -7,16 +7,13 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.v4.content.FileProvider;
 import android.util.Log;
 
 import java.io.File;
-import java.io.FileDescriptor;
 
 /**
  * <pre>
@@ -63,7 +60,7 @@ public static File uri2File(@NonNull final Uri uri) {
             Log.d("UriUtils", uri.toString() + " parse failed. -> 0");
             return null;
         } else if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
-            return getFileFromUri(uri, null, null);
+            return getFileFromUri(uri);
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
                 && DocumentsContract.isDocumentUri(Utils.getApp(), uri)) {
             if ("com.android.externalstorage.documents".equals(authority)) {
@@ -81,7 +78,7 @@ public static File uri2File(@NonNull final Uri uri) {
                         Uri.parse("content://downloads/public_downloads"),
                         Long.valueOf(id)
                 );
-                return getFileFromUri(contentUri, null, null);
+                return getFileFromUri(contentUri);
             } else if ("com.android.providers.media.documents".equals(authority)) {
                 final String docId = DocumentsContract.getDocumentId(uri);
                 final String[] split = docId.split(":");
@@ -110,11 +107,11 @@ public static File uri2File(@NonNull final Uri uri) {
         }
     }
 
-    private static File getFileFromUri(@NonNull final Uri uri) {
+    private static File getFileFromUri(final Uri uri) {
         return getFileFromUri(uri, null, null);
     }
 
-    private static File getFileFromUri(@NonNull final Uri uri,
+    private static File getFileFromUri(final Uri uri,
                                        final String selection,
                                        final String[] selectionArgs) {
         CursorLoader cl = new CursorLoader(Utils.getApp());

utilcode/lib/src/test/java/com/blankj/utilcode/util/BaseTest.java

@@ -7,7 +7,6 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.robolectric.shadows.ShadowLooper;
 
 /**
  * <pre>
@@ -30,6 +29,7 @@ public BaseTest() {
 
     @Test
     public void test() throws Exception {
+
 //        final CountDownLatch countDownLatch = new CountDownLatch(1);
 //        final Scanner scanner = new Scanner(System.in);
 //        ExecutorService singlePool = ThreadUtils.getSinglePool();
@@ -117,4 +117,27 @@ public void test() throws Exception {
 //        countDownLatch.await();
 
     }
+
+    static class Person {
+
+        String name;
+        int    gender;
+        String address;
+
+        public Person(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == this) return true;
+            if (!(obj instanceof Person)) return false;
+            Person p = (Person) obj;
+            return equals(name, p.name) && p.gender == gender && equals(address, p.address);
+        }
+
+        private static boolean equals(final Object o1, final Object o2) {
+            return o1 == o2 || (o1 != null && o1.equals(o2));
+        }
+    }
 }