From 903b9f7ab5c77289c15f346ed67d345eb6fa0d2f Mon Sep 17 00:00:00 2001
From: "yangwu.jia" <yangwu.jia@taobao.com>
Date: Wed, 13 Nov 2019 10:57:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idlefish/flutterboost/BoostRegistrar.java |  5 ++--
 .../flutterboost/ContainerRecord.java         |  6 ++---
 .../com/idlefish/flutterboost/Debuger.java    |  2 +-
 ...NewFlutterBoost.java => FlutterBoost.java} | 10 ++++----
 .../flutterboost/FlutterBoostPlugin.java      |  5 ++--
 .../FlutterViewContainerManager.java          | 14 +++++------
 .../com/idlefish/flutterboost/Platform.java   |  4 +---
 ...ctivity.java => BoostFlutterActivity.java} | 16 ++++++-------
 .../FlutterActivityAndFragmentDelegate.java   | 17 +++++++------
 ...tterFragment.java => FlutterFragment.java} | 24 +++++++++----------
 .../containers/FlutterSplashView.java         |  6 ++---
 .../android/app/src/main/AndroidManifest.xml  |  2 +-
 .../FlutterFragmentPageActivity.java          | 12 +++++-----
 .../flutterboostexample/MyApplication.java    | 12 +++++-----
 .../flutterboostexample/PageRouter.java       |  7 +++---
 15 files changed, 64 insertions(+), 78 deletions(-)
 rename android/src/main/java/com/idlefish/flutterboost/{NewFlutterBoost.java => FlutterBoost.java} (97%)
 rename android/src/main/java/com/idlefish/flutterboost/containers/{NewBoostFlutterActivity.java => BoostFlutterActivity.java} (97%)
 rename android/src/main/java/com/idlefish/flutterboost/containers/{NewFlutterFragment.java => FlutterFragment.java} (95%)

diff --git a/android/src/main/java/com/idlefish/flutterboost/BoostRegistrar.java b/android/src/main/java/com/idlefish/flutterboost/BoostRegistrar.java
index 2a612e9..45c7a21 100644
--- a/android/src/main/java/com/idlefish/flutterboost/BoostRegistrar.java
+++ b/android/src/main/java/com/idlefish/flutterboost/BoostRegistrar.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.BinaryMessenger;
@@ -46,8 +45,8 @@ class BoostRegistrar implements Registrar, FlutterPlugin, ActivityAware {
         if(this.activityPluginBinding != null){
            return this.activityPluginBinding.getActivity();
         }
-        if(NewFlutterBoost.instance().currentActivity()!=null){
-            return  NewFlutterBoost.instance().currentActivity();
+        if(FlutterBoost.instance().currentActivity()!=null){
+            return  FlutterBoost.instance().currentActivity();
         }
         return null;
     }
diff --git a/android/src/main/java/com/idlefish/flutterboost/ContainerRecord.java b/android/src/main/java/com/idlefish/flutterboost/ContainerRecord.java
index 1226ca6..a02bbc3 100755
--- a/android/src/main/java/com/idlefish/flutterboost/ContainerRecord.java
+++ b/android/src/main/java/com/idlefish/flutterboost/ContainerRecord.java
@@ -154,7 +154,7 @@ public class ContainerRecord implements IContainerRecord {
         map.put("name", mContainer.getContainerUrl());
         map.put("uniqueId", mUniqueId);
 
-        NewFlutterBoost.instance().channel().sendEvent("lifecycle", map);
+        FlutterBoost.instance().channel().sendEvent("lifecycle", map);
 
 //        mContainer.getBoostFlutterView().onBackPressed();
     }
@@ -253,7 +253,7 @@ public class ContainerRecord implements IContainerRecord {
             args.put("pageName", url);
             args.put("params", params);
             args.put("uniqueId", uniqueId);
-            NewFlutterBoost.instance().channel().invokeMethod(method, args);
+            FlutterBoost.instance().channel().invokeMethod(method, args);
         }
 
         public void invokeChannelUnsafe(String method, String url, Map params, String uniqueId) {
@@ -261,7 +261,7 @@ public class ContainerRecord implements IContainerRecord {
             args.put("pageName", url);
             args.put("params", params);
             args.put("uniqueId", uniqueId);
-            NewFlutterBoost.instance().channel().invokeMethodUnsafe(method, args);
+            FlutterBoost.instance().channel().invokeMethodUnsafe(method, args);
         }
     }
 
diff --git a/android/src/main/java/com/idlefish/flutterboost/Debuger.java b/android/src/main/java/com/idlefish/flutterboost/Debuger.java
index 522517e..70bb84e 100755
--- a/android/src/main/java/com/idlefish/flutterboost/Debuger.java
+++ b/android/src/main/java/com/idlefish/flutterboost/Debuger.java
@@ -60,7 +60,7 @@ public class Debuger {
 
     public static boolean isDebug(){
         try {
-            return NewFlutterBoost.instance().platform().isDebug();
+            return FlutterBoost.instance().platform().isDebug();
         }catch (Throwable t){
             return false;
         }
diff --git a/android/src/main/java/com/idlefish/flutterboost/NewFlutterBoost.java b/android/src/main/java/com/idlefish/flutterboost/FlutterBoost.java
similarity index 97%
rename from android/src/main/java/com/idlefish/flutterboost/NewFlutterBoost.java
rename to android/src/main/java/com/idlefish/flutterboost/FlutterBoost.java
index 6ea0b31..8023b54 100644
--- a/android/src/main/java/com/idlefish/flutterboost/NewFlutterBoost.java
+++ b/android/src/main/java/com/idlefish/flutterboost/FlutterBoost.java
@@ -12,8 +12,6 @@ import io.flutter.embedding.android.FlutterView;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.dart.DartExecutor;
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
-import io.flutter.embedding.engine.plugins.shim.ShimPluginRegistry;
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.view.FlutterMain;
 
@@ -21,7 +19,7 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-public class NewFlutterBoost {
+public class FlutterBoost {
 
     private Platform mPlatform;
 
@@ -29,7 +27,7 @@ public class NewFlutterBoost {
     private FlutterEngine mEngine;
     private Activity mCurrentActiveActivity;
     private PluginRegistry mRegistry;
-    static NewFlutterBoost sInstance = null;
+    static FlutterBoost sInstance = null;
 
     private  long FlutterPostFrameCallTime=0;
 
@@ -40,9 +38,9 @@ public class NewFlutterBoost {
     public void setFlutterPostFrameCallTime(long FlutterPostFrameCallTime){
          this.FlutterPostFrameCallTime=FlutterPostFrameCallTime;
     }
-    public static NewFlutterBoost instance() {
+    public static FlutterBoost instance() {
         if (sInstance == null) {
-            sInstance = new NewFlutterBoost();
+            sInstance = new FlutterBoost();
         }
         return sInstance;
     }
diff --git a/android/src/main/java/com/idlefish/flutterboost/FlutterBoostPlugin.java b/android/src/main/java/com/idlefish/flutterboost/FlutterBoostPlugin.java
index b3e2cc2..5671fc6 100644
--- a/android/src/main/java/com/idlefish/flutterboost/FlutterBoostPlugin.java
+++ b/android/src/main/java/com/idlefish/flutterboost/FlutterBoostPlugin.java
@@ -1,6 +1,5 @@
 package com.idlefish.flutterboost;
 
-import android.os.Handler;
 import android.support.annotation.Nullable;
 
 import com.idlefish.flutterboost.interfaces.IContainerRecord;
@@ -196,7 +195,7 @@ public class FlutterBoostPlugin {
         @Override
         public void onMethodCall(MethodCall methodCall, final MethodChannel.Result result) {
 
-            FlutterViewContainerManager mManager = (FlutterViewContainerManager) NewFlutterBoost.instance().containerManager();
+            FlutterViewContainerManager mManager = (FlutterViewContainerManager) FlutterBoost.instance().containerManager();
             switch (methodCall.method) {
                 case "pageOnStart": {
                     Map<String, Object> pageInfo = new HashMap<>();
@@ -215,7 +214,7 @@ public class FlutterBoostPlugin {
                         }
 
                         result.success(pageInfo);
-                        NewFlutterBoost.instance().setFlutterPostFrameCallTime(new Date().getTime());
+                        FlutterBoost.instance().setFlutterPostFrameCallTime(new Date().getTime());
 
 
                     } catch (Throwable t) {
diff --git a/android/src/main/java/com/idlefish/flutterboost/FlutterViewContainerManager.java b/android/src/main/java/com/idlefish/flutterboost/FlutterViewContainerManager.java
index c3967ce..0e583cd 100755
--- a/android/src/main/java/com/idlefish/flutterboost/FlutterViewContainerManager.java
+++ b/android/src/main/java/com/idlefish/flutterboost/FlutterViewContainerManager.java
@@ -25,7 +25,6 @@ package com.idlefish.flutterboost;
 
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.SparseArray;
 
 import com.idlefish.flutterboost.interfaces.IContainerManager;
 import com.idlefish.flutterboost.interfaces.IContainerRecord;
@@ -41,7 +40,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class FlutterViewContainerManager implements IContainerManager {
 
@@ -85,8 +83,8 @@ public class FlutterViewContainerManager implements IContainerManager {
         mRecordStack.remove(record);
         mRecordMap.remove(record.getContainer());
         if(mRecordStack.empty()){
-            if( NewFlutterBoost.instance().platform().whenEngineDestroy()== NewFlutterBoost.ConfigBuilder.All_FLUTTER_ACTIVITY_DESTROY){
-                NewFlutterBoost.instance().boostDestroy();
+            if( FlutterBoost.instance().platform().whenEngineDestroy()== FlutterBoost.ConfigBuilder.All_FLUTTER_ACTIVITY_DESTROY){
+                FlutterBoost.instance().boostDestroy();
             }
         }
 
@@ -118,9 +116,9 @@ public class FlutterViewContainerManager implements IContainerManager {
     }
 
     void openContainer(String url, Map<String, Object> urlParams, Map<String, Object> exts,OnResult onResult) {
-        Context context = NewFlutterBoost.instance().currentActivity();
+        Context context = FlutterBoost.instance().currentActivity();
         if(context == null) {
-            context =NewFlutterBoost.instance().platform().getApplication();
+            context = FlutterBoost.instance().platform().getApplication();
         }
 
         if(urlParams == null) {
@@ -141,7 +139,7 @@ public class FlutterViewContainerManager implements IContainerManager {
             mOnResults.put(currentTopRecord.uniqueId(),onResult);
         }
 
-        NewFlutterBoost.instance().platform().openContainer(context,url,urlParams,requestCode,exts);
+        FlutterBoost.instance().platform().openContainer(context,url,urlParams,requestCode,exts);
     }
 
     IContainerRecord closeContainer(String uniqueId, Map<String, Object> result,Map<String,Object> exts) {
@@ -157,7 +155,7 @@ public class FlutterViewContainerManager implements IContainerManager {
             Debuger.exception("closeContainer can not find uniqueId:" + uniqueId);
         }
 
-        NewFlutterBoost.instance().platform().closeContainer(targetRecord,result,exts);
+        FlutterBoost.instance().platform().closeContainer(targetRecord,result,exts);
         return targetRecord;
     }
 
diff --git a/android/src/main/java/com/idlefish/flutterboost/Platform.java b/android/src/main/java/com/idlefish/flutterboost/Platform.java
index b00bab9..5af39b2 100644
--- a/android/src/main/java/com/idlefish/flutterboost/Platform.java
+++ b/android/src/main/java/com/idlefish/flutterboost/Platform.java
@@ -4,11 +4,9 @@ import android.app.Application;
 import android.content.Context;
 import com.idlefish.flutterboost.interfaces.IContainerRecord;
 
-import java.lang.reflect.Method;
 import java.util.Map;
 
 import io.flutter.embedding.android.FlutterView;
-import io.flutter.plugin.common.PluginRegistry;
 
 public abstract class Platform {
 
@@ -25,7 +23,7 @@ public abstract class Platform {
 
     public abstract String initialRoute();
 
-    public NewFlutterBoost.BoostLifecycleListener lifecycleListener;
+    public FlutterBoost.BoostLifecycleListener lifecycleListener;
 
     public void closeContainer(IContainerRecord record, Map<String, Object> result, Map<String, Object> exts) {
         if (record == null) return;
diff --git a/android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java b/android/src/main/java/com/idlefish/flutterboost/containers/BoostFlutterActivity.java
similarity index 97%
rename from android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java
rename to android/src/main/java/com/idlefish/flutterboost/containers/BoostFlutterActivity.java
index 290aedd..2992bf3 100644
--- a/android/src/main/java/com/idlefish/flutterboost/containers/NewBoostFlutterActivity.java
+++ b/android/src/main/java/com/idlefish/flutterboost/containers/BoostFlutterActivity.java
@@ -19,8 +19,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.*;
 import android.widget.*;
-import com.idlefish.flutterboost.NewFlutterBoost;
-import com.idlefish.flutterboost.Utils;
+import com.idlefish.flutterboost.FlutterBoost;
 import com.idlefish.flutterboost.XFlutterView;
 import io.flutter.Log;
 import io.flutter.embedding.android.DrawableSplashScreen;
@@ -29,13 +28,12 @@ import io.flutter.embedding.android.SplashScreen;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.plugin.platform.PlatformPlugin;
-import io.flutter.view.FlutterMain;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-public class NewBoostFlutterActivity extends Activity
+public class BoostFlutterActivity extends Activity
         implements FlutterActivityAndFragmentDelegate.Host,
         LifecycleOwner {
 
@@ -64,19 +62,19 @@ public class NewBoostFlutterActivity extends Activity
 
 
     public static NewEngineIntentBuilder withNewEngine() {
-        return new NewEngineIntentBuilder(NewBoostFlutterActivity.class);
+        return new NewEngineIntentBuilder(BoostFlutterActivity.class);
     }
 
 
     public static class NewEngineIntentBuilder {
-        private final Class<? extends NewBoostFlutterActivity> activityClass;
+        private final Class<? extends BoostFlutterActivity> activityClass;
         private String backgroundMode = DEFAULT_BACKGROUND_MODE;
         private String url = "";
         private Map params = new HashMap();
 
 
 
-        protected NewEngineIntentBuilder(@NonNull Class<? extends NewBoostFlutterActivity> activityClass) {
+        protected NewEngineIntentBuilder(@NonNull Class<? extends BoostFlutterActivity> activityClass) {
             this.activityClass = activityClass;
         }
 
@@ -133,7 +131,7 @@ public class NewBoostFlutterActivity extends Activity
     @NonNull
     private LifecycleRegistry lifecycle;
 
-    public NewBoostFlutterActivity() {
+    public BoostFlutterActivity() {
         lifecycle = new LifecycleRegistry(this);
     }
 
@@ -432,7 +430,7 @@ public class NewBoostFlutterActivity extends Activity
     @Override
     public FlutterEngine provideFlutterEngine(@NonNull Context context) {
         // No-op. Hook for subclasses.
-        return NewFlutterBoost.instance().engineProvider();
+        return FlutterBoost.instance().engineProvider();
     }
 
     /**
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 29510e7..a7648fc 100644
--- a/android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java
+++ b/android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java
@@ -21,7 +21,7 @@ import java.util.Map;
 
 
 import com.idlefish.flutterboost.BoostPluginRegistry;
-import com.idlefish.flutterboost.NewFlutterBoost;
+import com.idlefish.flutterboost.FlutterBoost;
 import com.idlefish.flutterboost.Utils;
 import com.idlefish.flutterboost.XFlutterView;
 import com.idlefish.flutterboost.interfaces.IFlutterViewContainer;
@@ -33,7 +33,6 @@ import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.platform.PlatformPlugin;
-import io.flutter.view.FlutterMain;
 
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW;
 
@@ -84,8 +83,8 @@ public class FlutterActivityAndFragmentDelegate  implements IFlutterViewContaine
 
     void onAttach(@NonNull Context context) {
         ensureAlive();
-        if (NewFlutterBoost.instance().platform().whenEngineStart() == NewFlutterBoost.ConfigBuilder.FLUTTER_ACTIVITY_CREATED) {
-            NewFlutterBoost.instance().doInitialFlutter();
+        if (FlutterBoost.instance().platform().whenEngineStart() == FlutterBoost.ConfigBuilder.FLUTTER_ACTIVITY_CREATED) {
+            FlutterBoost.instance().doInitialFlutter();
         }
         // When "retain instance" is true, the FlutterEngine will survive configuration
         // changes. Therefore, we create a new one only if one does not already exist.
@@ -139,10 +138,10 @@ public class FlutterActivityAndFragmentDelegate  implements IFlutterViewContaine
         );
 
 
-        mSyncer = NewFlutterBoost.instance().containerManager().generateSyncer(this);
+        mSyncer = FlutterBoost.instance().containerManager().generateSyncer(this);
 
         ensureAlive();
-        flutterView = new XFlutterView(host.getActivity(), NewFlutterBoost.instance().platform().renderMode(), host.getTransparencyMode());
+        flutterView = new XFlutterView(host.getActivity(), FlutterBoost.instance().platform().renderMode(), host.getTransparencyMode());
 
 
         flutterSplashView = new FlutterSplashView(host.getContext());
@@ -181,7 +180,7 @@ public class FlutterActivityAndFragmentDelegate  implements IFlutterViewContaine
         ensureAlive();
         flutterEngine.getLifecycleChannel().appIsResumed();
 
-        BoostPluginRegistry registry= (BoostPluginRegistry)NewFlutterBoost.instance().getPluginRegistry();
+        BoostPluginRegistry registry= (BoostPluginRegistry) FlutterBoost.instance().getPluginRegistry();
         ActivityPluginBinding  binding=registry.getRegistrarAggregate().getActivityPluginBinding();
         if(binding!=null&&(binding.getActivity()!=this.host.getActivity())){
             flutterEngine.getActivityControlSurface().attachToActivity(
@@ -222,7 +221,7 @@ public class FlutterActivityAndFragmentDelegate  implements IFlutterViewContaine
         mSyncer.onDestroy();
 
         ensureAlive();
-        BoostPluginRegistry registry= (BoostPluginRegistry)NewFlutterBoost.instance().getPluginRegistry();
+        BoostPluginRegistry registry= (BoostPluginRegistry) FlutterBoost.instance().getPluginRegistry();
         ActivityPluginBinding  binding=registry.getRegistrarAggregate().getActivityPluginBinding();
         if(binding!=null&&(binding.getActivity()==this.host.getActivity())){
             registry.getRegistrarAggregate().onDetachedFromActivityForConfigChanges();
@@ -413,7 +412,7 @@ public class FlutterActivityAndFragmentDelegate  implements IFlutterViewContaine
     }
 
     /**
-     * The {@link FlutterActivity} or {@link NewFlutterFragment} that owns this
+     * The {@link FlutterActivity} or {@link FlutterFragment} that owns this
      * {@code FlutterActivityAndFragmentDelegate}.
      */
     /* package */ interface Host extends SplashScreenProvider, FlutterEngineProvider, FlutterEngineConfigurator {
diff --git a/android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java b/android/src/main/java/com/idlefish/flutterboost/containers/FlutterFragment.java
similarity index 95%
rename from android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java
rename to android/src/main/java/com/idlefish/flutterboost/containers/FlutterFragment.java
index 60fa6dd..1f5db9a 100644
--- a/android/src/main/java/com/idlefish/flutterboost/containers/NewFlutterFragment.java
+++ b/android/src/main/java/com/idlefish/flutterboost/containers/FlutterFragment.java
@@ -14,20 +14,18 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.idlefish.flutterboost.NewFlutterBoost;
+import com.idlefish.flutterboost.FlutterBoost;
 import com.idlefish.flutterboost.XFlutterView;
 import io.flutter.embedding.android.*;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;
-import io.flutter.embedding.engine.renderer.OnFirstFrameRenderedListener;
 import io.flutter.plugin.platform.PlatformPlugin;
-import io.flutter.view.FlutterMain;
 
 import java.util.HashMap;
 import java.util.Map;
 
 
-public class NewFlutterFragment extends Fragment implements FlutterActivityAndFragmentDelegate.Host {
+public class FlutterFragment extends Fragment implements FlutterActivityAndFragmentDelegate.Host {
 
     private static final String TAG = "NewFlutterFragment";
 
@@ -94,7 +92,7 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr
      * To use a cached {@link FlutterEngine} instead of creating a new one, use
      */
     @NonNull
-    public static NewFlutterFragment createDefault() {
+    public static FlutterFragment createDefault() {
         return new NewEngineFragmentBuilder().build();
     }
 
@@ -109,7 +107,7 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr
 
 
     public static class NewEngineFragmentBuilder {
-        private final Class<? extends NewFlutterFragment> fragmentClass;
+        private final Class<? extends FlutterFragment> fragmentClass;
 
         private FlutterShellArgs shellArgs = null;
         private FlutterView.RenderMode renderMode = FlutterView.RenderMode.surface;
@@ -122,14 +120,14 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr
          * {@code NewFlutterFragment}.
          */
         public NewEngineFragmentBuilder() {
-            fragmentClass = NewFlutterFragment.class;
+            fragmentClass = FlutterFragment.class;
         }
 
         /**
          * Constructs a {@code NewEngineFragmentBuilder} that is configured to construct an instance of
          * {@code subclass}, which extends {@code NewFlutterFragment}.
          */
-        public NewEngineFragmentBuilder(@NonNull Class<? extends NewFlutterFragment> subclass) {
+        public NewEngineFragmentBuilder(@NonNull Class<? extends FlutterFragment> subclass) {
             fragmentClass = subclass;
         }
 
@@ -190,7 +188,7 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr
                 args.putStringArray(ARG_FLUTTER_INITIALIZATION_ARGS, shellArgs.toArray());
             }
 
-            NewBoostFlutterActivity.SerializableMap serializableMap=new NewBoostFlutterActivity.SerializableMap();
+            BoostFlutterActivity.SerializableMap serializableMap=new BoostFlutterActivity.SerializableMap();
             serializableMap.setMap(params);
 
             args.putString(EXTRA_URL, url);
@@ -208,7 +206,7 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr
          * properties set on this {@code Builder}.
          */
         @NonNull
-        public <T extends NewFlutterFragment> T build() {
+        public <T extends FlutterFragment> T build() {
             try {
                 @SuppressWarnings("unchecked")
                 T frag = (T) fragmentClass.getDeclaredConstructor().newInstance();
@@ -238,7 +236,7 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr
         return delegate.getFlutterView();
     }
 
-    public NewFlutterFragment() {
+    public FlutterFragment() {
         // Ensure that we at least have an empty Bundle of arguments so that we don't
         // need to continually check for null arguments before grabbing one.
         setArguments(new Bundle());
@@ -435,7 +433,7 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr
     @Nullable
     public FlutterEngine provideFlutterEngine(@NonNull Context context) {
 
-        return NewFlutterBoost.instance().engineProvider();
+        return FlutterBoost.instance().engineProvider();
     }
 
     /**
@@ -507,7 +505,7 @@ public class NewFlutterFragment extends Fragment implements FlutterActivityAndFr
     @Override
     public Map getContainerUrlParams() {
 
-        NewBoostFlutterActivity.SerializableMap serializableMap= (NewBoostFlutterActivity.SerializableMap) getArguments().getSerializable(EXTRA_PARAMS);
+        BoostFlutterActivity.SerializableMap serializableMap= (BoostFlutterActivity.SerializableMap) getArguments().getSerializable(EXTRA_PARAMS);
 
         return serializableMap.getMap();
     }
diff --git a/android/src/main/java/com/idlefish/flutterboost/containers/FlutterSplashView.java b/android/src/main/java/com/idlefish/flutterboost/containers/FlutterSplashView.java
index bccb304..1b89451 100644
--- a/android/src/main/java/com/idlefish/flutterboost/containers/FlutterSplashView.java
+++ b/android/src/main/java/com/idlefish/flutterboost/containers/FlutterSplashView.java
@@ -64,9 +64,9 @@ public class FlutterSplashView extends FrameLayout {
         @Override
         public void onFirstFrameRendered() {
 
-            if(NewFlutterBoost.instance().platform().whenEngineStart()== NewFlutterBoost.ConfigBuilder.FLUTTER_ACTIVITY_CREATED){
+            if(FlutterBoost.instance().platform().whenEngineStart()== FlutterBoost.ConfigBuilder.FLUTTER_ACTIVITY_CREATED){
                 long now=new Date().getTime();
-                long flutterPostFrameCallTime=NewFlutterBoost.instance().getFlutterPostFrameCallTime();
+                long flutterPostFrameCallTime= FlutterBoost.instance().getFlutterPostFrameCallTime();
 
                 if(flutterPostFrameCallTime!=0&& (now-flutterPostFrameCallTime)>800){
                     if (splashScreen != null) {
@@ -119,7 +119,7 @@ public class FlutterSplashView extends FrameLayout {
 
         setSaveEnabled(true);
         if (mFlutterEngine == null) {
-            mFlutterEngine = NewFlutterBoost.instance().engineProvider();
+            mFlutterEngine = FlutterBoost.instance().engineProvider();
         }
     }
 
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 954e045..4f8e89b 100755
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
 
 
         <activity
-                android:name="com.idlefish.flutterboost.containers.NewBoostFlutterActivity"
+                android:name="com.idlefish.flutterboost.containers.BoostFlutterActivity"
                 android:theme="@style/Theme.AppCompat"
                 android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
                 android:hardwareAccelerated="true"
diff --git a/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/FlutterFragmentPageActivity.java b/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/FlutterFragmentPageActivity.java
index 5dc1f83..6b26e51 100755
--- a/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/FlutterFragmentPageActivity.java
+++ b/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/FlutterFragmentPageActivity.java
@@ -13,7 +13,7 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
-import com.idlefish.flutterboost.containers.NewFlutterFragment;
+import com.idlefish.flutterboost.containers.FlutterFragment;
 import io.flutter.embedding.android.DrawableSplashScreen;
 import io.flutter.embedding.android.SplashScreen;
 import io.flutter.embedding.android.SplashScreenProvider;
@@ -22,7 +22,7 @@ import io.flutter.plugin.platform.PlatformPlugin;
 public class FlutterFragmentPageActivity extends AppCompatActivity implements View.OnClickListener, SplashScreenProvider {
     protected static final String SPLASH_SCREEN_META_DATA_KEY = "io.flutter.embedding.android.SplashScreenDrawable";
 
-    private NewFlutterFragment mFragment;
+    private FlutterFragment mFragment;
 
     private View mTab1;
     private View mTab2;
@@ -70,17 +70,17 @@ public class FlutterFragmentPageActivity extends AppCompatActivity implements Vi
         if(mTab1 == v) {
             mTab1.setBackgroundColor(Color.YELLOW);
 
-            mFragment= new NewFlutterFragment.NewEngineFragmentBuilder().url("flutterFragment").build();
+            mFragment= new FlutterFragment.NewEngineFragmentBuilder().url("flutterFragment").build();
 
         }else if(mTab2 == v) {
             mTab2.setBackgroundColor(Color.YELLOW);
-            mFragment= new NewFlutterFragment.NewEngineFragmentBuilder().url("flutterFragment").build();
+            mFragment= new FlutterFragment.NewEngineFragmentBuilder().url("flutterFragment").build();
         }else if(mTab3 == v) {
             mTab3.setBackgroundColor(Color.YELLOW);
-            mFragment= new NewFlutterFragment.NewEngineFragmentBuilder().url("flutterFragment").build();
+            mFragment= new FlutterFragment.NewEngineFragmentBuilder().url("flutterFragment").build();
         }else{
             mTab4.setBackgroundColor(Color.YELLOW);
-            mFragment= new NewFlutterFragment.NewEngineFragmentBuilder().url("flutterFragment").build();
+            mFragment= new FlutterFragment.NewEngineFragmentBuilder().url("flutterFragment").build();
         }
 
         getSupportFragmentManager()
diff --git a/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/MyApplication.java b/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/MyApplication.java
index 4565910..0230563 100755
--- a/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/MyApplication.java
+++ b/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/MyApplication.java
@@ -27,7 +27,7 @@ public class MyApplication extends Application {
 
         };
 
-        NewFlutterBoost.BoostLifecycleListener lifecycleListener= new NewFlutterBoost.BoostLifecycleListener() {
+        FlutterBoost.BoostLifecycleListener lifecycleListener= new FlutterBoost.BoostLifecycleListener() {
             @Override
             public void onEngineCreated() {
 
@@ -35,9 +35,9 @@ public class MyApplication extends Application {
 
             @Override
             public void onPluginsRegistered() {
-                MethodChannel mMethodChannel = new MethodChannel( NewFlutterBoost.instance().engineProvider().getDartExecutor(), "methodChannel");
+                MethodChannel mMethodChannel = new MethodChannel( FlutterBoost.instance().engineProvider().getDartExecutor(), "methodChannel");
                 Log.e("MyApplication","MethodChannel create");
-                TextPlatformViewPlugin.register(NewFlutterBoost.instance().getPluginRegistry().registrarFor("TextPlatformViewPlugin"));
+                TextPlatformViewPlugin.register(FlutterBoost.instance().getPluginRegistry().registrarFor("TextPlatformViewPlugin"));
 
             }
 
@@ -46,15 +46,15 @@ public class MyApplication extends Application {
 
             }
         };
-        Platform platform= new NewFlutterBoost
+        Platform platform= new FlutterBoost
                 .ConfigBuilder(this,router)
                 .isDebug(true)
-                .whenEngineStart(NewFlutterBoost.ConfigBuilder.ANY_ACTIVITY_CREATED)
+                .whenEngineStart(FlutterBoost.ConfigBuilder.ANY_ACTIVITY_CREATED)
                 .renderMode(FlutterView.RenderMode.texture)
                 .lifecycleListener(lifecycleListener)
                 .build();
 
-        NewFlutterBoost.instance().init(platform);
+        FlutterBoost.instance().init(platform);
 
 
 
diff --git a/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/PageRouter.java b/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/PageRouter.java
index a4edf46..c66af69 100755
--- a/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/PageRouter.java
+++ b/example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/PageRouter.java
@@ -2,9 +2,8 @@ package com.taobao.idlefish.flutterboostexample;
 
 import android.content.Context;
 import android.content.Intent;
-import android.text.TextUtils;
 import android.util.Log;
-import com.idlefish.flutterboost.containers.NewBoostFlutterActivity;
+import com.idlefish.flutterboost.containers.BoostFlutterActivity;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -37,8 +36,8 @@ public class PageRouter {
 
         try {
             if (pageName.containsKey(path)) {
-                Intent intent = NewBoostFlutterActivity.withNewEngine().url(pageName.get(path)).params(params)
-                        .backgroundMode(NewBoostFlutterActivity.BackgroundMode.opaque).build(context);
+                Intent intent = BoostFlutterActivity.withNewEngine().url(pageName.get(path)).params(params)
+                        .backgroundMode(BoostFlutterActivity.BackgroundMode.opaque).build(context);
 
                 context.startActivity(intent);
 
-- 
2.26.2