Merge branch 'master-androidx' into master-androidx-java8

ComponentImpl/src/main/java/com/xiaojinzi/component/impl/RouterCenter.java

@@ -264,8 +264,7 @@ private void doStartIntent(@NonNull RouterRequest request,
     @Override
     public synchronized List<RouterInterceptor> listPageInterceptors(@NonNull Uri uri) {
         // 获取目标对象
-        final String targetUrl = getTargetUrl(uri);
-        final RouterBean routerBean = routerMap.get(targetUrl);
+        final RouterBean routerBean = getTarget(uri);
         if (routerBean == null) {
             return Collections.emptyList();
         }
@@ -315,23 +314,6 @@ public synchronized List<RouterInterceptor> listDegradeInterceptors(@NonNull Uri
         return Collections.emptyList();
     }
 
-    /**
-     * 获取url地址
-     */
-    @Nullable
-    private String getTargetUrl(@NonNull Uri uri) {
-        // "/component1/test" 不含host
-        String targetPath = uri.getPath();
-        if (targetPath == null || targetPath.isEmpty()) {
-            return null;
-        }
-        if (targetPath.charAt(0) != '/') {
-            targetPath = SEPARATOR + targetPath;
-        }
-        targetPath = uri.getHost() + targetPath;
-        return targetPath;
-    }
-
     @Nullable
     private RouterBean getTarget(@NonNull Uri uri) {
         String targetKey = getTargetRouterKey(uri);

RepoComponent/com/xiaojinzi/component/component-plugin/1.9.2/component-plugin-1.9.2.jar.md5

@@ -0,0 +1 @@
+38f81358029cbb0f92600c2fbf0ab4a5

RepoComponent/com/xiaojinzi/component/component-plugin/1.9.2/component-plugin-1.9.2.jar.sha1

@@ -0,0 +1 @@
+6970c0bd124b5347509893d0c494358cc527af86

RepoComponent/com/xiaojinzi/component/component-plugin/1.9.2/component-plugin-1.9.2.pom

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.xiaojinzi.component</groupId>
+  <artifactId>component-plugin</artifactId>
+  <version>1.9.2</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-all</artifactId>
+      <version>5.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle</artifactId>
+      <version>3.3.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.6</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>

RepoComponent/com/xiaojinzi/component/component-plugin/1.9.2/component-plugin-1.9.2.pom.md5

@@ -0,0 +1 @@
+6946402869b6d976b8eebc96657164ab

RepoComponent/com/xiaojinzi/component/component-plugin/1.9.2/component-plugin-1.9.2.pom.sha1

@@ -0,0 +1 @@
+71100399af58044f8612ce33ceeb838afabd7c1a

RepoComponent/com/xiaojinzi/component/component-plugin/maven-metadata.xml

@@ -3,7 +3,7 @@
   <groupId>com.xiaojinzi.component</groupId>
   <artifactId>component-plugin</artifactId>
   <versioning>
-    <release>1.9.1-beta2</release>
+    <release>1.9.2</release>
     <versions>
       <version>1.7.7.3</version>
       <version>1.7.8</version>
@@ -32,7 +32,8 @@
       <version>1.9.0-Stable2</version>
       <version>1.9.1-beta1</version>
       <version>1.9.1-beta2</version>
+      <version>1.9.2</version>
     </versions>
-    <lastUpdated>20210712092050</lastUpdated>
+    <lastUpdated>20210723124036</lastUpdated>
   </versioning>
 </metadata>

RepoComponent/com/xiaojinzi/component/component-plugin/maven-metadata.xml.md5

@@ -1 +1 @@
-77142bf19db8d6e931009563613bf516
+d6fa990297fccba9d93e55e6dd3c118a

RepoComponent/com/xiaojinzi/component/component-plugin/maven-metadata.xml.sha1

@@ -1 +1 @@
-133585cddd60a7c5f122286fee229541df10ea4c
+7c92ab39b53ee8a7a1721fb60e7cb2b35dfcedaa

changelog.md

@@ -1,5 +1,6 @@
-#### [v1.9.1-beta2](https://github.com/xiaojinzi123/Component/releases/tag/v1.9.2-beta2)
+#### [v1.9.2](https://github.com/xiaojinzi123/Component/releases/tag/v1.9.2)
 - 统一 Kotlin 相关的版本
+- 修复 v1.9.1-beta1 版本支持 scheme 改出来页面拦截器失效的问题
 
 #### [v1.9.1-beta1](https://github.com/xiaojinzi123/Component/releases/tag/v1.9.1-beta1)
 - 修复 @ServiceAnno 的 autoInit 属性不支持填写了 name 的类

dependencies.gradle

@@ -10,8 +10,8 @@ ext.versions = [
         constraintLayout                    : '2.0.4',
         rxjava                              : '2.2.21',
         rxandroid                           : "2.1.1",
-        component_version                   : "1.9.1-beta2",
-        component_plugin_upload_version     : "1.9.1-beta2"
+        component_version                   : "1.9.2",
+        component_plugin_upload_version     : "1.9.2"
 ]
 
 ext.libs = [