Skip to content

feat: Add requestCode support for method invocation. #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChrisZou wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Add requestCode support for method invocation. #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion activityrouter/src/main/java/com/github/mzule/activityrouter/router/MethodInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
*/

public interface MethodInvoker {
void invoke(Context context, Bundle bundle);
void invoke(Context context, Bundle bundle, int requestCode);
}
12 changes: 6 additions & 6 deletions activityrouter/src/main/java/com/github/mzule/activityrouter/router/Routers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.github.mzule.activityrouter.router;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

/**
* Created by CaoDongping on 4/6/16.
*/
Expand Down Expand Up @@ -125,7 +125,7 @@ private static boolean doOpen(Context context, Uri uri, int requestCode) {
for (Mapping mapping : mappings) {
if (mapping.match(path)) {
if (mapping.getActivity() == null) {
mapping.getMethod().invoke(context, mapping.parseExtras(uri));
mapping.getMethod().invoke(context, mapping.parseExtras(uri), requestCode);
return true;
}
Intent intent = new Intent(context, mapping.getActivity());
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/github/mzule/activityrouter/NonUIActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
package com.github.mzule.activityrouter;

import com.github.mzule.activityrouter.annotation.Router;

import android.content.Context;
import android.os.Bundle;
import android.widget.Toast;

import com.github.mzule.activityrouter.annotation.Router;

/**
* Created by CaoDongping on 04/11/2016.
*/

public class NonUIActions {

@Router("logout")
public static void logout(Context context, Bundle bundle) {
public static void logout(Context context, Bundle bundle, int requestCode) {
Toast.makeText(context, "logout", Toast.LENGTH_SHORT).show();
}

@Router("upload")
public static void uploadLog(Context context, Bundle bundle) {
public static void uploadLog(Context context, Bundle bundle, int requestCode) {
Toast.makeText(context, "upload", Toast.LENGTH_SHORT).show();
}
}
22 changes: 12 additions & 10 deletions compiler/src/main/java/com/github/mzule/activityrouter/compiler/RouterProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
package com.github.mzule.activityrouter.compiler;

import com.github.mzule.activityrouter.annotation.Module;
import com.github.mzule.activityrouter.annotation.Modules;
import com.github.mzule.activityrouter.annotation.Router;
import com.google.auto.service.AutoService;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec;

import java.util.HashSet;
import java.util.Set;

import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.Filer;
import javax.annotation.processing.Messager;
Expand All @@ -15,14 +25,6 @@
import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
import javax.tools.Diagnostic;
import com.github.mzule.activityrouter.annotation.Module;
import com.github.mzule.activityrouter.annotation.Modules;
import com.github.mzule.activityrouter.annotation.Router;
import com.google.auto.service.AutoService;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec;

@AutoService(Processor.class)
public class RouterProcessor extends AbstractProcessor {
Expand Down Expand Up @@ -185,8 +187,8 @@ private boolean handleRouter(String genClassName, RoundEnvironment roundEnv) {
} else {
mapMethod.addStatement("com.github.mzule.activityrouter.router.Routers.map($S, null, " +
"new MethodInvoker() {\n" +
" public void invoke(android.content.Context context, android.os.Bundle bundle) {\n" +
" $T.$N(context, bundle);\n" +
" public void invoke(android.content.Context context, android.os.Bundle bundle, int requestCode) {\n" +
" $T.$N(context, bundle, requestCode);\n" +
" }\n" +
"}, " +
"extraTypes)", format, className, methodName);
Expand Down