From 1df231fd6aafa221aef3532d069c7e27d4331be7 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期日, 27 八月 2023 19:21:01 +0800
Subject: [PATCH] 功能全部完成
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
index 41e34d6..4e394a9 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
@@ -1,5 +1,6 @@
package com.application.zhangshi_app_android.ui.function;
+import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
@@ -14,18 +15,24 @@
import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.GlideUtil;
import com.android.app_base.utils.ScreenSizeUtils;
+import com.android.app_base.utils.rxbus.MessageEvent;
+import com.android.app_base.utils.rxbus.RxBus;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.bean.BannerBean;
+import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.databinding.FragmentFunctionBinding;
import com.application.zhangshi_app_android.ui.DLBaseFragment;
import com.application.zhangshi_app_android.ui.TestActivity;
import com.application.zhangshi_app_android.ui.home.HomeFragment;
import com.application.zhangshi_app_android.ui.main.MainActivity;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
+import io.reactivex.functions.Consumer;
/**
* @author Ljj
@@ -140,6 +147,12 @@
imageCarouselFragment = ImageCarouselFragment.newInstance();
videoFragment = VideoFragment.newInstance();
replaceFragment(imageCarouselFragment);
+ binding.ivOperateSelect.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ AppManager.getAppManager().startActivity(new Intent(getSelfActivity(),ImageSelectActivity.class).putExtra("flag",0).putExtra("list", (Serializable) imageCarouselFragment.getImageList()));
+ }
+ });
//鍙充笂瑙掓搷浣滃脊绐�
mOperatePopupWindow = initPopUpWindow(View.inflate(getSelfActivity(),R.layout.pop_switch_video_or_image,null));
@@ -149,7 +162,12 @@
imageCarouselFragment = ImageCarouselFragment.newInstance();
}
replaceFragment(imageCarouselFragment);
-
+ binding.ivOperateSelect.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ AppManager.getAppManager().startActivity(new Intent(getSelfActivity(),ImageSelectActivity.class).putExtra("flag",0).putExtra("list", (Serializable) imageCarouselFragment.getImageList()));
+ }
+ });
});
mOperatePopupWindow.getContentView().findViewById(R.id.tv_video).setOnClickListener(v -> {
mOperatePopupWindow.dismiss();
@@ -157,6 +175,13 @@
videoFragment = VideoFragment.newInstance();
}
replaceFragment(videoFragment);
+ binding.ivOperateSelect.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ AppManager.getAppManager().startActivity(new Intent(getSelfActivity(),ImageSelectActivity.class).putExtra("flag",1).putExtra("list", (Serializable) videoFragment.getVideoList()));
+ }
+
+ });
});
//鐐瑰嚮寮瑰嚭鎿嶄綔寮圭獥
binding.ivOperate.setOnClickListener(v -> {
@@ -174,43 +199,38 @@
}
@Override
+ public void onResume() {
+ super.onResume();
+ initData();
+ }
+
+ @Override
protected void initLiveDataObserve() {
viewModel.getBannerListLiveData().observe(this, new Observer<List<BannerBean>>() {
@Override
public void onChanged(List<BannerBean> bannerBeans) {
- List<String> imageList = new ArrayList<>();
- List<String> videoList = new ArrayList<>();
+ List<BannerBean> imageList = new ArrayList<>();
+ List<BannerBean> videoList = new ArrayList<>();
for (BannerBean bannerBean : bannerBeans) {
if (bannerBean.getFlag() == 0){
//鍥剧墖
- imageList.add(bannerBean.getUrl());
+ imageList.add(bannerBean);
}else if (bannerBean.getFlag() == 1){
//瑙嗛
- videoList.add(bannerBean.getUrl());
+ videoList.add(bannerBean);
}
}
imageCarouselFragment.setImageList(imageList);
videoFragment.setVideoList(videoList);
}
});
+
+
}
@Override
protected boolean isStatusBarImmersionEnabled() {
return true;
}
-
- @Override
- protected void dataNull() {
- super.dataNull();
- binding.layoutFrame.setVisibility(View.GONE);
- binding.layoutDataNull.setVisibility(View.VISIBLE);
- }
-
- @Override
- protected void hide() {
- super.hide();
- binding.layoutFrame.setVisibility(View.VISIBLE);
- binding.layoutDataNull.setVisibility(View.GONE);
- }
}
+
--
Gitblit v1.9.1