Skip to content

支持startActivity(Intent intent, Bundle options)方法 #47

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

Merged
shifujun merged 1 commit into from
Jul 17, 2019
Merged

支持startActivity(Intent intent, Bundle options)方法 #47

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
4 changes: 2 additions & 2 deletions ...k/core/loader/src/main/kotlin/com/tencent/shadow/core/loader/managers/ComponentManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ abstract class ComponentManager : PluginComponentLauncher {

abstract fun getBroadcastInfoList(partKey: String): List<BroadcastInfo>?

override fun startActivity(shadowContext: ShadowContext, pluginIntent: Intent): Boolean {
override fun startActivity(shadowContext: ShadowContext, pluginIntent: Intent, option: Bundle?): Boolean {
return if (pluginIntent.isPluginComponent()) {
shadowContext.superStartActivity(pluginIntent.toActivityContainerIntent())
shadowContext.superStartActivity(pluginIntent.toActivityContainerIntent(), option)
true
} else {
false
Expand Down
15 changes: 10 additions & 5 deletions projects/sdk/core/runtime/src/main/java/com/tencent/shadow/core/runtime/ShadowContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public interface PluginComponentLauncher {
* @return <code>true</code>表示该Intent是为了启动插件内Activity的,已经被正确消费了.
* <code>false</code>表示该Intent不是插件内的Activity.
*/
boolean startActivity(ShadowContext shadowContext, Intent intent);
boolean startActivity(ShadowContext shadowContext, Intent intent, Bundle options);

/**
* 启动Activity
Expand All @@ -174,16 +174,21 @@ public interface PluginComponentLauncher {

@Override
public void startActivity(Intent intent) {
startActivity(intent, null);
}

@Override
public void startActivity(Intent intent, Bundle options) {
final Intent pluginIntent = new Intent(intent);
pluginIntent.setExtrasClassLoader(mPluginClassLoader);
final boolean success = mPluginComponentLauncher.startActivity(this, pluginIntent);
final boolean success = mPluginComponentLauncher.startActivity(this, pluginIntent, options);
if (!success) {
super.startActivity(intent);
super.startActivity(intent, options);
}
}

public void superStartActivity(Intent intent) {
super.startActivity(intent);
public void superStartActivity(Intent intent, Bundle options) {
super.startActivity(intent, options);
}

@Override
Expand Down