feat(feat): move class

move Condition class to impl module
xiaojinzi123 · Jul 6, 2019 · ad6fd73 · ad6fd73
1 parent bb5c42b
commit ad6fd73
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 18 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/ComponentApi/src/main/java/com/xiaojinzi/component/anno/ConditionalAnno.java b/ComponentApi/src/main/java/com/xiaojinzi/component/anno/ConditionalAnno.java
@@ -1,7 +1,5 @@
 package com.xiaojinzi.component.anno;
 
-import com.xiaojinzi.component.api.Condition;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -15,18 +13,11 @@
 public @interface ConditionalAnno {
 
     /**
-     * 直接能支持的返回 true 和 false 的
-     *
-     * @return true 表示条件成立
-     */
-    //boolean value();
-
-    /**
-     * 指定多个条件的类,指定的这些类必须实现 {@link Condition} 接口
+     * 指定多个条件的类,指定的这些类必须实现 {@link com.xiaojinzi.component.condition.Condition} 接口
      * 所有都返回了 true 才表示条件成立
      *
      * @return
      */
-    Class<? extends Condition>[] conditions();
+    Class[] conditions();
 
 }
diff --git a/...om/xiaojinzi/component/api/Condition.java → ...ojinzi/component/condition/Condition.java b/...om/xiaojinzi/component/api/Condition.java → ...ojinzi/component/condition/Condition.java
@@ -1,4 +1,4 @@
-package com.xiaojinzi.component.api;
+package com.xiaojinzi.component.condition;
 
 /**
  * 这是一个条件的接口,实现此接口的类必须是无参数的构造函数

diff --git a/ComponentImpl/src/main/java/com/xiaojinzi/component/support/ConditionCache.java b/ComponentImpl/src/main/java/com/xiaojinzi/component/support/ConditionCache.java
@@ -4,12 +4,12 @@
 import android.support.annotation.Nullable;
 
 import com.xiaojinzi.component.Component;
-import com.xiaojinzi.component.api.Condition;
 import com.xiaojinzi.component.cache.ClassCache;
+import com.xiaojinzi.component.condition.Condition;
 import com.xiaojinzi.component.error.CreateInterceptorException;
 
 /**
- * 条件的缓存 {@link com.xiaojinzi.component.api.Condition}
+ * 条件的缓存 {@link com.xiaojinzi.component.condition.Condition}
  * <p>
  * time   : 2018/12/03
  *

diff --git a/ModuleHelp/src/main/java/com/xiaojinzi/component/help/CallPhoePermisionInterceptor.java b/ModuleHelp/src/main/java/com/xiaojinzi/component/help/CallPhoePermisionInterceptor.java
@@ -7,7 +7,7 @@
 import com.xiaojinzi.base.util.PermissionsUtil;
 import com.xiaojinzi.component.anno.ConditionalAnno;
 import com.xiaojinzi.component.anno.InterceptorAnno;
-import com.xiaojinzi.component.api.Condition;
+import com.xiaojinzi.component.condition.Condition;
 import com.xiaojinzi.component.impl.RouterInterceptor;
 
 /**

diff --git a/app/src/main/java/com/xiaojinzi/componentdemo/MonitorInterceptor.java b/app/src/main/java/com/xiaojinzi/componentdemo/MonitorInterceptor.java
@@ -4,7 +4,7 @@
 
 import com.xiaojinzi.component.anno.ConditionalAnno;
 import com.xiaojinzi.component.anno.GlobalInterceptorAnno;
-import com.xiaojinzi.component.api.Condition;
+import com.xiaojinzi.component.condition.Condition;
 import com.xiaojinzi.component.impl.RouterInterceptor;
 
 /**

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -13,7 +13,7 @@ ext.versions = [
         rxjava             : '2.2.9',
         rxandroid          : "2.1.1",
         rxbinding          : "2.2.0",
-        component_version  : "1.7.3.2"
+        component_version  : "1.7.4"
 ]
 
 ext.libs = [