From 31b7700b976a46901f67c5d7a00281ca4745fc9f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期六, 07 十月 2023 21:44:35 +0800
Subject: [PATCH] 调整旅游模块功能
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/CleanStorageDetailActivity.java | 244 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 222 insertions(+), 22 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CleanStorageDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CleanStorageDetailActivity.java
index 912bc05..50acba5 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CleanStorageDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CleanStorageDetailActivity.java
@@ -1,29 +1,54 @@
package com.application.zhangshi_app_android.ui.function;
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
-import android.os.Bundle;
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.Intent;
+import android.net.Uri;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
+import android.widget.PopupWindow;
+import com.android.app_base.base.BaseConfig;
+import com.android.app_base.base.adapter.BaseRVAdapter;
+import com.android.app_base.base.dialog.BaseDialog;
+import com.android.app_base.base.dialog.UIDialog;
+import com.android.app_base.base.dialog.WaitDialog;
+import com.android.app_base.manager.UserManager;
+import com.android.app_base.utils.GetFilePathFromUri;
+import com.android.app_base.utils.ScreenSizeUtils;
+import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.adapter.ImageRvAdapter;
+import com.application.zhangshi_app_android.adapter.ElectronicFileAddAdapter;
import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.LittleDoctorBean;
+import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.databinding.ActivityCleanStorageDetailBinding;
-import com.application.zhangshi_app_android.databinding.ActivityLittleDoctorDetailBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
+import com.github.gzuliyujiang.wheelpicker.OptionPicker;
+import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
+import com.luck.picture.lib.entity.LocalMedia;
+import com.luck.picture.lib.interfaces.OnResultCallbackListener;
+import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.function.Consumer;
public class CleanStorageDetailActivity extends DLBaseActivity<ActivityCleanStorageDetailBinding,CleanStorageDetailActivityViewModel> {
-
- private ImageRvAdapter adapter;
+ private ElectronicFileAddAdapter adapter;
+ private BaseDialog mWaitDialog;
+ private ActivityResultLauncher<Intent> activityResultLauncher;
+ private int type;// 0 鏌ョ湅鍙慨鏀瑰垹闄� 1 鏂板 2 鐩存帴淇敼
+ private PopupWindow popupWindow;
@Override
public int getLayoutId() {
@@ -37,18 +62,167 @@
@Override
public void initParam() {
- if (getIntent().hasExtra("bean")){
- viewModel.getBeanLiveData().setValue((CleanStorageBean) getIntent().getSerializableExtra("bean"));
+ type = getIntent().getIntExtra(BaseConfig.EXTRA_TYPE,0);
+ if (type == 0 || type == 2){
+ CleanStorageBean bean = (CleanStorageBean) getIntent().getSerializableExtra("bean");
+ if (bean !=null){
+ viewModel.getBeanLiveData().setValue(bean);
+ }
}
}
@Override
public void initView() {
- adapter = new ImageRvAdapter(this);
+ adapter = new ElectronicFileAddAdapter(this);
GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3);
binding.rvImage.setLayoutManager(gridLayoutManager);
binding.rvImage.setNestedScrollingEnabled(false);
- setIsEdited(false);
+ adapter.setItemAndAddClickListener(new ElectronicFileAddAdapter.OnItemAndAddClickListener() {
+ @Override
+ public void onItemClick(View v, int position) {
+
+ }
+
+ @Override
+ public void onAddClick() {
+ OptionPicker picker = getOptionPicker(Arrays.asList("鍥剧墖瑙嗛","鍏朵粬鏂囦欢"));
+ picker.setTitle("閫夋嫨鏂囦欢绫诲瀷");
+ picker.setOnOptionPickedListener(new OnOptionPickedListener() {
+ @Override
+ public void onOptionPicked(int position, Object item) {
+ if (item.equals("鍥剧墖瑙嗛")) {
+ UserManager.getInstance().selectImage(getSelfActivity(), 0,9, new OnResultCallbackListener<LocalMedia>() {
+ @Override
+ public void onResult(ArrayList<LocalMedia> result) {
+ if (result.size() == 0) return;
+ for (LocalMedia media : result) {
+ String path = media.getRealPath();
+ if (path!=null){
+ viewModel.addUploadFile(path);
+ CleanStorageBean bean = viewModel.getBeanLiveData().getValue();
+ if (bean !=null){
+ List<String> urlList = Utils.splitString2List(bean.getUrl(),",");
+ urlList.add(path);
+ bean.setUrl(Utils.appendList2String(urlList,","));
+ }
+ viewModel.getBeanLiveData().setValue(bean);
+ }
+ }
+ }
+ @Override
+ public void onCancel() {
+
+ }
+ });
+ }else {
+ Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+// Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+ intent.setType("*/*"); // 闄愬埗鏂囦欢绫诲瀷
+ intent.addCategory(Intent.CATEGORY_OPENABLE); // 娣诲姞 CATEGORY_OPENABLE 鍒嗙被,鍛婅瘔绯荤粺瑕侀�夋嫨鐨勫唴瀹瑰彲浠ヨ鎵撳紑锛岃繖鏍风郴缁熶細杩囨护鎺変笉鑳借搴旂敤鎵撳紑鐨勬枃浠讹紝浠ユ彁渚涙洿濂界殑鐢ㄦ埛浣撻獙銆�
+ intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); // 鍏佽澶氶��
+ activityResultLauncher.launch(intent);
+ }
+ }
+ });
+ picker.show();
+
+ }
+ });
+ adapter.setOnChildClickListener(R.id.iv_delete, new BaseRVAdapter.OnChildClickListener() {
+ @Override
+ public void onChildClick(RecyclerView recyclerView, View childView, int position) {
+ CleanStorageBean bean = viewModel.getBeanLiveData().getValue();
+ if (bean !=null){
+ List<String> urlList = Utils.splitString2List(bean.getUrl(),",");
+ urlList.remove(adapter.getItem(position));
+ bean.setUrl(Utils.appendList2String(urlList,","));
+ }
+ adapter.removeItem(position);
+ viewModel.getBeanLiveData().setValue(bean);
+ }
+ });
+ binding.rvImage.setAdapter(adapter);
+
+ if (type == 1){
+ viewModel.getTypeLiveData().postValue(true);
+ binding.ivOperate.setOnClickListener(v -> {
+ viewModel.add();
+ });
+ }else if (type == 0){
+ popupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate_delete,null));
+ popupWindow.getContentView().findViewById(R.id.tv_modify).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewModel.getTypeLiveData().postValue(true);
+ popupWindow.dismiss();
+ }
+ });
+ popupWindow.getContentView().findViewById(R.id.tv_delete).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ popupWindow.dismiss();
+ new UIDialog.Builder(getSelfActivity())
+ .setTitle("鎮ㄧ‘瀹氳鍒犻櫎椤圭洰鍚�")
+ .setContent("椤圭洰鍒犻櫎鍚庡皢鏃犳硶鎭㈠")
+ .setConfirm("纭畾")
+ .setCancel("鍙栨秷")
+ .setListener(new UIDialog.OnListener() {
+ @Override
+ public void onConfirm(BaseDialog dialog) {
+ viewModel.delete();
+ }
+ })
+ .show();
+ }
+ });
+ viewModel.getTypeLiveData().postValue(false);
+ }else if (type == 2){
+ viewModel.getTypeLiveData().postValue(true);
+ }
+ activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
+ @Override
+ public void onActivityResult(ActivityResult result) {
+ if (result.getResultCode() == Activity.RESULT_OK) {
+ if (result.getData() == null){
+ return;
+ }
+ // 鑾峰彇閫変腑鐨勫涓枃浠剁殑 URI
+ ClipData clipData = result.getData().getClipData();
+ if (clipData != null) {
+ int itemCount = clipData.getItemCount();
+ for (int i = 0; i < itemCount; i++) {
+ Uri uri = clipData.getItemAt(i).getUri();
+ // 浣跨敤閫変腑鐨勬枃浠� URI 杩涜鍚庣画鎿嶄綔锛屾瘮濡傝鍙栨枃浠跺唴瀹圭瓑
+ String path = GetFilePathFromUri.getFileAbsolutePath(getSelfActivity(),uri);
+ if (path!=null){
+ viewModel.addUploadFile(path);
+ CleanStorageBean bean = viewModel.getBeanLiveData().getValue();
+ if (bean !=null){
+ List<String> urlList = Utils.splitString2List(bean.getUrl(),",");
+ urlList.add(path);
+ bean.setUrl(Utils.appendList2String(urlList,","));
+ }
+ viewModel.getBeanLiveData().setValue(bean);
+ }
+ }
+ }else {
+ // 鑾峰彇閫変腑鐨勫崟涓枃浠剁殑 URI
+ Uri selectedFileUri = result.getData().getData();
+ String path = GetFilePathFromUri.getFileAbsolutePath(getSelfActivity(),selectedFileUri);
+ if (path!=null){
+ viewModel.addUploadFile(path);
+ CleanStorageBean bean = viewModel.getBeanLiveData().getValue();
+ if (bean !=null){
+ List<String> urlList = Utils.splitString2List(bean.getUrl(),",");
+ urlList.add(path);
+ bean.setUrl(Utils.appendList2String(urlList,","));
+ }
+ viewModel.getBeanLiveData().setValue(bean);
+ }
+ }
+ }
+ }
+ });
}
@Override
@@ -60,19 +234,26 @@
public void initLiveDataObserve() {
viewModel.getBeanLiveData().observe(this,bean -> {
if (bean!=null){
- String url = bean.getUrl();
- if (url == null||url.isEmpty()){
- return;
- }
- List<String> list;
- if (url.contains(",")){
- String[] split = url.split(",");
- list = new ArrayList<>(Arrays.asList(split));
+ adapter.setData(Utils.splitString2List(bean.getUrl(),","));
+ }
+ });
+ viewModel.getTypeLiveData().observe(this,operateType -> {
+ if (operateType){
+ if (type == 1) {
+ binding.ivOperate.setOnClickListener(v -> {
+ viewModel.add();
+ });
}else {
- list = new ArrayList<>();
- list.add(url);
+ binding.ivOperate.setOnClickListener(v -> {
+ viewModel.update();
+ });
}
- adapter.setData(list);
+ setIsEdited(true);
+ }else {
+ binding.ivOperate.setOnClickListener(v -> {
+ popupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,85) +binding.ivOperate.getWidth(),0);
+ });
+ setIsEdited(false);
}
});
}
@@ -96,4 +277,23 @@
}
}
}
+ protected void dialogLoading() {
+ if (mWaitDialog == null) {
+ mWaitDialog = new WaitDialog.Builder(this)
+ // 娑堟伅鏂囨湰鍙互涓嶇敤濉啓
+ .setMessage("姝ｅ湪涓婁紶")
+ .create();
+ }
+ if (!mWaitDialog.isShowing()) {
+ mWaitDialog.show();
+ }
+ }
+
+ @Override
+ protected void dialogDismiss() {
+ if (mWaitDialog != null && mWaitDialog.isShowing()) {
+ mWaitDialog.dismiss();
+ mWaitDialog = null;
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1