From 1bd4eb333923b9858a15e61840f8922249d4bc7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E7=BA=AC?= Date: Tue, 8 Aug 2017 20:27:30 +0800 Subject: [PATCH] Javadoc can not recognize kotlin file for now --- arouter-api/build.gradle | 2 - .../android/arouter/core/LogisticsCenter.java | 2 +- .../android/arouter/utils/PackageUtils.java | 50 +++++++++++++++++++ .../android/arouter/utils/PackageUtils.kt | 49 ------------------ 4 files changed, 51 insertions(+), 52 deletions(-) create mode 100644 arouter-api/src/main/java/com/alibaba/android/arouter/utils/PackageUtils.java delete mode 100644 arouter-api/src/main/java/com/alibaba/android/arouter/utils/PackageUtils.kt diff --git a/arouter-api/build.gradle b/arouter-api/build.gradle index c94efbee..512ef1f6 100644 --- a/arouter-api/build.gradle +++ b/arouter-api/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' ext { bintrayName = 'arouter-api' @@ -43,7 +42,6 @@ dependencies { annotationProcessor 'com.alibaba:arouter-compiler:1.0.3' compile 'com.alibaba:arouter-annotation:1.0.3' compile "com.android.support:support-v4:${SUPPORT_LIB_VERSION}" - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' diff --git a/arouter-api/src/main/java/com/alibaba/android/arouter/core/LogisticsCenter.java b/arouter-api/src/main/java/com/alibaba/android/arouter/core/LogisticsCenter.java index 749e4552..2bcfbf10 100644 --- a/arouter-api/src/main/java/com/alibaba/android/arouter/core/LogisticsCenter.java +++ b/arouter-api/src/main/java/com/alibaba/android/arouter/core/LogisticsCenter.java @@ -65,7 +65,7 @@ public synchronized static void init(Context context, ThreadPoolExecutor tpe) th Set routerMap; // It will rebuild router map every times when debuggable. - if (ARouter.debuggable() || PackageUtils.INSTANCE.isNewVersion(context)) { + if (ARouter.debuggable() || PackageUtils.isNewVersion(context)) { logger.info(TAG, "Run with debug mode or new install, rebuild router map."); // These class was generate by arouter-compiler. routerMap = ClassUtils.getFileNameByPackageName(mContext, ROUTE_ROOT_PAKCAGE); diff --git a/arouter-api/src/main/java/com/alibaba/android/arouter/utils/PackageUtils.java b/arouter-api/src/main/java/com/alibaba/android/arouter/utils/PackageUtils.java new file mode 100644 index 00000000..254b9f4a --- /dev/null +++ b/arouter-api/src/main/java/com/alibaba/android/arouter/utils/PackageUtils.java @@ -0,0 +1,50 @@ +package com.alibaba.android.arouter.utils; + +import android.content.Context; +import android.content.SharedPreferences; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; + +import static com.alibaba.android.arouter.launcher.ARouter.logger; +import static com.alibaba.android.arouter.utils.Consts.AROUTER_SP_CACHE_KEY; +import static com.alibaba.android.arouter.utils.Consts.LAST_VERSION_CODE; +import static com.alibaba.android.arouter.utils.Consts.LAST_VERSION_NAME; + +/** + * Android package utils + * + * @author zhilong Contact me. + * @version 1.0 + * @since 2017/8/8 下午8:19 + */ +public class PackageUtils { + public static boolean isNewVersion(Context context) { + PackageInfo packageInfo = getPackageInfo(context); + if (null != packageInfo) { + String versionName = packageInfo.versionName; + int versionCode = packageInfo.versionCode; + + SharedPreferences sp = context.getSharedPreferences(AROUTER_SP_CACHE_KEY, Context.MODE_PRIVATE); + if (!versionName.equals(sp.getString(LAST_VERSION_NAME, null)) || versionCode != sp.getInt(LAST_VERSION_CODE, -1)) { + // new version + sp.edit().putString(LAST_VERSION_NAME, versionName).putInt(LAST_VERSION_CODE, versionCode).apply(); + return true; + } else { + return false; + } + } else { + return true; + } + } + + public static PackageInfo getPackageInfo(Context context) { + PackageInfo packageInfo = null; + try { + packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), PackageManager.GET_CONFIGURATIONS); + } catch (Exception ex) { + logger.error(Consts.TAG, "Get package info error."); + } + + return packageInfo; + } +} diff --git a/arouter-api/src/main/java/com/alibaba/android/arouter/utils/PackageUtils.kt b/arouter-api/src/main/java/com/alibaba/android/arouter/utils/PackageUtils.kt deleted file mode 100644 index 91278e20..00000000 --- a/arouter-api/src/main/java/com/alibaba/android/arouter/utils/PackageUtils.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.alibaba.android.arouter.utils - -import android.content.Context -import android.content.pm.PackageInfo -import android.content.pm.PackageManager -import com.alibaba.android.arouter.launcher.ARouter.logger -import com.alibaba.android.arouter.utils.Consts.* -import java.lang.Exception - -/** - * Android package utils - * - * @author zhilong Contact me. - * @version 1.0 - * @since 2017/8/8 下午7:38 - */ -object PackageUtils { - fun isNewVersion(context: Context): Boolean { - val packageInfo = getPackageInfo(context) - if (null != packageInfo) { - val versionName = packageInfo.versionName - val versionCode = packageInfo.versionCode - - val sp = context.getSharedPreferences(AROUTER_SP_CACHE_KEY, Context.MODE_PRIVATE) - - if (versionName != sp.getString(LAST_VERSION_NAME, null) || versionCode != sp.getInt(LAST_VERSION_CODE, -1)) { - // new version. - sp.edit().putString(LAST_VERSION_NAME, versionName).putInt(LAST_VERSION_CODE, versionCode).apply() - return true - } else { - return false - } - } else { - return true - } - } - - fun getPackageInfo(context: Context): PackageInfo? { - var packageInfo: PackageInfo? = null - - try { - packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_CONFIGURATIONS) - } catch (e: Exception) { - logger.error(Consts.TAG, "Get package info error.") - } - - return packageInfo - } -} \ No newline at end of file