Merge branch 'alibaba:master' into master

Author: xujinping

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v3.0-preview.7
+1. [Android] 解决前一个页面destroy时导致当前页面的PlatformViewsChannel断开的问题 (#1250)
+2. Hfix #1229 修复example中从Flutter页面推后台再回前天，栈顶页面是Native的页面的问题
+3. 修复单引擎多VC下问题：1.updateViewportMetrics在键盘唤起时被多个VC调用 2.Tab初始化场景下导致的Crash
+4. 修复 FlutterBoostFragment跳转新的FlutterBoostFragment，返回上一个FlutterFragment后不响应点击事件
+
+
 ## v3.0-preview.6
 1.[iOS] 修复iOS打开Flutter页面再关闭不走dispose逻辑问题
 2.[Android] 解决setSystemUIOverlayStyle不生效的问题

README.md

@@ -6,7 +6,7 @@
 </p>
 
 # Release Note
-v3.0-preview.5
+v3.0-preview.7
 
 PS: Before updating the beta version, please read the CHANGELOG to see if there are any BREAKING CHANGE
 
@@ -37,7 +37,7 @@ Open you pubspec.yaml and add the following line to dependencies:
 flutter_boost:
     git:
         url: 'https://github.com/alibaba/flutter_boost.git'
-        ref: 'v3.0-preview.6'
+        ref: 'v3.0-preview.7'
 ```
 
 

README_CN.md

@@ -5,7 +5,7 @@
 
 # Release Note
 
-v3.0-preview.5
+v3.0-preview.7
 
 PS：preview版本相比beta版本，有较大的改动，建议仔细阅读新的接入文档与使用文档。
 
@@ -34,7 +34,7 @@ PS：preview版本相比beta版本，有较大的改动，建议仔细阅读新
 flutter_boost:
     git:
         url: 'https://github.com/alibaba/flutter_boost.git'
-        ref: 'v3.0-preview.6'
+        ref: 'v3.0-preview.7'
 ```
 
 # 使用文档

android/src/main/java/com/idlefish/flutterboost/containers/FlutterBoostActivity.java

@@ -94,6 +94,7 @@ protected void onPause() {
         assert (flutterView != null);
         ActivityAndFragmentPatch.onPauseDetachFromFlutterEngine(flutterView, getFlutterEngine());
         getFlutterEngine().getActivityControlSurface().detachFromActivity();
+        platformPlugin.destroy();
         platformPlugin = null;
         getFlutterEngine().getLifecycleChannel().appIsResumed();
     }

android/src/main/java/com/idlefish/flutterboost/containers/FlutterBoostFragment.java

@@ -194,6 +194,7 @@ private void didFragmentShow() {
     private void didFragmentHide() {
         FlutterBoost.instance().getPlugin().onContainerDisappeared(this);
         ActivityAndFragmentPatch.onPauseDetachFromFlutterEngine(flutterView, getFlutterEngine());
+        platformPlugin.destroy();
         platformPlugin = null;
     }
 

docs/install.md

@@ -19,7 +19,7 @@
 flutter_boost:
     git:
         url: 'https://github.com/alibaba/flutter_boost.git'
-        ref: 'v3.0-preview.6'
+        ref: 'v3.0-preview.7'
 ```l
 之后在flutter工程下运行`flutter pub get`
 dart端就集成完毕了，然后可以在dart端放上一些代码,以下代码基于example3.0

ios/Classes/container/FBFlutterViewContainer.h

@@ -31,6 +31,7 @@
 @property (nonatomic, strong) NSNumber *disablePopGesture;
 - (instancetype)init;
 - (void)surfaceUpdated:(BOOL)appeared;
+- (void)updateViewportMetrics;
 @end
 
 

ios/Classes/container/FBFlutterViewContainer.m

@@ -40,6 +40,7 @@ - (void)flushOngoingTouches;
 - (void)bridge_viewDidDisappear:(BOOL)animated;
 - (void)bridge_viewWillAppear:(BOOL)animated;
 - (void)surfaceUpdated:(BOOL)appeared;
+- (void)updateViewportMetrics;
 @end
 
 #pragma clang diagnostic push
@@ -184,6 +185,9 @@ - (void)notifyWillDealloc
 }
 
 - (void)viewDidLoad {
+    // Ensure current view controller attach to Flutter engine
+    [self attatchFlutterEngine];
+    
     [super viewDidLoad];
     //只有在不透明情况下，才设置背景颜色，否则不设置颜色（也就是默认透明）
     if(self.opaque){
@@ -224,6 +228,12 @@ - (void)surfaceUpdated:(BOOL)appeared {
     }
 }
 
+- (void)updateViewportMetrics {
+    if (self.engine && self.engine.viewController == self) {
+        [super updateViewportMetrics];
+    }
+}
+
 #pragma mark - Life circle methods
 
 - (void)viewDidLayoutSubviews