see 07/10 log

Author: Blankj

.gitignore

@@ -1,12 +1,13 @@
 *.iml
-*__bus__.json
+__api__.json
+__bus__.json
 .gradle
-/local.properties
+local.properties
 .idea
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 /apk
 *.phrof
-/busMaven
+/maven

CHANGELOG.md

@@ -0,0 +1,8 @@
+apply {
+    from "${rootDir.path}/buildApp.gradle"
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api Config.depConfig.launcher_pkg.dep
+}

README-CN.md

@@ -10,7 +10,7 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name="com.blankj.launcher.pkg.MainActivity"
+            android:name="com.blankj.main.pkg.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="user"
             android:windowSoftInputMode="stateHidden">

README.md

@@ -0,0 +1,15 @@
+package com.blankj.launcher.app;
+
+/**
+ * <pre>
+ *     author: Blankj
+ *     blog  : http://blankj.com
+ *     time  : 2016/10/12
+ *     desc  : app about launcher
+ * </pre>
+ */
+public class LauncherApp extends com.blankj.launcher.pkg.LauncherApp {
+
+}
+
+

launcher/app/.gitignore renamed to app/launcher/app/.gitignore

@@ -0,0 +1,8 @@
+apply {
+    from "${rootDir.path}/buildLib.gradle"
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+}

app/launcher/app/build.gradle

@@ -0,0 +1 @@
+<manifest package="com.blankj.launcher.pkg" />

launcher/app/proguard-rules.pro renamed to app/launcher/app/proguard-rules.pro

@@ -1,4 +1,4 @@
-package com.blankj.launcher.app;
+package com.blankj.launcher.pkg;
 
 import android.content.Context;
 
@@ -9,7 +9,7 @@
  *     author: Blankj
  *     blog  : http://blankj.com
  *     time  : 2016/10/12
- *     desc  : app about utils
+ *     desc  :
  * </pre>
  */
 public class LauncherApp extends CommonApplication {

launcher/app/src/main/AndroidManifest.xml renamed to app/launcher/app/src/main/AndroidManifest.xml

@@ -0,0 +1,8 @@
+apply {
+    from "${rootDir.path}/buildApp.gradle"
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation Config.depConfig.main_pkg.dep
+}

app/launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.blankj.main.app">
+
+    <application
+        android:name="com.blankj.main.app.MainApp"
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:name="com.blankj.main.pkg.MainActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="user"
+            android:windowSoftInputMode="stateHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+</manifest>

launcher/pkg/.gitignore renamed to app/launcher/pkg/.gitignore

@@ -0,0 +1,35 @@
+package com.blankj.main.app;
+
+import android.content.Context;
+
+import com.blankj.lib.common.CommonApplication;
+
+/**
+ * <pre>
+ *     author: Blankj
+ *     blog  : http://blankj.com
+ *     time  : 2016/10/12
+ *     desc  :
+ * </pre>
+ */
+public class MainApp extends CommonApplication {
+
+    private static MainApp sInstance;
+
+    public static MainApp getInstance() {
+        return sInstance;
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        sInstance = this;
+    }
+}
+
+

app/launcher/pkg/build.gradle

@@ -0,0 +1,7 @@
+apply {
+    from "${rootDir.path}/buildLib.gradle"
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}

launcher/pkg/proguard-rules.pro renamed to app/launcher/pkg/proguard-rules.pro

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blankj.launcher.pkg">
+          package="com.blankj.main.pkg">
 
     <application>
         <activity

app/launcher/pkg/src/main/AndroidManifest.xml

@@ -1,12 +1,14 @@
-package com.blankj.launcher.pkg
+package com.blankj.main.pkg
 
 import android.graphics.Color
 import android.os.Bundle
 import android.support.v7.app.ActionBarDrawerToggle
 import android.view.View
 import android.widget.ImageView
 import com.blankj.lib.common.CommonDrawerActivity
+import com.blankj.subutil.export.api.SubUtilApi
 import com.blankj.utilcode.constant.PermissionConstants
+import com.blankj.utilcode.export.api.UtilCodeApi
 import com.blankj.utilcode.util.*
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -65,8 +67,12 @@ class MainActivity : CommonDrawerActivity() {
 
     override fun onDebouncingClick(view: View) {
         when (view.id) {
-            R.id.launcherMainCoreUtilBtn -> BusUtils.postStatic<Any>("CoreUtilActivity#start", this)
-            R.id.launcherMainSubUtilBtn -> BusUtils.postStatic<Any>("SubUtilActivity#start", this)
+            R.id.launcherMainCoreUtilBtn -> {
+                ApiUtils.getApi(UtilCodeApi::class.java).startUtilCodeActivity(this)
+            }
+            R.id.launcherMainSubUtilBtn -> {
+                ApiUtils.getApi(SubUtilApi::class.java).startSubUtilActivity(this)
+            }
         }
     }
 

launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java renamed to app/launcher/pkg/src/main/java/com/blankj/launcher/pkg/LauncherApp.java

@@ -1,4 +1,4 @@
-package com.blankj.launcher.pkg
+package com.blankj.main.pkg
 
 import android.os.Bundle
 import android.view.View

subutil/app/.gitignore renamed to app/main/app/.gitignore

@@ -0,0 +1,11 @@
+apply {
+    from "${rootDir.path}/buildLib.gradle"
+}
+
+dependencies {
+    for (config in Config.depConfig) {
+        if (config.key.endsWith("_export")) {
+            api config.value.dep
+        }
+    }
+}

app/main/app/build.gradle

@@ -0,0 +1 @@
+<manifest package="com.blankj.mock" />

subutil/app/proguard-rules.pro renamed to app/main/app/proguard-rules.pro

@@ -0,0 +1,25 @@
+package com.blankj.mock.api;
+
+import android.content.Context;
+
+import com.blankj.subutil.export.api.SubUtilApi;
+import com.blankj.utilcode.util.ApiUtils;
+import com.blankj.utilcode.util.ToastUtils;
+
+/**
+ * <pre>
+ *     author: blankj
+ *     blog  : http://blankj.com
+ *     time  : 2019/07/10
+ *     desc  :
+ * </pre>
+ */
+@ApiUtils.Api(isDebug = true)
+public class SubUtilMockApi extends SubUtilApi {
+
+    @Override
+    public void startSubUtilActivity(Context context) {
+        ToastUtils.showShort("startSubUtilActivity");
+    }
+
+}

app/main/app/src/main/AndroidManifest.xml

@@ -0,0 +1,25 @@
+package com.blankj.mock.api;
+
+import android.content.Context;
+
+import com.blankj.utilcode.export.api.UtilCodeApi;
+import com.blankj.utilcode.util.ApiUtils;
+import com.blankj.utilcode.util.ToastUtils;
+
+/**
+ * <pre>
+ *     author: blankj
+ *     blog  : http://blankj.com
+ *     time  : 2019/07/10
+ *     desc  :
+ * </pre>
+ */
+@ApiUtils.Api(isDebug = true)
+public class UtilCodeMockApi extends UtilCodeApi {
+
+    @Override
+    public void startUtilCodeActivity(Context context) {
+        ToastUtils.showShort("startUtilCodeActivity");
+    }
+
+}

app/main/app/src/main/java/com/blankj/main/app/MainApp.java

@@ -0,0 +1,8 @@
+apply {
+    from "${rootDir.path}/buildApp.gradle"
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation Config.depConfig.subutil_pkg.dep
+}

subutil/export/.gitignore renamed to app/main/pkg/.gitignore

@@ -0,0 +1,7 @@
+apply {
+    from "${rootDir.path}/buildLib.gradle"
+}
+
+dependencies {
+    api Config.depConfig.lib_common.dep
+}

app/main/pkg/build.gradle

@@ -2,6 +2,9 @@
 
 import android.content.Context;
 
+import com.blankj.utilcode.util.ApiUtils;
+
+
 /**
  * <pre>
  *     author: blankj
@@ -10,7 +13,8 @@
  *     desc  :
  * </pre>
  */
-public interface SubUtilApi {
+public abstract class SubUtilApi extends ApiUtils.BaseApi {
+
+    public abstract void startSubUtilActivity(Context context);
 
-    void startSubUtilActivity(Context context);
 }

subutil/export/proguard-rules.pro renamed to app/main/pkg/proguard-rules.pro

@@ -0,0 +1,7 @@
+apply {
+    from "${rootDir.path}/buildLib.gradle"
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}

launcher/pkg/src/main/AndroidManifest.xml renamed to app/main/pkg/src/main/AndroidManifest.xml

@@ -1,19 +1,21 @@
-package com.blankj.subutil.pkg.impl;
+package com.blankj.subutil.pkg;
 
 import android.content.Context;
 
 import com.blankj.subutil.export.api.SubUtilApi;
 import com.blankj.subutil.pkg.feature.SubUtilActivity;
+import com.blankj.utilcode.util.ApiUtils;
 
 /**
  * <pre>
  *     author: blankj
  *     blog  : http://blankj.com
- *     time  : 2019/06/09
+ *     time  : 2019/07/02
  *     desc  :
  * </pre>
  */
-public class SubUtilApiImpl implements SubUtilApi {
+@ApiUtils.Api
+public class SubUtilApiImpl extends SubUtilApi {
 
     @Override
     public void startSubUtilActivity(Context context) {

launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt renamed to app/main/pkg/src/main/java/com/blankj/main/pkg/MainActivity.kt

@@ -25,7 +25,6 @@ import kotlinx.android.synthetic.main.activity_util_sub.*
 class SubUtilActivity : CommonTitleActivity() {
 
     companion object {
-        @BusUtils.Subscribe(name = "SubUtilActivity#start")
         fun start(context: Context) {
             val starter = Intent(context, SubUtilActivity::class.java)
             context.startActivity(starter)