chore:整理工程结构

Author: wangshuwen15222

app/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "cn.cheney.test"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"

app/src/main/AndroidManifest.xml

@@ -13,7 +13,9 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
 
-        <activity android:name="cn.cheney.app.MainActivity">
+        <activity
+            android:name="cn.cheney.app.activity.MainActivity"
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -22,7 +24,8 @@
 
         </activity>
 
-        <activity android:name="cn.cheney.app.ActivityA">
+        <activity android:name="cn.cheney.app.activity.ActivityA">
+
         </activity>
 
     </application>

app/src/main/java/cn/cheney/app/AlertUtil.java

@@ -6,7 +6,7 @@
 
 public class AlertUtil {
 
-    public static void showAlert(Context context,String msg) {
+    public static void showAlert(Context context, String msg) {
         new AlertDialog.Builder(context)
                 .setTitle("Result")
                 .setMessage(msg)

app/src/main/java/cn/cheney/app/App.java

@@ -15,7 +15,9 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+
         XRouter.init(this, "cheney");
+
         //url 拦截
         XRouter.getInstance().addInterceptor(new RouterInterceptor() {
             @Override

app/src/main/java/cn/cheney/app/ActivityA.java renamed to app/src/main/java/cn/cheney/app/activity/ActivityA.java

@@ -1,4 +1,4 @@
-package cn.cheney.app;
+package cn.cheney.app.activity;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -9,12 +9,14 @@
 import java.util.List;
 import java.util.Map;
 
+import cn.cheney.app.entity.Book;
+import cn.cheney.app.R;
 import cn.cheney.xrouter.annotation.XMethod;
 import cn.cheney.xrouter.annotation.XParam;
 import cn.cheney.xrouter.annotation.XRoute;
 import cn.cheney.xrouter.core.XRouter;
 
-@XRoute(path = "page", module = "moduleB")
+@XRoute( module = "moduleA",path = "page/a")
 public class ActivityA extends AppCompatActivity {
 
     public static final String TAG = ActivityA.class.getSimpleName();
@@ -49,5 +51,9 @@ public static void activityMethod() {
 
     }
 
-
+    @Override
+    public void finish() {
+        super.finish();
+        overridePendingTransition(R.anim.enter_bottom, 0);
+    }
 }

app/src/main/java/cn/cheney/app/MainActivity.java renamed to app/src/main/java/cn/cheney/app/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package cn.cheney.app;
+package cn.cheney.app.activity;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -13,6 +13,9 @@
 import java.util.List;
 import java.util.Map;
 
+import cn.cheney.app.AlertUtil;
+import cn.cheney.app.entity.Book;
+import cn.cheney.app.R;
 import cn.cheney.xrouter.core.XRouter;
 import cn.cheney.xrouter.core.call.MethodCall;
 import cn.cheney.xrouter.core.callback.RouteCallback;
@@ -25,53 +28,47 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        findViewById(R.id.btn1).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                List<String> infoList = new ArrayList<>();
-                infoList.add("value");
-                Map<String, String> map = new HashMap<>();
-                map.put("key", "value");
-                Integer requestCode = XRouter.page("moduleB/page")
-                        .put("infoList", infoList)
-                        .put("infoMap", map)
-                        .action("cn.cheney.xrouter")
-                        .anim(R.anim.enter_bottom, R.anim.exit_bottom)
-                        .requestCode(1000)
-                        .call();
 
-                Logger.d("Route Page requestCode= " + requestCode);
-            }
-        });
+        //路由跳转界面
+        findViewById(R.id.btn1).setOnClickListener(v -> {
+            List<String> infoList = new ArrayList<>();
+            infoList.add("value");
+            Map<String, String> map = new HashMap<>();
+            map.put("key", "value");
+            Integer requestCode = XRouter.page("moduleA/page/a")
+                    .put("infoList", infoList)
+                    .put("infoMap", map)
+                    .action("cn.cheney.xrouter")
+                    .anim(R.anim.enter_bottom,0)
+                    .requestCode(1000)
+                    .call();
 
-        findViewById(R.id.btn2).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Book book = new Book();
-                book.name = "Kotlin";
-                MethodCall<Book> bookMethodCall = XRouter.<Book>method(
-                        "moduleA/getBookName");
-                Book bookReturn = bookMethodCall.call();
-                AlertUtil.showAlert(MainActivity.this, bookReturn.toString());
-            }
+            Logger.d("Route Page requestCode= " + requestCode);
         });
 
+        //路由执行同步方法
+        findViewById(R.id.btn2).setOnClickListener(v -> {
+            Book book = new Book();
+            book.name = "Kotlin";
+            MethodCall<Book> bookMethodCall = XRouter.<Book>method(
+                    "moduleA/getBookName");
+            Book bookReturn = bookMethodCall.call();
+            AlertUtil.showAlert(MainActivity.this, bookReturn.toString());
+        });
 
+        //路由执行异步方法
         findViewById(R.id.btn3).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Book book = new Book();
                 book.name = "Kotlin";
-                final MethodCall<Book> methodCall = XRouter.<Book>method("moduleA/getAsyncBookName")
-                        .put("book", book);
-                methodCall.call(new RouteCallback() {
-                    @Override
-                    public void onResult(Map<String, Object> result) {
-                        AlertUtil.showAlert(MainActivity.this, result.toString());
-                    }
-                });
+                XRouter.<Book>method("moduleA/getAsyncBookName")
+                        .put("book", book).call(result ->
+                        AlertUtil.showAlert(MainActivity.this, result.toString()));
             }
         });
+
+        //Uri里面传入Map类型
         findViewById(R.id.btn4).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -80,6 +77,7 @@ public void onClick(View v) {
             }
         });
 
+
         findViewById(R.id.btn5).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/java/cn/cheney/app/Book.java renamed to app/src/main/java/cn/cheney/app/entity/Book.java

@@ -1,11 +1,11 @@
-package cn.cheney.app;
+package cn.cheney.app.entity;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
 public class Book implements Parcelable {
 
-    String name;
+    public String name;
 
     public String getName() {
         return name;

app/src/main/java/cn/cheney/app/ModuleA.java renamed to app/src/main/java/cn/cheney/app/module/ModuleA.java

@@ -1,4 +1,4 @@
-package cn.cheney.app;
+package cn.cheney.app.module;
 
 import android.content.Context;
 import android.util.Log;
@@ -8,6 +8,8 @@
 import java.util.List;
 import java.util.Map;
 
+import cn.cheney.app.AlertUtil;
+import cn.cheney.app.entity.Book;
 import cn.cheney.xrouter.annotation.XMethod;
 import cn.cheney.xrouter.annotation.XParam;
 import cn.cheney.xrouter.annotation.XRoute;

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".activity.MainActivity">
 
     <Button
         android:id="@+id/btn1"
@@ -17,13 +17,13 @@
         android:id="@+id/btn2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="同步调用" />
+        android:text="同步方法调用" />
 
     <Button
         android:id="@+id/btn3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="异步调用" />
+        android:text="异步方法调用" />
 
     <Button
         android:id="@+id/btn4"

app/src/main/res/layout/activity_main.xml

@@ -4,6 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".activity.MainActivity">
 
 </RelativeLayout>

app/src/main/res/layout/activity_test1.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".activity.MainActivity">
 
     <TextView
         android:layout_width="wrap_content"

app/src/main/res/layout/activity_test2.xml

@@ -1,11 +1,16 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+
+    <style name="XRouterPageTheme" parent="Theme.AppCompat.Light.NoActionBar">
+
+    </style>
+
 </resources>