diff --git a/ComponentImpl/src/main/java/com/xiaojinzi/component/Component.java b/ComponentImpl/src/main/java/com/xiaojinzi/component/Component.java index 9e65e669..32a9b1ac 100644 --- a/ComponentImpl/src/main/java/com/xiaojinzi/component/Component.java +++ b/ComponentImpl/src/main/java/com/xiaojinzi/component/Component.java @@ -35,7 +35,7 @@ public class Component { /** * 配置对象 */ - private static ComponentConfig mConfig = null; + private static Config mConfig = null; private Component() { } @@ -43,10 +43,10 @@ private Component() { /** * 初始化 * - * @see ComponentConfig 初始化的配置对象 + * @see Config 初始化的配置对象 */ @MainThread - public static void init(boolean isDebug, @NonNull ComponentConfig config) { + public static void init(boolean isDebug, @NonNull Config config) { // 做必要的检查 if (isInit) { @@ -101,7 +101,7 @@ private static void printComponent() { @NonNull @AnyThread - public static ComponentConfig getConfig() { + public static Config getConfig() { checkInit(); return mConfig; } diff --git a/ComponentImpl/src/main/java/com/xiaojinzi/component/ComponentConfig.java b/ComponentImpl/src/main/java/com/xiaojinzi/component/Config.java similarity index 95% rename from ComponentImpl/src/main/java/com/xiaojinzi/component/ComponentConfig.java rename to ComponentImpl/src/main/java/com/xiaojinzi/component/Config.java index 65e15214..9ad30d49 100644 --- a/ComponentImpl/src/main/java/com/xiaojinzi/component/ComponentConfig.java +++ b/ComponentImpl/src/main/java/com/xiaojinzi/component/Config.java @@ -10,9 +10,9 @@ /** * 这是组件化的一个配置类 * - * @see Component#init(boolean, ComponentConfig) + * @see Component#init(boolean, Config) */ -public class ComponentConfig { +public class Config { @NonNull private Application application; @@ -26,7 +26,7 @@ public class ComponentConfig { private long routeRepeatCheckDuration = 1000; private ObjectToJsonConverter objectToJsonConverter; - private ComponentConfig(@NonNull Builder builder) { + private Config(@NonNull Builder builder) { this.application = builder.application; this.isOptimizeInit = builder.isOptimizeInit; this.isAutoRegisterModule = builder.isAutoRegisterModule; @@ -140,7 +140,7 @@ public Builder objectToJsonConverter(ObjectToJsonConverter objectToJsonConverter } @NonNull - public ComponentConfig build() { + public Config build() { // 参数检查 Utils.checkNullPointer(this.application, "application"); Utils.checkNullPointer(this.defaultScheme, "application"); @@ -154,7 +154,7 @@ public ComponentConfig build() { } isUsed = true; // 提前创建对象 - ComponentConfig config = new ComponentConfig(this); + Config config = new Config(this); // 解除占用 this.application = null; this.defaultScheme = null; diff --git a/ComponentImpl/src/main/java/com/xiaojinzi/component/impl/application/ModuleManager.java b/ComponentImpl/src/main/java/com/xiaojinzi/component/impl/application/ModuleManager.java index 42f247d6..54d5a204 100644 --- a/ComponentImpl/src/main/java/com/xiaojinzi/component/impl/application/ModuleManager.java +++ b/ComponentImpl/src/main/java/com/xiaojinzi/component/impl/application/ModuleManager.java @@ -4,7 +4,7 @@ import android.support.annotation.Nullable; import com.xiaojinzi.component.Component; -import com.xiaojinzi.component.ComponentConfig; +import com.xiaojinzi.component.Config; import com.xiaojinzi.component.ComponentUtil; import com.xiaojinzi.component.application.IComponentCenterApplication; import com.xiaojinzi.component.application.IComponentHostApplication; @@ -81,7 +81,7 @@ public void register(@NonNull String host) { } /** - * 自动注册, 需要开启 {@link ComponentConfig.Builder#optimizeInit(boolean)} + * 自动注册, 需要开启 {@link Config.Builder#optimizeInit(boolean)} * 表示使用 Gradle 插件优化初始化 */ public void autoRegister() { diff --git a/ComponentImpl/src/main/java/com/xiaojinzi/component/support/ASMUtil.java b/ComponentImpl/src/main/java/com/xiaojinzi/component/support/ASMUtil.java index 8302ca43..ab597338 100644 --- a/ComponentImpl/src/main/java/com/xiaojinzi/component/support/ASMUtil.java +++ b/ComponentImpl/src/main/java/com/xiaojinzi/component/support/ASMUtil.java @@ -3,7 +3,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.xiaojinzi.component.ComponentConfig; +import com.xiaojinzi.component.Config; import com.xiaojinzi.component.anno.support.CheckClassNameAnno; import com.xiaojinzi.component.application.IComponentHostApplication; import com.xiaojinzi.component.fragment.IComponentHostFragment; @@ -43,7 +43,7 @@ * 对于有些人觉得这个时间无所谓, 其实我也这么觉得. 但是就是有人受不了这么多次的反射. 那么怎么办呢? *

* 现在初始化的时候获取实现需要用户选择使用 ASM 还是 反射的方式. - * {@link ComponentConfig.Builder#optimizeInit(boolean)} 可以设置是否使用 ASM 的方式 + * {@link Config.Builder#optimizeInit(boolean)} 可以设置是否使用 ASM 的方式 * 具体的示例代码可以参看 {@link ModuleManager#findModuleApplication(String)}. * 所以这个类有啥用呢?简单点说就是我们会利用插件, 在编译之后对此类的空方法填上一些代码. 让他是以正常的 new 对象 * 的方式返回的, 而不是反射. 而抽取出这个类, 是为了字节码改动的范围尽可能的小. diff --git a/Module1run/src/main/java/com/xiaojinzi/module1run/App.java b/Module1run/src/main/java/com/xiaojinzi/module1run/App.java index fa2bdb35..644087fd 100644 --- a/Module1run/src/main/java/com/xiaojinzi/module1run/App.java +++ b/Module1run/src/main/java/com/xiaojinzi/module1run/App.java @@ -4,7 +4,7 @@ import com.xiaojinzi.base.ModuleConfig; import com.xiaojinzi.component.Component; -import com.xiaojinzi.component.ComponentConfig; +import com.xiaojinzi.component.Config; import com.xiaojinzi.component.impl.application.ModuleManager; import com.xiaojinzi.component.support.RxErrorIgnoreUtil; @@ -16,7 +16,7 @@ public void onCreate() { // 初始化组件化相关 Component.init( - BuildConfig.DEBUG, ComponentConfig.with(this) + BuildConfig.DEBUG, Config.with(this) .build() ); diff --git a/app/src/main/java/com/xiaojinzi/componentdemo/App.java b/app/src/main/java/com/xiaojinzi/componentdemo/App.java index d043f41f..f0fdc4b3 100644 --- a/app/src/main/java/com/xiaojinzi/componentdemo/App.java +++ b/app/src/main/java/com/xiaojinzi/componentdemo/App.java @@ -3,7 +3,7 @@ import android.app.Application; import com.xiaojinzi.component.Component; -import com.xiaojinzi.component.ComponentConfig; +import com.xiaojinzi.component.Config; import com.xiaojinzi.component.impl.application.ModuleManager; import com.xiaojinzi.component.support.LogUtil; import com.xiaojinzi.component.support.RxErrorIgnoreUtil; @@ -17,7 +17,7 @@ public void onCreate() { // 初始化组件化相关 Component.init( BuildConfig.DEBUG, - ComponentConfig.with(this) + Config.with(this) .defaultScheme("router") // 使用内置的路由重复检查的拦截器, 如果为 true, // 那么当两个相同的路由发生在指定的时间内后一个路由就会被拦截