diff --git a/bone/build.gradle b/bone/build.gradle index 6ead2d2..695b45a 100644 --- a/bone/build.gradle +++ b/bone/build.gradle @@ -1,11 +1,17 @@ apply plugin: 'com.android.library' apply plugin: 'com.neenbedankt.android-apt' apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'me.tatarka.retrolambda' android { compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion + compileOptions { + sourceCompatibility rootProject.ext.sourceCompatibility + targetCompatibility rootProject.ext.targetCompatibility + } + dexOptions { javaMaxHeapSize "4g" //specify the heap size for the dex process preDexLibraries = false //delete the already predexed libraries @@ -20,10 +26,7 @@ android { multiDexEnabled true } - compileOptions { - sourceCompatibility rootProject.ext.sourceCompatibility - targetCompatibility rootProject.ext.targetCompatibility - } + buildTypes { release { minifyEnabled false @@ -60,6 +63,10 @@ dependencies { compile deps.rxpermissions compile deps.rxpreferences + // permissionsDispatcher + compile deps.permissionsDispatcher + apt deps.permissionsDispatcherProcessor + // db compile deps.dbflowcore compile deps.dbflow diff --git a/bone/src/main/java/com/idogfooding/bone/image/PhotoAdapter.java b/bone/src/main/java/com/idogfooding/bone/image/PhotoAdapter.java index a81f2ac..63fd3cb 100644 --- a/bone/src/main/java/com/idogfooding/bone/image/PhotoAdapter.java +++ b/bone/src/main/java/com/idogfooding/bone/image/PhotoAdapter.java @@ -138,17 +138,16 @@ private ArrayList removeMoreItem() { return list; } - @Override public int getItemCount() { return mPhotoPaths.size(); } - public static class PhotoViewHolder extends RecyclerView.ViewHolder { + class PhotoViewHolder extends RecyclerView.ViewHolder { private ImageView ivPhoto; private View vSelected; - public PhotoViewHolder(View itemView) { + PhotoViewHolder(View itemView) { super(itemView); ivPhoto = (ImageView) itemView.findViewById(R.id.iv_photo); vSelected = itemView.findViewById(R.id.v_selected); diff --git a/bone/src/main/java/com/idogfooding/bone/utils/AppInfoUtils.java b/bone/src/main/java/com/idogfooding/bone/utils/AppInfoUtils.java new file mode 100644 index 0000000..b56c094 --- /dev/null +++ b/bone/src/main/java/com/idogfooding/bone/utils/AppInfoUtils.java @@ -0,0 +1,62 @@ +package com.idogfooding.bone.utils; + +import android.content.Context; +import android.content.pm.PackageInfo; + +/** + * AppInfoUtils + * + * @author Charles + */ +public class AppInfoUtils { + + /** + * get package info + * @param context + * @return + */ + public static PackageInfo getPackageInfo(Context context) { + try { + return context.getPackageManager().getPackageInfo(context.getPackageName(), 0); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * get package name + */ + public static String getPackageName(Context context) { + try { + return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).packageName; + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + } + + /** + * get the current version name + */ + public static String getVersionName(Context context) { + try { + return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName; + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + } + + /** + * get the current versionCode + */ + public static int getVersionCode(Context context) { + try { + return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode; + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } +} diff --git a/bone/src/main/java/com/idogfooding/bone/utils/SettingsUtils.java b/bone/src/main/java/com/idogfooding/bone/utils/SettingsUtils.java index a7a1a49..eb47dae 100644 --- a/bone/src/main/java/com/idogfooding/bone/utils/SettingsUtils.java +++ b/bone/src/main/java/com/idogfooding/bone/utils/SettingsUtils.java @@ -12,19 +12,20 @@ public class SettingsUtils { public static Intent openApplicationSettings(String packageName) { - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD) { - Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); - intent.setData(Uri.parse("package:" + packageName)); - return intent; - } - return new Intent(); + Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + intent.setData(Uri.parse("package:" + packageName)); + return intent; } public static void openApplicationSettings(Context context, String packageName) { - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD) { - Intent intent = openApplicationSettings(packageName); - context.startActivity(intent); - } + Intent intent = openApplicationSettings(packageName); + context.startActivity(intent); + } + + public static void openApplicationSettings(Context context) { + String packageName = AppInfoUtils.getPackageName(context); + Intent intent = openApplicationSettings(packageName); + context.startActivity(intent); } } diff --git a/bone/src/main/java/com/idogfooding/bone/utils/VersionUtils.java b/bone/src/main/java/com/idogfooding/bone/utils/VersionUtils.java deleted file mode 100644 index 8a104af..0000000 --- a/bone/src/main/java/com/idogfooding/bone/utils/VersionUtils.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.idogfooding.bone.utils; - -import android.content.Context; - -/** - * Version Utils - * - * @author Charles - */ -public class VersionUtils { - - /** - * get the current version - */ - public static String getCurrentVersion(Context context) { - try { - return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName; - } catch (Exception e) { - e.printStackTrace(); - return ""; - } - } - - /** - * get the current versionCode - */ - public static int getCurrentVersionCode(Context context) { - try { - return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode; - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } -} diff --git a/bone/src/main/res/values/strings.xml b/bone/src/main/res/values/strings.xml index e1d6dcb..8a87eeb 100644 --- a/bone/src/main/res/values/strings.xml +++ b/bone/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ 关闭 加载中,请稍等… 编辑 + 拒绝 我已经阅读并同意《用户使用协议》 diff --git a/build.gradle b/build.gradle index 3ed22a8..986fc7d 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ ext { targetSdkVersion = 24 // compileOptions - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } ext.deps = [