[ohos]默认显式使用surface模式

CHANGELOG.md

@@ -6,6 +6,7 @@
 5. [ohos]使用Navigation，解决半透明弹窗不透底的问题
 6. [ohos]修复使用Navigation后页面后退异常的问题
 7. [ohos]代码重构，便于后续优化
+8. [ohos]默认显式使用surface模式
 
 ## 4.5.4
 1. [ohos]支持传入启动参数和dart入口参数

example/ohos/entry/src/main/ets/entryability/EntryAbility.ets

@@ -21,20 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant';
+import AbilityConstant from '@ohos.app.ability.AbilityConstant';
 import UIAbility from '@ohos.app.ability.UIAbility';
-import window from '@ohos.window';
 import Want from '@ohos.app.ability.Want';
-import AbilityConstant from '@ohos.app.ability.AbilityConstant';
+import window from '@ohos.window';
 import hilog from '@ohos.hilog';
 import {
   FlutterBoost,
   FlutterBoostDelegate,
   FlutterBoostRouteOptions,
   FlutterBoostSetupOptionsBuilder
 } from '@ohos/flutter_boost';
-import FlutterManager from '@ohos/flutter_ohos/src/main/ets/embedding/ohos/FlutterManager';
-
+import { FlutterManager} from '@ohos/flutter_ohos';
+import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant';
 import { RouterModule, RouterOptions } from '../router/RouterModule';
 import { RouterNameConstants } from '../constants/RouterConstants';
 
@@ -66,8 +65,8 @@ export default class EntryAbility extends UIAbility implements FlutterBoostDeleg
     FlutterManager.getInstance().popUIAbility(this)
   }
 
+  // Main window is created, set main page for this ability
   onWindowStageCreate(windowStage: window.WindowStage): void {
-    // Main window is created, set main page for this ability
     hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageCreate');
     FlutterManager.getInstance().pushWindowStage(this, windowStage)
 
@@ -88,23 +87,22 @@ export default class EntryAbility extends UIAbility implements FlutterBoostDeleg
         }
         hilog.info(0x0000, TAG, 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
       });
-
     }, optionsBuilder.build())
   }
 
+  // Main window is destroyed, release UI related resources
   onWindowStageDestroy(): void {
-    // Main window is destroyed, release UI related resources
     hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageDestroy');
     FlutterManager.getInstance().popWindowStage(this)
   }
 
+  // Ability has brought to foreground
   onForeground(): void {
-    // Ability has brought to foreground
     hilog.info(0x0000, TAG, '%{public}s', 'Ability onForeground');
   }
 
+  // Ability has back to background
   onBackground(): void {
-    // Ability has back to background
     hilog.info(0x0000, TAG, '%{public}s', 'Ability onBackground');
   }
 }

example/ohos/entry/src/main/ets/pages/FlutterUIComponent.ets

@@ -8,6 +8,7 @@ const TAG: string = "FlutterUIComponent";
 export struct FlutterUIComponent {
   @Prop uri: string;
   @Prop params: Record<string, Object>;
+  @Prop xComponentType: XComponentType = XComponentType.SURFACE;
 
   private flutterEntry: FlutterBoostEntry | null = null;
   private flutterView?: FlutterView;
@@ -16,13 +17,15 @@ export struct FlutterUIComponent {
       .combine(TransitionEffect.move(TransitionEdge.END)).animation({curve: Curves.springMotion()});
 
   aboutToAppear() {
+    hilog.info(0x0000, TAG, 'Component(#%{public}s) aboutToAppear===', this.uri);
     this.flutterEntry = new FlutterBoostEntry(getContext(this), {
       uri: this.uri,
       params: this.params,
     });
     this.flutterEntry.aboutToAppear();
+    // The |aboutToAppear| method is called first,
+    // followed by the |getFlutterView| method.
     this.flutterView = this.flutterEntry.getFlutterView();
-    hilog.info(0x0000, TAG, 'Component(#%{public}s) aboutToAppear===', this.uri);
   }
 
   aboutToDisappear() {
@@ -42,7 +45,10 @@ export struct FlutterUIComponent {
 
   build() {
     Stack() {
-      FlutterPage({ viewId: this.flutterView?.getId() })
+      FlutterPage({
+        viewId: this.flutterView?.getId(),
+        xComponentType: this.xComponentType
+      })
     }
     .onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
       if (isVisible) {

example/ohos/entry/src/main/ets/pages/FlutterUIDialog.ets

@@ -32,12 +32,14 @@ const TAG: string = "FlutterUIDialog";
 export struct FlutterUIDialog {
   private flutterEntry: FlutterBoostEntry | null = null;
   private flutterView: FlutterView | null = null;
+  @Prop xComponentType: XComponentType = XComponentType.SURFACE;
 
   aboutToAppear() {
     hilog.info(0x0000, TAG, "aboutToAppear===");
     this.flutterEntry = new FlutterBoostEntry(getContext(this));
     this.flutterEntry.aboutToAppear();
-
+    // The |aboutToAppear| method is called first,
+    // followed by the |getFlutterView| method.
     this.flutterView = this.flutterEntry.getFlutterView();
   }
 
@@ -48,7 +50,10 @@ export struct FlutterUIDialog {
 
   build() {
     NavDestination() {
-      FlutterPage({ viewId: this.flutterView!.getId() })
+      FlutterPage({
+        viewId: this.flutterView!.getId(),
+        xComponentType: this.xComponentType
+      })
     }
     .mode(NavDestinationMode.DIALOG)
     .hideTitleBar(true)

example/ohos/entry/src/main/ets/pages/FlutterUIPage.ets

@@ -32,11 +32,14 @@ const TAG: string = "FlutterUIPage";
 export struct FlutterUIPage {
   private flutterEntry: FlutterBoostEntry | null = null;
   private flutterView: FlutterView | null = null;
+  @Prop xComponentType: XComponentType = XComponentType.SURFACE;
 
   aboutToAppear() {
     hilog.info(0x0000, TAG, "aboutToAppear===");
     this.flutterEntry = new FlutterBoostEntry(getContext(this));
     this.flutterEntry.aboutToAppear();
+    // The |aboutToAppear| method is called first,
+    // followed by the |getFlutterView| method.
     this.flutterView = this.flutterEntry.getFlutterView();
   }
 
@@ -47,7 +50,10 @@ export struct FlutterUIPage {
 
   build() {
     NavDestination() {
-      FlutterPage({ viewId: this.flutterView!.getId() })
+      FlutterPage({
+        viewId: this.flutterView!.getId(),
+        xComponentType: this.xComponentType
+      })
     }
     .hideTitleBar(true)
     .onBackPressed(() => {

ohos/flutter_boost/src/main/ets/components/plugin/FlutterBoostPlugin.ets

@@ -109,6 +109,7 @@ export class FlutterBoostPlugin implements FlutterPlugin, MethodCallHandler, Nat
   }
 
   onPushFlutterRoute(params: CommonParams) {
+    Log.i(TAG, "#onPushFlutterRoute: " + params.pageName);
     if (this.delegate) {
       const builder = new FlutterBoostRouteOptionsBuilder()
       if (params.pageName) {
@@ -228,15 +229,16 @@ export class FlutterBoostPlugin implements FlutterPlugin, MethodCallHandler, Nat
    * 向Flutter侧发送pushRoute事件
    * */
   public pushRoute(uniqueId: string, pageName: string, args: Record<string, Object>, callback: () => void) {
-    Log.i(TAG, "#pushRoute start: " + uniqueId + ", " + pageName);
+    Log.i(TAG, "#pushRoute start: " + pageName);
+    const timestamp = (new Date()).getTime();
     if (this.channel) {
       this.checkEngineState();
       let params = new CommonParams()
       params.uniqueId = uniqueId
       params.pageName = pageName
       params.arguments = args
       this.channel.pushRoute(params, () => {
-        Log.i(TAG, "#pushRoute end: " + uniqueId + ", " + pageName);
+        Log.i(TAG, "#pushRoute end: " + pageName + ", cost: " + ((new Date()).getTime()-timestamp) + "ms.");
         if (callback) {
           callback();
         }