see 11/06 log

Author: Blankj

buildSrc/src/main/groovy/Config.groovy

@@ -53,7 +53,7 @@ class Config {
 
             // 上传新版本插件更新 pluginPath 中的版本号，并设置 isApply = false
             // 通过 mavenLocal 上传本地版本，设置 isApply = true 即可应用插件来调试，最后通过 bintrayUpload 来发布插件
-            plugin_api                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.4", pluginId: "com.blankj.api"),
+            plugin_api                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:latest.release", pluginId: "com.blankj.api"),
             //./gradlew clean :plugin_api-gradle-plugin:mavenLocal     // 上传到本地 mavenLocal
             //./gradlew clean :plugin_api-gradle-plugin:bintrayUpload  // 上传到 jcenter
             plugin_bus                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.6", pluginId: "com.blankj.bus"),

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpActivity.java

@@ -1,7 +1,5 @@
 package com.blankj.utilcode.pkg.feature.mvp;
 
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpModel.java

@@ -12,7 +12,7 @@
  *     desc  :
  * </pre>
  */
-public class MvpModel extends BaseModel implements IMvp.Model {
+public class MvpModel extends BaseModel implements MvpMvp.Model {
 
     private int index;
 

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/IMvp.java renamed to feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpMvp.java

@@ -10,7 +10,7 @@
  *     desc  :
  * </pre>
  */
-public interface IMvp {
+public interface MvpMvp {
 
     interface View {
         void setLoadingVisible(boolean visible);

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpPresenter.java

@@ -13,7 +13,7 @@
  * </pre>
  */
 public class MvpPresenter extends BasePresenter<MvpView>
-        implements IMvp.Presenter {
+        implements MvpMvp.Presenter {
 
     @Override
     public void onBindView() {

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpView.java

@@ -6,7 +6,6 @@
 
 import com.blankj.base.mvp.BaseView;
 import com.blankj.utilcode.pkg.R;
-import com.blankj.utilcode.pkg.feature.fragment.FragmentActivity;
 import com.blankj.utilcode.util.ClickUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.SizeUtils;
@@ -22,7 +21,7 @@
  * </pre>
  */
 public class MvpView extends BaseView<MvpView>
-        implements IMvp.View {
+        implements MvpMvp.View {
 
     private TextView mvpTv;
     private TextView mvpMeasureWidthTv;

lib/base/src/main/java/com/blankj/base/mvp/BaseModel.java

@@ -1,7 +1,5 @@
 package com.blankj.base.mvp;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.support.annotation.CallSuper;
 import android.util.Log;
 
@@ -15,8 +13,6 @@
  */
 public abstract class BaseModel {
 
-    LiveData<Object> mData = new MutableLiveData<>();
-
     private static final String TAG = BaseView.TAG;
 
     public abstract void onCreate();

lib/base/src/main/java/com/blankj/base/mvp/BasePresenter.java

@@ -1,7 +1,5 @@
 package com.blankj.base.mvp;
 
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
 import android.support.annotation.CallSuper;
 import android.util.Log;
 
@@ -69,8 +67,4 @@ public void onDestroy() {
     public boolean isAlive() {
         return isAlive;
     }
-
-    public void getSafeData() {
-        new ViewModelProvider(getView().getActivity(), new ViewModelProvider.NewInstanceFactory()).get(ViewModel.class);
-    }
 }

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

@@ -1,6 +1,10 @@
 package com.blankj.utilcode.util;
 
+import android.app.ActivityManager;
+import android.content.Context;
+import android.os.Build;
 import android.os.Environment;
+import android.support.annotation.RequiresApi;
 
 import java.io.File;
 
@@ -89,4 +93,11 @@ public static boolean cleanExternalCache() {
     public static boolean cleanCustomDir(final String dirPath) {
         return UtilsBridge.deleteAllInDir(UtilsBridge.getFileByPath(dirPath));
     }
+
+    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+    public static void cleanAppUserData() {
+        ActivityManager am = (ActivityManager) Utils.getApp().getSystemService(Context.ACTIVITY_SERVICE);
+        //noinspection ConstantConditions
+        am.clearApplicationUserData();
+    }
 }

plugin/api-gradle-plugin/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## v1.5(2020/11/06)
+对非 mock 的 visitor 的修复
+
 ## v1.4(2020/05/19)
 重新发布，因为上个版本从阿里云仓库拉取是有问题的
 

plugin/api-gradle-plugin/README.md

@@ -30,7 +30,7 @@
 buildscript {
     dependencies {
         ...
-        classpath 'com.blankj:api-gradle-plugin:1.4'
+        classpath 'com.blankj:api-gradle-plugin:latest.release'
     }
 }
 ```

plugin/api-gradle-plugin/src/main/java/com/blankj/api/ApiClassVisitor.java

@@ -25,7 +25,6 @@ public class ApiClassVisitor extends ClassVisitor {
     private boolean              hasAnnotation;
     private boolean              isMock;
     private String               mApiUtilsClass;
-    public  String               errorStr;
 
     public ApiClassVisitor(ClassVisitor classVisitor, Map<String, ApiInfo> apiImplMap, List<String> apiClasses, String apiUtilsClass) {
         super(Opcodes.ASM5, classVisitor);
@@ -65,10 +64,10 @@ public void visitEnd() {
         if (hasAnnotation) {
             if (!isMock) {// 如果不是 mock 的话
                 ApiInfo apiInfo = mApiImplMap.get(superClassName);
-                if (apiInfo == null) {
+                if (apiInfo == null || apiInfo.isMock) {// 不存在或者之前存在的是 mock
                     mApiImplMap.put(superClassName, new ApiInfo(className, false));
-                } else {// 存在一个 api 多个实现就报错
-                    errorStr = "<" + className + "> and <" + apiInfo.implApiClass + "> impl same api of <" + superClassName + ">";
+                } else {// 存在一个 api 多个非 mock 实现就报错
+                    throw new IllegalArgumentException("<" + className + "> and <" + apiInfo.implApiClass + "> impl same api of <" + superClassName + ">");
                 }
             } else {// mock 的话，如果 map 中已存在就不覆盖了
                 if (!mApiImplMap.containsKey(superClassName)) {

plugin/bus-gradle-plugin/README.md

@@ -19,7 +19,7 @@
 buildscript {
     dependencies {
         ...
-        classpath 'com.blankj:bus-gradle-plugin:2.6'
+        classpath 'com.blankj:bus-gradle-plugin:latest.release'
     }
 }
 ```