Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[android] add "activity" param to INavigator interface #1410

Merged
merged 1 commit into from
Aug 9, 2018
Merged

[android] add "activity" param to INavigator interface #1410

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions android/sdk/src/main/java/com/taobao/weex/appfram/navigator/INavigator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.taobao.weex.appfram.navigator;
import android.app.Activity;

/**
* Created by zhengshihan on 2018/8/9.
*/

public interface INavigator {

boolean push(String param);
boolean push(Activity activity,String param);

boolean pop(String param);
boolean pop(Activity activity,String param);
}
23 changes: 13 additions & 10 deletions android/sdk/src/main/java/com/taobao/weex/appfram/navigator/WXNavigatorModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,11 @@ public void push(String param, JSCallback callback) {
}
}

if (WXSDKEngine.getNavigator()!= null) {
if (WXSDKEngine.getNavigator().push(param)) {
if (mWXSDKInstance.getContext() instanceof Activity){
Activity activity = (Activity)mWXSDKInstance.getContext();

if (WXSDKEngine.getNavigator()!= null
&& WXSDKEngine.getNavigator().push(activity,param)) {
if (callback != null) {
callback.invoke(MSG_SUCCESS);
}
Expand Down Expand Up @@ -166,17 +169,17 @@ public void pop(String param, JSCallback callback) {
}
}


if (WXSDKEngine.getNavigator()!= null) {
if (WXSDKEngine.getNavigator().pop(param)) {
if (callback != null) {
callback.invoke(MSG_SUCCESS);
if (mWXSDKInstance.getContext() instanceof Activity) {
Activity activity = (Activity) mWXSDKInstance.getContext();
if (WXSDKEngine.getNavigator() != null) {
if (WXSDKEngine.getNavigator().pop(activity, param)) {
if (callback != null) {
callback.invoke(MSG_SUCCESS);
}
return;
}
return;
}
}

if (mWXSDKInstance.getContext() instanceof Activity) {
if (callback != null) {
callback.invoke(MSG_SUCCESS);
}
Expand Down