QMUISchemeFragmentFactory

Tencent · Jun 8, 2020 · b18a860 · b18a860
1 parent 1ae3c33
commit b18a860
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/arch/src/main/java/com/qmuiteam/qmui/arch/scheme/FragmentSchemeItem.java b/arch/src/main/java/com/qmuiteam/qmui/arch/scheme/FragmentSchemeItem.java
@@ -108,28 +108,23 @@ public boolean handle(@NonNull QMUISchemeHandler handler,
         }
 
         QMUIFragmentActivity fragmentActivity = (QMUIFragmentActivity) activity;
-        Bundle args = factory.factory(scheme);
         Fragment currentFragment = fragmentActivity.getCurrentFragment();
         if(isUseRefreshIfMatchedCurrent()
                 && currentFragment != null
                 && currentFragment.getClass() == mFragmentCls
                 && currentFragment instanceof FragmentSchemeRefreshable){
-            ((FragmentSchemeRefreshable) currentFragment).refreshFromScheme(args);
+            ((FragmentSchemeRefreshable) currentFragment).refreshFromScheme(factory.factory(scheme));
             return true;
         }
 
-        try {
-            QMUIFragment fragment = mFragmentCls.newInstance();
-            fragment.setArguments(args);
+        QMUIFragment fragment = factory.factory(mFragmentCls, scheme);
+        if(fragment != null){
             int commitId = fragmentActivity.startFragment(fragment);
             if (commitId == -1) {
                 QMUILog.d(QMUISchemeHandler.TAG, "start fragment failed.");
                 return false;
             }
             return true;
-        } catch (Exception e) {
-            QMUILog.printErrStackTrace(QMUISchemeHandler.TAG, e,
-                    "Error to create fragment: %s", mFragmentCls.getSimpleName());
         }
         return false;
     }

diff --git a/arch/src/main/java/com/qmuiteam/qmui/arch/scheme/QMUIDefaultSchemeFragmentFactory.java b/arch/src/main/java/com/qmuiteam/qmui/arch/scheme/QMUIDefaultSchemeFragmentFactory.java
@@ -33,6 +33,22 @@
 
 public class QMUIDefaultSchemeFragmentFactory implements QMUISchemeFragmentFactory {
 
+    @Override
+    @Nullable
+    public QMUIFragment factory(@NonNull Class<? extends QMUIFragment> fragmentCls,
+                                @Nullable Map<String, SchemeValue> scheme) {
+        try {
+            QMUIFragment fragment = fragmentCls.newInstance();
+            fragment.setArguments(factory(scheme));
+            return fragment;
+        } catch (Exception e) {
+            QMUILog.printErrStackTrace(QMUISchemeHandler.TAG, e,
+                    "Error to create fragment: %s", fragmentCls.getSimpleName());
+            return null;
+        }
+    }
+
+
     @Override
     @Nullable
     public Bundle factory(@Nullable Map<String, SchemeValue> scheme) {

diff --git a/arch/src/main/java/com/qmuiteam/qmui/arch/scheme/QMUISchemeFragmentFactory.java b/arch/src/main/java/com/qmuiteam/qmui/arch/scheme/QMUISchemeFragmentFactory.java
@@ -29,6 +29,11 @@
 import java.util.Map;
 
 public interface QMUISchemeFragmentFactory {
+
+    @Nullable
+    QMUIFragment factory(@NonNull Class<? extends QMUIFragment> fragmentCls,
+                         @Nullable Map<String, SchemeValue> scheme);
+
     @Nullable
     Bundle factory(@Nullable Map<String, SchemeValue> scheme);