perf(内在实现改变): 删除了 withFragment 方法,统一改为 with 方法,不兼容改动

删除了 withFragment 方法,统一改为 with 方法,不兼容改动 BREAKING CHANGE: 删除了 withFragment 方法,统一改为 with 方法,不兼容改动
xiaojinzi123 · Apr 3, 2019 · 5e9b265 · 5e9b265
1 parent 3448196
commit 5e9b265
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 11 deletions.
diff --git a/ComponentApi/src/main/java/com/xiaojinzi/component/anno/ServiceAnno.java b/ComponentApi/src/main/java/com/xiaojinzi/component/anno/ServiceAnno.java
@@ -17,7 +17,7 @@
      *
      * @return
      */
-    Class[] value() default {};
+    Class[] value();
 
     /**
      * 是否是单例,默认是单例模式的

diff --git a/ComponentRxImpl/src/main/java/com/xiaojinzi/component/impl/RxRouter.java b/ComponentRxImpl/src/main/java/com/xiaojinzi/component/impl/RxRouter.java
@@ -77,7 +77,7 @@ public static Builder with(@NonNull Context context) {
      * @param fragment
      * @return
      */
-    public static Builder withFragment(@NonNull Fragment fragment) {
+    public static Builder with(@NonNull Fragment fragment) {
         return new Builder(fragment);
     }
 

diff --git a/Module1/src/main/java/com/xiaojinzi/component1/service/Component1ServiceImpl.java b/Module1/src/main/java/com/xiaojinzi/component1/service/Component1ServiceImpl.java
@@ -15,7 +15,8 @@
 
 import io.reactivex.Single;
 
-@ServiceAnno(value = {Component1Service.class})
+//@ServiceAnno(value = {Component1Service.class})
+@ServiceAnno(Component1Service.class)
 public class Component1ServiceImpl implements Component1Service {
 
     private Random r = new Random();

diff --git a/Module1/src/main/java/com/xiaojinzi/component1/view/Component1Fragment.java b/Module1/src/main/java/com/xiaojinzi/component1/view/Component1Fragment.java
@@ -43,7 +43,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 RxRouter
-                        .withFragment(Component1Fragment.this)
+                        .with(Component1Fragment.this)
                         .host(ModuleConfig.Module1.NAME)
                         .path(ModuleConfig.Module1.TEST)
                         .query("data", "rxJumpGetData")

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/app_icon"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name="com.xiaojinzi.componentdemo.view.module1.TestInOtherModuleAct"></activity>

diff --git a/app/src/main/java/com/xiaojinzi/componentdemo/view/TestFragmentRouterFragment.java b/app/src/main/java/com/xiaojinzi/componentdemo/view/TestFragmentRouterFragment.java
@@ -81,7 +81,7 @@ private void addInfo(@Nullable RouterResult routerResult, @Nullable Throwable er
 
     private void rxJumpGetData(){
         RxRouter
-                .withFragment(this)
+                .with(this)
                 .host("component1")
                 .path("test")
                 .query("data", "rxJumpGetData")
@@ -123,7 +123,7 @@ public void onError(@NonNull RouterErrorResult errorResult) {
 
     public void testCallbackAfterFinish() {
         RxRouter
-                .withFragment(this)
+                .with(this)
                 .host(ModuleConfig.System.NAME)
                 .path(ModuleConfig.System.CALL_PHONE)
                 .putString("tel", "xxx")
@@ -145,7 +145,7 @@ public void onCancel(@NonNull RouterRequest request) {
 
     public void testCallbackAfterFinishActivity() {
         RxRouter
-                .withFragment(this)
+                .with(this)
                 .host(ModuleConfig.System.NAME)
                 .path(ModuleConfig.System.CALL_PHONE)
                 .putString("tel", "xxx")

diff --git a/app/src/main/java/com/xiaojinzi/componentdemo/view/TestQualityAct.java b/app/src/main/java/com/xiaojinzi/componentdemo/view/TestQualityAct.java
@@ -909,7 +909,7 @@ public void subscribe(CompletableEmitter emitter) throws Exception {
                     return;
                 }
 
-                RxRouter.withFragment(innerFragment)
+                RxRouter.with(innerFragment)
                         .host(ModuleConfig.Module1.NAME)
                         .path(ModuleConfig.Module1.TEST_AUTORETURN)
                         .requestCode(123)

diff --git a/app/src/main/res/mipmap-xxxhdpi/app_icon.png b/app/src/main/res/mipmap-xxxhdpi/app_icon.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">ComponentDemo</string>
+    <string name="app_name">组件化</string>
 </resources>
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -13,7 +13,7 @@ ext.versions = [
         rxjava             : "2.2.8",
         rxandroid          : "2.1.1",
         rxbinding          : "2.2.0",
-        component_version  : "1.2.2"
+        component_version  : "1.3"
 ]
 
 ext.libs = [