update load Fragment method，fix issue #4

maoqitian · maoqitian · commit 8c9af2a7089a · 2019-09-01T00:23:16.000+08:00
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/presenter/main/KnowledgeHierarchyPresenter.java b/app/src/main/java/mao/com/mao_wanandroid_client/presenter/main/KnowledgeHierarchyPresenter.java
@@ -41,7 +41,11 @@ public void getKnowledgeHierarchyData() {
                               .subscribe(new BaseObserver<List<KnowledgeHierarchyData>>() {
                                   @Override
                                   public void onSuccess(List<KnowledgeHierarchyData> result) {
-                                      mView.showKnowledgeHierarchyData(result);
+                                      if(result!=null){
+                                          mView.showKnowledgeHierarchyData(result);
+                                      }else {
+                                          mView.showError();
+                                      }
                                   }
 
                                   @Override
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/utils/NavHelper.java b/app/src/main/java/mao/com/mao_wanandroid_client/utils/NavHelper.java
@@ -18,13 +18,17 @@ public class NavHelper<T> {
 
     private final SparseArray<Tab<T>> tabs = new SparseArray<Tab<T>>();
 
+    private final SparseArray<Fragment> tabFragments = new SparseArray<Fragment>();
+
     private final Context mContext;
     private final int containerId;
     private final FragmentManager fragmentManager;
     private final OnTabChangeListener<T> mListener;
 
     private Tab<T> currentTab;
 
+    private Fragment currentFragment;
+
     public NavHelper(Context mContext, int containerId, FragmentManager fragmentManager, OnTabChangeListener<T> mListener) {
         this.mContext = mContext;
         this.containerId = containerId;
@@ -43,6 +47,17 @@ public NavHelper<T> add(int menuId, Tab<T> tab) {
         tabs.put(menuId, tab);
         return this;
     }
+    /**
+     * 添加 fragment ab
+     *
+     * @param menuId
+     * @param fragment
+     * @return
+     */
+    public NavHelper<T> add(int menuId, Fragment fragment) {
+        tabFragments.put(menuId, fragment);
+        return this;
+    }
 
     /**
      * 获取当前Tab
@@ -53,6 +68,23 @@ public Tab<T> getCurrentTab() {
         return currentTab;
     }
 
+    private int lastIndexId = R.id.tab_main;
+
+    public boolean performClickMenuFragment(int menuId){
+            FragmentTransaction ft = fragmentManager.beginTransaction();
+            Fragment currentFragment = tabFragments.get(menuId);
+            Fragment lastFragment = tabFragments.get(lastIndexId);
+            lastIndexId = menuId;
+            ft.hide(lastFragment);
+            if (!currentFragment.isAdded()) {
+                fragmentManager.beginTransaction().remove(currentFragment).commit();
+                ft.add(containerId, currentFragment);
+            }
+            ft.show(currentFragment);
+            ft.commitAllowingStateLoss();
+            return true;
+    }
+
     /**
      * 执行点击菜单的操作
      * 如果点击了 nav_home 并且当前显示的是首页模块 则不切换
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/drawer/fragment/CollectionFragment.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/drawer/fragment/CollectionFragment.java
@@ -1,5 +1,6 @@
 package mao.com.mao_wanandroid_client.view.drawer.fragment;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.support.constraint.ConstraintLayout;
 import android.support.design.widget.FloatingActionButton;
@@ -186,13 +187,16 @@ public void showCancelCollectArticleSuccess(int position, String msg) {
     }
 
     //是否显示空白添加新数据
+    @SuppressLint("RestrictedApi")
     private void showCollectionDataChange() {
         List<CollectData> data = mAdapter.getData();
         if(data.size() == 0){
             mClEmpty.setVisibility(View.VISIBLE);
+            mFabAdd.setVisibility(View.GONE);
             mSmartRefreshLayout.setVisibility(View.GONE);
         }else {
             mClEmpty.setVisibility(View.GONE);
+            mFabAdd.setVisibility(View.VISIBLE);
             mSmartRefreshLayout.setVisibility(View.VISIBLE);
         }
     }
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/drawer/fragment/CollectionPageFragment.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/drawer/fragment/CollectionPageFragment.java
@@ -1,5 +1,6 @@
 package mao.com.mao_wanandroid_client.view.drawer.fragment;
 
+import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
@@ -31,6 +32,16 @@ public class CollectionPageFragment extends BaseFragment<CollectionPagePresenter
     List<String> mTitle;
     List<Fragment> mFragments;
 
+
+    public static CollectionPageFragment newInstance() {
+
+        Bundle args = new Bundle();
+
+        CollectionPageFragment fragment = new CollectionPageFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
     @Override
     protected void initEventAndData() {
         super.initEventAndData();
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/drawer/fragment/CollectionWebFragment.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/drawer/fragment/CollectionWebFragment.java
@@ -1,5 +1,6 @@
 package mao.com.mao_wanandroid_client.view.drawer.fragment;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.support.constraint.ConstraintLayout;
 import android.support.design.widget.FloatingActionButton;
@@ -190,13 +191,16 @@ public void showDeleteCollectWebSuccess(int position, String msg) {
         Toast.makeText(getActivity(),msg,Toast.LENGTH_SHORT).show();
     }
     //是否显示空白添加新数据
+    @SuppressLint("RestrictedApi")
     private void showCollectionDataChange() {
         List<WebBookMark> data = mAdapter.getData();
         if(data.size() == 0){
             mClEmpty.setVisibility(View.VISIBLE);
+            mFabAdd.setVisibility(View.GONE);
             mSmartRefreshLayout.setVisibility(View.GONE);
         }else {
             mClEmpty.setVisibility(View.GONE);
+            mFabAdd.setVisibility(View.VISIBLE);
             mSmartRefreshLayout.setVisibility(View.VISIBLE);
         }
     }
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/main/MainActivity.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/main/MainActivity.java
@@ -106,6 +106,12 @@ protected void initToolbar() {
         pageTitle.setText(getString(R.string.page_home));
         //沉浸式状态栏
         StatusBarUtil.setColorNoTranslucentForDrawerLayout(this,drawer,ContextCompat.getColor(this,R.color.colorPrimary));
+
+    }
+
+    @Override
+    protected void onViewCreated() {
+        super.onViewCreated();
         initFragment();
         initView();
     }
@@ -116,14 +122,22 @@ private void initFragment() {
             loadRootFragment(R.id.page_fragment_container, HomePageFragment.newInstance());
             //loadMultipleRootFragment();
         }*/
-       mNavHelper =new NavHelper<String>(this,R.id.page_fragment_container,getSupportFragmentManager(),this)
+       /*mNavHelper =new NavHelper<String>(this,R.id.page_fragment_container,getSupportFragmentManager(),this)
                .add(R.id.tab_main,new NavHelper.Tab<String>(HomePageFragment.class,getString(R.string.page_home),Constants.TAG_HOME))
                .add(R.id.nav_home,new NavHelper.Tab<String>(HomePageFragment.class,getString(R.string.page_home),Constants.TAG_HOME))
                .add(R.id.tab_knowledge_hierarchy,new NavHelper.Tab<String>(KnowledgeHierarchyPageFragment.class,getString(R.string.knowledge_hierarchy),Constants.TAG_KNOWLEGER))
                .add(R.id.tab_official_accounts,new NavHelper.Tab<String>(OfficialAccountsPageFragment.class,getString(R.string.official_accounts),Constants.TAG_OFFICIAL))
                .add(R.id.tab_navigation,new NavHelper.Tab<String>(NavigationFragment.class,getString(R.string.navigation),Constants.TAG_NAVIGATION))
                .add(R.id.tab_project,new NavHelper.Tab<String>(ProjectFragment.class,getString(R.string.project),Constants.TAG_PROJECT))
-               .add(R.id.collect_page,new NavHelper.Tab<String>(CollectionPageFragment.class,getString(R.string.nav_collect),Constants.TAG_COLLECTION));
+               .add(R.id.collect_page,new NavHelper.Tab<String>(CollectionPageFragment.class,getString(R.string.nav_collect),Constants.TAG_COLLECTION));*/
+        mNavHelper =new NavHelper<String>(this,R.id.page_fragment_container,getSupportFragmentManager(),this)
+                .add(R.id.tab_main,HomePageFragment.newInstance())
+                .add(R.id.nav_home,HomePageFragment.newInstance())
+                .add(R.id.tab_knowledge_hierarchy,KnowledgeHierarchyPageFragment.newInstance())
+                .add(R.id.tab_official_accounts,OfficialAccountsPageFragment.newInstance())
+                .add(R.id.tab_navigation,NavigationFragment.newInstance())
+                .add(R.id.tab_project,ProjectFragment.newInstance())
+                .add(R.id.collect_page,CollectionPageFragment.newInstance());
     }
 
     private void initView() {
@@ -230,17 +244,25 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
         }*/
         //DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         //点击之后关闭DrawerLayout
-        if(R.id.common_website != id ){
-            //如果是 常用网站则不改变选中状态
+        drawer.closeDrawer(GravityCompat.START);
+        if(R.id.common_website ==  id || R.id.nav_settings ==id || R.id.nav_todo ==id){
+            //如果是 常用网站 todo 则不改变选中状态
             //navigationView 选中
+            return false;
+        }else {
             navigationView.setCheckedItem(id);
+            return mNavHelper.performClickMenuFragment(id);
         }
-        /*if(R.id.nav_settings == id){
-            //如果是设置 让其选中首页状态
-            navigationView.setCheckedItem(R.id.nav_home);
-        }*/
-        drawer.closeDrawer(GravityCompat.START);
-        return mNavHelper.performClickMenu(id);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                drawer.openDrawer(GravityCompat.START);
+                break;
+        }
+        return super.onOptionsItemSelected(item);
     }
 
     /**
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/main/fragment/KnowledgeHierarchyPageFragment.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/main/fragment/KnowledgeHierarchyPageFragment.java
@@ -1,5 +1,6 @@
 package mao.com.mao_wanandroid_client.view.main.fragment;
 
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
@@ -41,6 +42,16 @@ public class KnowledgeHierarchyPageFragment extends RootBaseFragment<KnowledgeHi
     KnowledgeHierarchyAdapter mAdapter;
     List<KnowledgeHierarchyData> mKnowledgeHierarchyData;
 
+    public static KnowledgeHierarchyPageFragment newInstance() {
+
+        Bundle args = new Bundle();
+
+        KnowledgeHierarchyPageFragment fragment = new KnowledgeHierarchyPageFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+
     @Override
     protected void initView() {
         mRecyclerView.setHasFixedSize(true);
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/main/fragment/NavigationFragment.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/main/fragment/NavigationFragment.java
@@ -1,5 +1,6 @@
 package mao.com.mao_wanandroid_client.view.main.fragment;
 
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
@@ -63,6 +64,16 @@ public class NavigationFragment extends RootBaseFragment<NavigationPresenter> im
     //VerticalTabLayout 点击获取位置让 RecycleView滑动到相应位置
     private int scrollToPosition;
 
+
+    public static NavigationFragment newInstance() {
+
+        Bundle args = new Bundle();
+
+        NavigationFragment fragment = new NavigationFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
     @Override
     protected int getLayoutId() {
         return R.layout.navigation_fragment_layout;
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/main/fragment/OfficialAccountsPageFragment.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/main/fragment/OfficialAccountsPageFragment.java
@@ -1,5 +1,6 @@
 package mao.com.mao_wanandroid_client.view.main.fragment;
 
+import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -37,6 +38,16 @@ public class OfficialAccountsPageFragment extends RootBaseFragment<OfficialAccou
 
     List<KnowledgeHierarchyData> mOfficialAccountsListData;
 
+
+    public static OfficialAccountsPageFragment newInstance() {
+
+        Bundle args = new Bundle();
+
+        OfficialAccountsPageFragment fragment = new OfficialAccountsPageFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
     @Override
     protected void initView() {
         mRecyclerView.setHasFixedSize(true);
diff --git a/app/src/main/java/mao/com/mao_wanandroid_client/view/main/fragment/ProjectFragment.java b/app/src/main/java/mao/com/mao_wanandroid_client/view/main/fragment/ProjectFragment.java
@@ -1,5 +1,6 @@
 package mao.com.mao_wanandroid_client.view.main.fragment;
 
+import android.os.Bundle;
 import android.support.constraint.ConstraintLayout;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
@@ -38,6 +39,16 @@ public class ProjectFragment extends BaseFragment<ProjectPresenter> implements P
     List<ProjectClassifyData> mProjectClassifyDataList;
     List<Fragment> mProjectFragmentsList;
     List<String> mTitle;
+
+    public static ProjectFragment newInstance() {
+
+        Bundle args = new Bundle();
+
+        ProjectFragment fragment = new ProjectFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
     @Override
     protected void initView() {
         mProjectClassifyDataList = new ArrayList<>();
