From 77af051a9c52ca8949b872999e8b2ad8ee6e7e2b Mon Sep 17 00:00:00 2001 From: "yangwu.jia" <yangwu.jia@taobao.com> Date: Mon, 28 Oct 2019 11:01:36 +0800 Subject: [PATCH] =?UTF-8?q?Brightness.light=20=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flutterboost/ContainerRecord.java | 36 +------------------ .../FlutterActivityAndFragmentDelegate.java | 33 ++++++++++------- .../containers/NewBoostFlutterActivity.java | 9 ++--- .../containers/NewFlutterFragment.java | 5 --- example/lib/simple_page_widgets.dart | 4 +++ 5 files changed, 28 insertions(+), 59 deletions(-) diff --git a/android/src/main/java/com/idlefish/flutterboost/ContainerRecord.java b/android/src/main/java/com/idlefish/flutterboost/ContainerRecord.java index 5606307..8b3e502 100755 --- a/android/src/main/java/com/idlefish/flutterboost/ContainerRecord.java +++ b/android/src/main/java/com/idlefish/flutterboost/ContainerRecord.java @@ -175,6 +175,7 @@ public class ContainerRecord implements IContainerRecord { @Override public void onContainerResult(int requestCode, int resultCode, Map<String, Object> result) { + mManager.setContainerResult(this, requestCode,resultCode, result); } @@ -192,41 +193,6 @@ public class ContainerRecord implements IContainerRecord { public void onLowMemory() { } -// -// @Override -// public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { -// mContainer.getBoostFlutterView().onRequestPermissionsResult(requestCode, permissions, grantResults); -// } -// -// @Override -// public void onNewIntent(Intent intent) { -// mContainer.getBoostFlutterView().onNewIntent(intent); -// } -// -// @Override -// public void onActivityResult(int requestCode, int resultCode, Intent data) { -// mContainer.getBoostFlutterView().onActivityResult(requestCode, resultCode, data); -// } -// -// @Override -// public void onContainerResult(int requestCode, int resultCode, Map<String, Object> result) { -// mManager.setContainerResult(this, requestCode,resultCode, result); -// } -// -// @Override -// public void onUserLeaveHint() { -// mContainer.getBoostFlutterView().onUserLeaveHint(); -// } -// -// @Override -// public void onTrimMemory(int level) { -// mContainer.getBoostFlutterView().onTrimMemory(level); -// } -// -// @Override -// public void onLowMemory() { -// mContainer.getBoostFlutterView().onLowMemory(); -// } private class MethodChannelProxy { diff --git a/android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java b/android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java index 379af8e..c35c71b 100644 --- a/android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java +++ b/android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java @@ -15,6 +15,7 @@ import android.view.ViewGroup; import java.io.Serializable; import java.util.Arrays; +import java.util.HashMap; import java.util.Map; @@ -111,6 +112,7 @@ public class FlutterActivityAndFragmentDelegate implements IFlutterViewContaine host.getLifecycle() ); + } host.configureFlutterEngine(flutterEngine); @@ -190,16 +192,8 @@ public class FlutterActivityAndFragmentDelegate implements IFlutterViewContaine void onPostResume() { Log.v(TAG, "onPostResume()"); ensureAlive(); - if (flutterEngine != null) { - if (platformPlugin != null) { - // TODO(mattcarroll): find a better way to handle the update of UI overlays than calling through - // to platformPlugin. We're implicitly entangling the Window, Activity, Fragment, - // and engine all with this one call. - platformPlugin.updateSystemUiOverlays(); - } - } else { - Log.w(TAG, "onPostResume() invoked before NewFlutterFragment was attached to an Activity."); - } + Utils.setStatusBarLightMode(host.getActivity(),true); + } @@ -372,10 +366,26 @@ public class FlutterActivityAndFragmentDelegate implements IFlutterViewContaine @Override public void finishContainer(Map<String, Object> result) { - this.host.finishContainer(result); + + if(result != null) { + setBoostResult(this.host.getActivity(),new HashMap<>(result)); + this.host.getActivity().finish(); + }else{ + this.host.getActivity().finish(); + } + } + + + public void setBoostResult(Activity activity, HashMap result) { + Intent intent = new Intent(); + if (result != null) { + intent.putExtra(IFlutterViewContainer.RESULT_KEY, result); + } + activity.setResult(Activity.RESULT_OK, intent); + } @Override public String getContainerUrl() { return this.host.getContainerUrl(); @@ -473,7 +483,6 @@ public class FlutterActivityAndFragmentDelegate implements IFlutterViewContaine - void finishContainer(Map<String, Object> result) ; String getContainerUrl() ; diff --git a/android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java b/android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java index 33e9967..4134eac 100644 --- a/android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java +++ b/android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java @@ -241,7 +241,8 @@ public class NewBoostFlutterActivity extends Activity window.setStatusBarColor(Color.TRANSPARENT); window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI); } - Utils.setStatusBarLightMode(this,true); + + } @@ -469,12 +470,6 @@ public class NewBoostFlutterActivity extends Activity - @Override - public void finishContainer(Map<String, Object> result) { - Activity activity= this.getActivity(); - - activity.finish(); - } @Override public String getContainerUrl() { diff --git a/android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java b/android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java index 635b765..f37a1c9 100644 --- a/android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java +++ b/android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java @@ -489,12 +489,7 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr } - @Override - public void finishContainer(Map<String, Object> result) { - Activity activity = this.getActivity(); - activity.finish(); - } @Override public String getContainerUrl() { diff --git a/example/lib/simple_page_widgets.dart b/example/lib/simple_page_widgets.dart index c905c34..a3893a7 100755 --- a/example/lib/simple_page_widgets.dart +++ b/example/lib/simple_page_widgets.dart @@ -108,6 +108,10 @@ class _FlutterRouteWidgetState extends State<FlutterRouteWidget> { final String message=widget.message; return Scaffold( appBar: AppBar( + brightness:Brightness.light, + backgroundColor: Colors.white, + textTheme:new TextTheme(title: TextStyle(color: Colors.black)) , + title: Text('flutter_boost_example'), ), body: SingleChildScrollView( -- 2.26.2