tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

android:navigator plugin push support singlePage flag and the default value is false

Browse Source
This commit is contained in:
pengfei.zhou 2020-09-01 17:41:14 +08:00 committed by osborn
parent 4e724ba922
commit e4351e3b00
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doric-android/doric/src/main/java/pub/doric/plugin/NavigatorPlugin.java
View File

@ -25,6 +25,7 @@ import com.github.pengfeizhou.jscore.JSValue;
import com.github.pengfeizhou.jscore.JavaValue; import com.github.pengfeizhou.jscore.JavaValue;
import pub.doric.Doric; import pub.doric.Doric;
import pub.doric.DoricActivity;
import pub.doric.DoricContext; import pub.doric.DoricContext;
import pub.doric.extension.bridge.DoricMethod; import pub.doric.extension.bridge.DoricMethod;
import pub.doric.extension.bridge.DoricPlugin; import pub.doric.extension.bridge.DoricPlugin;
@ -53,6 +54,7 @@ public class NavigatorPlugin extends DoricJavaPlugin {
String alias = source; String alias = source;
String extra = ""; String extra = "";
JSValue config = jsObject.getProperty("config"); JSValue config = jsObject.getProperty("config");
boolean singlePage = false;
if (config.isObject()) { if (config.isObject()) {
JSValue aliasJS = config.asObject().getProperty("alias"); JSValue aliasJS = config.asObject().getProperty("alias");
if (aliasJS.isString()) { if (aliasJS.isString()) {
@ -62,11 +64,23 @@ public class NavigatorPlugin extends DoricJavaPlugin {
if (extraJS.isString()) { if (extraJS.isString()) {
extra = extraJS.asString().value(); extra = extraJS.asString().value();
} }
JSValue singlePageJS = config.asObject().getProperty("singlePage");
if (singlePageJS.isBoolean()) {
singlePage = singlePageJS.asBoolean().value();
}
}
if (singlePage) {
navigator.push(jsObject.getProperty("source").asString().value(),
alias,
extra
);
} else {
Intent intent = new Intent(getDoricContext().getContext(), DoricActivity.class);
intent.putExtra("source", source);
intent.putExtra("alias", alias);
intent.putExtra("extra", extra);
getDoricContext().getContext().startActivity(intent);
} }
navigator.push(jsObject.getProperty("source").asString().value(),
alias,
extra
);
promise.resolve(); promise.resolve();
} catch (ArchiveException e) { } catch (ArchiveException e) {
e.printStackTrace(); e.printStackTrace();

1
doric-js/index.d.ts vendored
View File

@ -818,6 +818,7 @@ declare module 'doric/lib/src/native/navigator' {
alias?: string | undefined; alias?: string | undefined;
animated?: boolean | undefined; animated?: boolean | undefined;
extra?: object | undefined; extra?: object | undefined;
singlePage?: boolean | undefined;
} | undefined) => Promise<any>; } | undefined) => Promise<any>;
pop: (animated?: boolean) => Promise<any>; pop: (animated?: boolean) => Promise<any>;
openUrl: (url: string) => Promise<any>; openUrl: (url: string) => Promise<any>;

1
doric-js/lib/src/native/navigator.d.ts vendored
View File

@ -4,6 +4,7 @@ export declare function navigator(context: BridgeContext): {
alias?: string | undefined; alias?: string | undefined;
animated?: boolean | undefined; animated?: boolean | undefined;
extra?: object | undefined; extra?: object | undefined;
singlePage?: boolean | undefined;
} | undefined) => Promise<any>; } | undefined) => Promise<any>;
pop: (animated?: boolean) => Promise<any>; pop: (animated?: boolean) => Promise<any>;
openUrl: (url: string) => Promise<any>; openUrl: (url: string) => Promise<any>;

1
doric-js/src/native/navigator.ts
View File

@ -22,6 +22,7 @@ export function navigator(context: BridgeContext) {
alias?: string, alias?: string,
animated?: boolean, animated?: boolean,
extra?: object, extra?: object,
singlePage?: boolean,
}) => { }) => {
if (config && config.extra) { if (config && config.extra) {
(config as any).extra = JSON.stringify(config.extra) (config as any).extra = JSON.stringify(config.extra)