• 余玠's avatar
    Merge branch 'v1.5.4-hotfixes' · 68357859
    余玠 authored
    # Conflicts:
    #	android/src/main/java/com/taobao/idlefish/flutterboost/NavigationService/NavigationServiceRegister.java
    #	android/src/main/java/com/taobao/idlefish/flutterboost/containers/BoostFlutterActivity.java
    #	example/ios/.symlinks/plugins/flutter_boost
    #	example/ios/.symlinks/plugins/xservice_kit
    #	example/ios/Podfile.lock
    #	example/ios/Runner/DemoRouter.m
    #	ios/Classes/Boost/FLBPlatform.h
    #	ios/Classes/Container/FLBFlutterViewContainer.m
    #	ios/Classes/Messaging/BoostMessageChannel.h
    #	ios/Classes/Messaging/BoostMessageChannel.mm
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_closePage.h
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_closePage.mm
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_onFlutterPageResult.h
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_onFlutterPageResult.mm
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_onShownContainerChanged.h
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_onShownContainerChanged.mm
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_openPage.h
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_openPage.mm
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_pageOnStart.h
    #	ios/Classes/Messaging/Generated/NavigationService/handlers/NavigationService_pageOnStart.mm
    #	lib/AIOService/NavigationService/service/NavigationService.dart
    #	lib/AIOService/NavigationService/service/NavigationServiceRegister.dart
    #	lib/container/container_manager.dart
    68357859
AppDelegate.m 3.95 KB