Skip to content

B
beyond-clouds-android
Commit 841b9f94 by 段启岩
Options

更新栏目加载方式-工具用户登录状态加载

parent 8389aa75
Showing with 81 additions and 7 deletions
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/main/DynamicFragment.java
...@@ -8,6 +8,7 @@ import android.view.ViewGroup; ...@@ -8,6 +8,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
...@@ -25,6 +26,7 @@ import cn.yunliyunwai.beyondclouds.ui.common.RefreshableFragment; ...@@ -25,6 +26,7 @@ import cn.yunliyunwai.beyondclouds.ui.common.RefreshableFragment;
import cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedListener; import cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedListener;
import cn.yunliyunwai.beyondclouds.util.CategoryViewpagerUtils; import cn.yunliyunwai.beyondclouds.util.CategoryViewpagerUtils;
import cn.yunliyunwai.beyondclouds.util.ContextUtils; import cn.yunliyunwai.beyondclouds.util.ContextUtils;
import cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.DynamicFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.DynamicFragmentViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.DynamicListFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.DynamicListFragmentViewModel;
...@@ -34,6 +36,9 @@ public class DynamicFragment extends BaseFragment<DynamicFragmentViewModel, Frag ...@@ -34,6 +36,9 @@ public class DynamicFragment extends BaseFragment<DynamicFragmentViewModel, Frag
@Inject @Inject
ViewModelProvider.Factory factory; ViewModelProvider.Factory factory;
@Inject
AuthenticationViewModel authenticationViewModel;
@Override @Override
protected void initInject() { protected void initInject() {
ContextUtils.getAppComponent(requireActivity()).inject(this); ContextUtils.getAppComponent(requireActivity()).inject(this);
...@@ -53,6 +58,17 @@ public class DynamicFragment extends BaseFragment<DynamicFragmentViewModel, Frag ...@@ -53,6 +58,17 @@ public class DynamicFragment extends BaseFragment<DynamicFragmentViewModel, Frag
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
authenticationViewModel.getAuthenticationState().observe(this, new Observer<AuthenticationViewModel.AuthenticationState>() {
@Override
public void onChanged(AuthenticationViewModel.AuthenticationState authenticationState) {
if (authenticationState == AuthenticationViewModel.AuthenticationState.AUTHENTICATED) {
viewModel.loadCategories(true);
} else {
viewModel.loadCategories(false);
}
}
});
CategoryViewpagerUtils.bindViewPager(this, new FragmentFactory() { CategoryViewpagerUtils.bindViewPager(this, new FragmentFactory() {
@Override @Override
public Fragment create() { public Fragment create() {
......
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/main/HomeFragment.java
...@@ -9,6 +9,7 @@ import android.view.ViewGroup; ...@@ -9,6 +9,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
...@@ -29,6 +30,7 @@ import cn.yunliyunwai.beyondclouds.ui.popup.PopupAddMenu; ...@@ -29,6 +30,7 @@ import cn.yunliyunwai.beyondclouds.ui.popup.PopupAddMenu;
import cn.yunliyunwai.beyondclouds.util.CategoryViewpagerUtils; import cn.yunliyunwai.beyondclouds.util.CategoryViewpagerUtils;
import cn.yunliyunwai.beyondclouds.util.ContextUtils; import cn.yunliyunwai.beyondclouds.util.ContextUtils;
import cn.yunliyunwai.beyondclouds.util.DimensionUtils; import cn.yunliyunwai.beyondclouds.util.DimensionUtils;
import cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.BlogListFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.BlogListFragmentViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.HomeFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.HomeFragmentViewModel;
...@@ -37,6 +39,9 @@ public class HomeFragment extends BaseFragment<HomeFragmentViewModel, FragmentHo ...@@ -37,6 +39,9 @@ public class HomeFragment extends BaseFragment<HomeFragmentViewModel, FragmentHo
@Inject @Inject
ViewModelProvider.Factory factory; ViewModelProvider.Factory factory;
@Inject
AuthenticationViewModel authenticationViewModel;
@Override @Override
protected void initInject() { protected void initInject() {
((BeyondApplication)(requireActivity().getApplication())).getAppComponent().inject(this); ((BeyondApplication)(requireActivity().getApplication())).getAppComponent().inject(this);
...@@ -61,7 +66,18 @@ public class HomeFragment extends BaseFragment<HomeFragmentViewModel, FragmentHo ...@@ -61,7 +66,18 @@ public class HomeFragment extends BaseFragment<HomeFragmentViewModel, FragmentHo
return new BlogListFragment(); return new BlogListFragment();
} }
}, binding.magicIndicator, binding.viewPager, viewModel, false); }, binding.magicIndicator, binding.viewPager, viewModel, false);
viewModel.loadCategories(authenticationViewModel.getAuthenticationState().getValue() == AuthenticationViewModel.AuthenticationState.AUTHENTICATED);
authenticationViewModel.getAuthenticationState().observe(this, new Observer<AuthenticationViewModel.AuthenticationState>() {
@Override
public void onChanged(AuthenticationViewModel.AuthenticationState authenticationState) {
if (authenticationState == AuthenticationViewModel.AuthenticationState.AUTHENTICATED) {
viewModel.loadCategories(true);
} else {
viewModel.loadCategories(false);
}
}
});
PopupAddMenu popupAddMenu = new PopupAddMenu(getContext()); PopupAddMenu popupAddMenu = new PopupAddMenu(getContext());
binding.searchBar.setRightIconClickListener(new View.OnClickListener() { binding.searchBar.setRightIconClickListener(new View.OnClickListener() {
......
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/main/ProjectFragment.java
...@@ -9,6 +9,7 @@ import android.view.ViewGroup; ...@@ -9,6 +9,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
...@@ -27,6 +28,7 @@ import cn.yunliyunwai.beyondclouds.ui.common.RefreshableFragment; ...@@ -27,6 +28,7 @@ import cn.yunliyunwai.beyondclouds.ui.common.RefreshableFragment;
import cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedListener; import cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedListener;
import cn.yunliyunwai.beyondclouds.util.CategoryViewpagerUtils; import cn.yunliyunwai.beyondclouds.util.CategoryViewpagerUtils;
import cn.yunliyunwai.beyondclouds.util.ContextUtils; import cn.yunliyunwai.beyondclouds.util.ContextUtils;
import cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.ProjectFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.ProjectFragmentViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.ProjectListFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.ProjectListFragmentViewModel;
...@@ -36,6 +38,9 @@ public class ProjectFragment extends BaseFragment<ProjectFragmentViewModel, Frag ...@@ -36,6 +38,9 @@ public class ProjectFragment extends BaseFragment<ProjectFragmentViewModel, Frag
@Inject @Inject
ViewModelProvider.Factory factory; ViewModelProvider.Factory factory;
@Inject
AuthenticationViewModel authenticationViewModel;
@Override @Override
protected void initInject() { protected void initInject() {
((BeyondApplication)(requireActivity().getApplication())).getAppComponent().inject(this); ((BeyondApplication)(requireActivity().getApplication())).getAppComponent().inject(this);
...@@ -54,6 +59,18 @@ public class ProjectFragment extends BaseFragment<ProjectFragmentViewModel, Frag ...@@ -54,6 +59,18 @@ public class ProjectFragment extends BaseFragment<ProjectFragmentViewModel, Frag
@Override @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
authenticationViewModel.getAuthenticationState().observe(this, new Observer<AuthenticationViewModel.AuthenticationState>() {
@Override
public void onChanged(AuthenticationViewModel.AuthenticationState authenticationState) {
if (authenticationState == AuthenticationViewModel.AuthenticationState.AUTHENTICATED) {
viewModel.loadCategories(true);
} else {
viewModel.loadCategories(false);
}
}
});
CategoryViewpagerUtils.bindViewPager(this, new FragmentFactory() { CategoryViewpagerUtils.bindViewPager(this, new FragmentFactory() {
@Override @Override
public Fragment create() { public Fragment create() {
......
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/main/QAFragment.java
...@@ -8,6 +8,7 @@ import android.view.ViewGroup; ...@@ -8,6 +8,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
...@@ -26,6 +27,7 @@ import cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedList ...@@ -26,6 +27,7 @@ import cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedList
import cn.yunliyunwai.beyondclouds.util.CategoryViewpagerUtils; import cn.yunliyunwai.beyondclouds.util.CategoryViewpagerUtils;
import cn.yunliyunwai.beyondclouds.util.ContextUtils; import cn.yunliyunwai.beyondclouds.util.ContextUtils;
import cn.yunliyunwai.beyondclouds.util.ViewModelUtils; import cn.yunliyunwai.beyondclouds.util.ViewModelUtils;
import cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.QAFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.QAFragmentViewModel;
import cn.yunliyunwai.beyondclouds.viewmodel.QuestionListFragmentViewModel; import cn.yunliyunwai.beyondclouds.viewmodel.QuestionListFragmentViewModel;
...@@ -35,6 +37,9 @@ public class QAFragment extends BaseFragment<QAFragmentViewModel, FragmentQaBind ...@@ -35,6 +37,9 @@ public class QAFragment extends BaseFragment<QAFragmentViewModel, FragmentQaBind
@Inject @Inject
ViewModelProvider.Factory factory; ViewModelProvider.Factory factory;
@Inject
AuthenticationViewModel authenticationViewModel;
@Override @Override
protected void initInject() { protected void initInject() {
ContextUtils.getAppComponent(requireActivity()).inject(this); ContextUtils.getAppComponent(requireActivity()).inject(this);
...@@ -53,6 +58,18 @@ public class QAFragment extends BaseFragment<QAFragmentViewModel, FragmentQaBind ...@@ -53,6 +58,18 @@ public class QAFragment extends BaseFragment<QAFragmentViewModel, FragmentQaBind
@Override @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
authenticationViewModel.getAuthenticationState().observe(this, new Observer<AuthenticationViewModel.AuthenticationState>() {
@Override
public void onChanged(AuthenticationViewModel.AuthenticationState authenticationState) {
if (authenticationState == AuthenticationViewModel.AuthenticationState.AUTHENTICATED) {
viewModel.loadCategories(true);
} else {
viewModel.loadCategories(false);
}
}
});
CategoryViewpagerUtils.bindViewPager(this, new FragmentFactory() { CategoryViewpagerUtils.bindViewPager(this, new FragmentFactory() {
@Override @Override
public Fragment create() { public Fragment create() {
......
app/src/main/java/cn/yunliyunwai/beyondclouds/util/CategoryViewpagerUtils.java
...@@ -25,7 +25,6 @@ public class CategoryViewpagerUtils { ...@@ -25,7 +25,6 @@ public class CategoryViewpagerUtils {
magicIndicator.setNavigator(commonNavigator); magicIndicator.setNavigator(commonNavigator);
ViewPagerHelper.bind(magicIndicator, viewPager); ViewPagerHelper.bind(magicIndicator, viewPager);
viewModel.loadCategories();
viewModel viewModel
.getCategories() .getCategories()
.observe(fragment.getViewLifecycleOwner(), .observe(fragment.getViewLifecycleOwner(),
...@@ -42,7 +41,6 @@ public class CategoryViewpagerUtils { ...@@ -42,7 +41,6 @@ public class CategoryViewpagerUtils {
magicIndicator.setNavigator(commonNavigator); magicIndicator.setNavigator(commonNavigator);
ViewPagerHelper.bind(magicIndicator, viewPager); ViewPagerHelper.bind(magicIndicator, viewPager);
viewModel.loadCategories();
viewModel viewModel
.getCategories() .getCategories()
.observe(activity, .observe(activity,
......
app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/DynamicFragmentViewModel.java
...@@ -14,7 +14,8 @@ public class DynamicFragmentViewModel extends CategoryViewModel { ...@@ -14,7 +14,8 @@ public class DynamicFragmentViewModel extends CategoryViewModel {
} }
@Override @Override
public void loadCategories() { public void loadCategories(boolean authenticated) {
if (authenticated) {
refreshCategories(Arrays.asList( refreshCategories(Arrays.asList(
CommonCategory.latest(), CommonCategory.latest(),
CommonCategory.recommend(), CommonCategory.recommend(),
...@@ -24,5 +25,14 @@ public class DynamicFragmentViewModel extends CategoryViewModel { ...@@ -24,5 +25,14 @@ public class DynamicFragmentViewModel extends CategoryViewModel {
CommonCategory.photos(), CommonCategory.photos(),
CommonCategory.videos() CommonCategory.videos()
)); ));
} else {
refreshCategories(Arrays.asList(
CommonCategory.latest(),
CommonCategory.recommend(),
CommonCategory.words(),
CommonCategory.photos(),
CommonCategory.videos()));
}
} }
} }
app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/HomeFragmentViewModel.java
...@@ -22,7 +22,7 @@ public class HomeFragmentViewModel extends CategoryViewModel { ...@@ -22,7 +22,7 @@ public class HomeFragmentViewModel extends CategoryViewModel {
} }
@Override @Override
public void loadCategories() { public void loadCategories(boolean authenticated) {
List<CommonCategory> commonCategories = new ArrayList<>(Arrays.asList(CommonCategory.recommend(), CommonCategory.latest())); List<CommonCategory> commonCategories = new ArrayList<>(Arrays.asList(CommonCategory.recommend(), CommonCategory.latest()));
blogRepository.loadCategoriesFromCache().observeForever(new Observer<List<BlogCategory>>() { blogRepository.loadCategoriesFromCache().observeForever(new Observer<List<BlogCategory>>() {
@Override @Override
......
app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/ProjectFragmentViewModel.java
...@@ -23,7 +23,7 @@ public class ProjectFragmentViewModel extends CategoryViewModel { ...@@ -23,7 +23,7 @@ public class ProjectFragmentViewModel extends CategoryViewModel {
} }
@Override @Override
public void loadCategories() { public void loadCategories(boolean authenticated) {
List<CommonCategory> commonCategories = new ArrayList<>(Arrays.asList(CommonCategory.recommend(), CommonCategory.latest())); List<CommonCategory> commonCategories = new ArrayList<>(Arrays.asList(CommonCategory.recommend(), CommonCategory.latest()));
projectRepository.loadCategoriesFromCache().observeForever(new Observer<List<ProjectCategory>>() { projectRepository.loadCategoriesFromCache().observeForever(new Observer<List<ProjectCategory>>() {
@Override @Override
......
app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/QAFragmentViewModel.java
...@@ -22,7 +22,7 @@ public class QAFragmentViewModel extends CategoryViewModel { ...@@ -22,7 +22,7 @@ public class QAFragmentViewModel extends CategoryViewModel {
} }
@Override @Override
public void loadCategories() { public void loadCategories(boolean authenticated) {
List<CommonCategory> commonCategories = new ArrayList<>(Arrays.asList(CommonCategory.latest())); List<CommonCategory> commonCategories = new ArrayList<>(Arrays.asList(CommonCategory.latest()));
questionRepository.loadCategoriesFromCache().observeForever(new Observer<List<QuestionCategory>>() { questionRepository.loadCategoriesFromCache().observeForever(new Observer<List<QuestionCategory>>() {
@Override @Override
......
app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/common/CategoryViewModel.java
...@@ -20,5 +20,5 @@ public abstract class CategoryViewModel extends ViewModel { ...@@ -20,5 +20,5 @@ public abstract class CategoryViewModel extends ViewModel {
return categories; return categories;
} }
public abstract void loadCategories(); public abstract void loadCategories(boolean authenticated);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment