优化框架的代码逻辑

Author: getActivity

README.md

@@ -49,6 +49,14 @@ dependencyResolutionManagement {
 * 配置完远程仓库后，在项目 app 模块下的 `build.gradle` 文件中加入远程依赖
 
 ```groovy
+android {
+    // 支持 JDK 1.8 及以上
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
 dependencies {
     // 日志调试框架：https://github.com/getActivity/Logcat
     debugImplementation 'com.github.getActivity:Logcat:12.0'

app/build.gradle

@@ -7,6 +7,12 @@ android {
         applicationId "com.hjq.logcat.demo"
     }
 
+    // 支持 JDK 1.8 及以上
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
     // Apk 签名的那些事：https://www.jianshu.com/p/a1f8e5896aa2
     signingConfigs {
         config {

library/build.gradle

@@ -10,6 +10,12 @@ android {
         abortOnError false
     }
 
+    // 支持 JDK 1.8 及以上
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
     android.libraryVariants.configureEach { variant ->
         // aar 输出文件名配置
         variant.outputs.configureEach { output ->

library/src/main/java/com/hjq/logcat/ChooseAdapter.java

@@ -5,7 +5,6 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
-
 import java.util.List;
 
 /**

library/src/main/java/com/hjq/logcat/ChooseWindow.java

@@ -1,6 +1,7 @@
 package com.hjq.logcat;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.view.Gravity;
@@ -26,6 +27,7 @@ final class ChooseWindow extends EasyWindow<ChooseWindow> implements
     private final ChooseAdapter mAdapter;
     private OnListener mListener;
 
+    @SuppressWarnings("deprecation")
     ChooseWindow(Activity activity) {
         super(activity);
         setContentView(R.layout.logcat_window_choose);
@@ -36,10 +38,12 @@ final class ChooseWindow extends EasyWindow<ChooseWindow> implements
         }
         removeWindowFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
 
-        ListView listView = findViewById(R.id.lv_choose_list);
         mAdapter = new ChooseAdapter();
-        listView.setAdapter(mAdapter);
-        listView.setOnItemClickListener(this);
+        ListView listView = findViewById(R.id.lv_choose_list);
+        if (listView != null) {
+            listView.setAdapter(mAdapter);
+            listView.setOnItemClickListener(this);
+        }
 
         setOnClickListenerByView(R.id.fl_choose_root, this);
     }
@@ -50,9 +54,13 @@ public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull View view) {
     }
 
     ChooseWindow setList(int... stringIds) {
+        Context context = getContext();
+        if (context == null) {
+            return this;
+        }
         List<String> data = new ArrayList<>();
         for (int stringId : stringIds) {
-            data.add(getContext().getResources().getString(stringId));
+            data.add(context.getResources().getString(stringId));
         }
         return setList(data);
     }

library/src/main/java/com/hjq/logcat/FloatingActionBehavior.java

@@ -3,14 +3,14 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
 import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
-
 import java.util.List;
 
 /**
@@ -27,6 +27,7 @@ public FloatingActionBehavior(Context context, AttributeSet attrs) {
         super();
     }
 
+    @SuppressLint("RestrictedApi")
     @Override
     public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
         return dependency instanceof Snackbar.SnackbarLayout;
@@ -50,7 +51,7 @@ private void updateTranslation(CoordinatorLayout parent, View child, View depend
         float translationY = this.getTranslationY(parent, child);
         if (translationY != this.mTranslationY) {
             ViewCompat.animate(child).cancel();
-            if (Math.abs(translationY - this.mTranslationY) == (float) dependency.getHeight()) {
+            if (Math.abs(translationY - this.mTranslationY) == dependency.getHeight()) {
                 ViewCompat.animate(child).translationY(translationY);
             } else {
                 child.setTranslationY(translationY);
@@ -60,6 +61,7 @@ private void updateTranslation(CoordinatorLayout parent, View child, View depend
         }
     }
 
+    @SuppressLint("RestrictedApi")
     private float getTranslationY(CoordinatorLayout parent, View child) {
         float minOffset = 0.0F;
         List<?> dependencies = parent.getDependencies(child);
@@ -68,7 +70,7 @@ private float getTranslationY(CoordinatorLayout parent, View child) {
         for (int z = dependencies.size(); i < z; ++i) {
             View view = (View) dependencies.get(i);
             if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(child, view)) {
-                minOffset = Math.min(minOffset, view.getTranslationY() - (float) view.getHeight());
+                minOffset = Math.min(minOffset, view.getTranslationY() - view.getHeight());
             }
         }
 
@@ -95,17 +97,14 @@ public void onNestedScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNul
             mAnimFlag = true;
             ValueAnimator animator = ValueAnimator.ofFloat(1, 0);
             animator.setDuration(300);
-            animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-                @Override
-                public void onAnimationUpdate(ValueAnimator animation) {
-                    float scale = (float) animation.getAnimatedValue();
-                    child.setScaleX(scale);
-                    child.setScaleY(scale);
-                    if (scale != 0) {
-                        return;
-                    }
-                    child.setVisibility(View.INVISIBLE);
+            animator.addUpdateListener(animation -> {
+                float scale = (float) animation.getAnimatedValue();
+                child.setScaleX(scale);
+                child.setScaleY(scale);
+                if (scale != 0) {
+                    return;
                 }
+                child.setVisibility(View.INVISIBLE);
             });
             animator.addListener(new AnimatorListenerAdapter() {
 
@@ -128,13 +127,10 @@ public void onAnimationEnd(Animator animation) {
             child.setVisibility(View.VISIBLE);
             ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
             animator.setDuration(300);
-            animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-                @Override
-                public void onAnimationUpdate(ValueAnimator animation) {
-                    float scale = (float) animation.getAnimatedValue();
-                    child.setScaleX(scale);
-                    child.setScaleY(scale);
-                }
+            animator.addUpdateListener(animation -> {
+                float scale = (float) animation.getAnimatedValue();
+                child.setScaleX(scale);
+                child.setScaleY(scale);
             });
             animator.addListener(new AnimatorListenerAdapter() {
 

library/src/main/java/com/hjq/logcat/ForegroundServiceStartTask.java

@@ -5,6 +5,7 @@
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 
 /**
  *    author : Android 轮子哥
@@ -19,7 +20,7 @@ static void with(Application application) {
     }
 
     @Override
-    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+    public void onActivityCreated(@NonNull Activity activity, Bundle savedInstanceState) {
         Intent intent = new Intent(activity, LogcatService.class);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             // Android 8.0 启动后台 service 出错 IllegalStateException: Not allowed to start service Intent
@@ -88,20 +89,32 @@ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
     }
 
     @Override
-    public void onActivityStarted(Activity activity) {}
+    public void onActivityStarted(@NonNull Activity activity) {
+        // default implementation ignored
+    }
 
     @Override
-    public void onActivityResumed(Activity activity) {}
+    public void onActivityResumed(@NonNull Activity activity) {
+        // default implementation ignored
+    }
 
     @Override
-    public void onActivityPaused(Activity activity) {}
+    public void onActivityPaused(@NonNull Activity activity) {
+        // default implementation ignored
+    }
 
     @Override
-    public void onActivityStopped(Activity activity) {}
+    public void onActivityStopped(@NonNull Activity activity) {
+        // default implementation ignored
+    }
 
     @Override
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
+    public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {
+        // default implementation ignored
+    }
 
     @Override
-    public void onActivityDestroyed(Activity activity) {}
+    public void onActivityDestroyed(@NonNull Activity activity) {
+        // default implementation ignored
+    }
 }